From e92b4f04c06378f3e85d5fdd1785d64f6a21f003 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.witte@vrstudios.com>
Date: Sun, 26 Feb 2017 19:54:53 -0800
Subject: [PATCH] UI clean up and improvments Updated Avalonia UI

---
 CommitEntry/CommitEntry.csproj               | 44 +++++++--------
 CommitEntry/packages.config                  | 14 ++---
 GitItGUI.Core/Properties/AssemblyInfo.cs     |  2 +-
 GitItGUI.Core/RepoManager.cs                 |  8 ++-
 GitItGUI.Core/Tools/Settings.cs              |  8 +--
 GitItGUI/AppSettingsPage.xaml                | 10 ++--
 GitItGUI/GitItGUI.csproj                     | 56 ++++++++++----------
 GitItGUI/MainContent.xaml                    | 37 +++++++------
 GitItGUI/MainContent.xaml.cs                 | 44 +++++++++++++++
 GitItGUI/MainWindow.xaml.cs                  |  1 +
 GitItGUI/ProcessingPage.xaml                 |  2 +-
 GitItGUI/SettingsPage.xaml                   | 42 ++++++---------
 GitItGUI/SettingsPage.xaml.cs                | 12 +----
 GitItGUI/StartPage.xaml.cs                   |  2 +
 GitItGUI/VersionInfo.xml                     |  2 +-
 GitItGUI/packages.config                     | 18 +++----
 MergeConflicPicker/MergeConflicPicker.csproj | 56 ++++++++++----------
 MergeConflicPicker/packages.config           | 18 +++----
 MessageBox/MessageBox.csproj                 | 56 ++++++++++----------
 MessageBox/packages.config                   | 18 +++----
 NameEntry/NameEntry.csproj                   | 56 ++++++++++----------
 NameEntry/packages.config                    | 18 +++----
 22 files changed, 283 insertions(+), 241 deletions(-)

diff --git a/CommitEntry/CommitEntry.csproj b/CommitEntry/CommitEntry.csproj
index 3008e8d..b3cd046 100644
--- a/CommitEntry/CommitEntry.csproj
+++ b/CommitEntry/CommitEntry.csproj
@@ -37,87 +37,87 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Avalonia.Animation, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Base, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Base.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.Cairo.0.4.1-build2634-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Cairo.0.4.1-build2693-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Controls, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DesignerSupport, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Diagnostics, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Direct2D1, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2634-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2693-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DotNetFrameworkRuntime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Avalonia.Gtk, Version=1.0.6248.6664, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2634-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
+    <Reference Include="Avalonia.Gtk, Version=1.0.6263.2538, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2693-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Input, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Input.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Input.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Interactivity, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Layout, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2634-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup.Xaml, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2634-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Skia.Desktop, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2634-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2693-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Styling, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Themes.Default, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Visuals, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Win32, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2634-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2693-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/CommitEntry/packages.config b/CommitEntry/packages.config
index 3c47c77..262109b 100644
--- a/CommitEntry/packages.config
+++ b/CommitEntry/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Avalonia" version="0.4.1-build2634-alpha" targetFramework="net462" />
-  <package id="Avalonia.Cairo" version="0.4.1-build2634-alpha" targetFramework="net462" />
-  <package id="Avalonia.Desktop" version="0.4.1-build2634-alpha" targetFramework="net462" />
-  <package id="Avalonia.Direct2D1" version="0.4.1-build2634-alpha" targetFramework="net462" />
-  <package id="Avalonia.Gtk" version="0.4.1-build2634-alpha" targetFramework="net462" />
-  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2634-alpha" targetFramework="net462" />
-  <package id="Avalonia.Win32" version="0.4.1-build2634-alpha" targetFramework="net462" />
+  <package id="Avalonia" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Cairo" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Direct2D1" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Gtk" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Win32" version="0.4.1-build2693-alpha" targetFramework="net462" />
   <package id="Serilog" version="1.5.14" targetFramework="net462" />
   <package id="SharpDX" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct2D1" version="3.1.1" targetFramework="net462" />
diff --git a/GitItGUI.Core/Properties/AssemblyInfo.cs b/GitItGUI.Core/Properties/AssemblyInfo.cs
index f87e907..1588477 100644
--- a/GitItGUI.Core/Properties/AssemblyInfo.cs
+++ b/GitItGUI.Core/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 
 public static class VersionInfo
 {
-	public const string version = "0.1.12";
+	public const string version = "0.1.13";
 }
\ No newline at end of file
diff --git a/GitItGUI.Core/RepoManager.cs b/GitItGUI.Core/RepoManager.cs
index 371496c..3eb8a08 100644
--- a/GitItGUI.Core/RepoManager.cs
+++ b/GitItGUI.Core/RepoManager.cs
@@ -80,7 +80,7 @@ public static bool OpenRepo(string path)
 
 				// check for git lfs
 				lfsEnabled = IsGitLFSRepo();
-
+				
 				// load settings
 				settings = Settings.Load<XML.RepoSettings>(path + "\\" + Settings.repoSettingsFilename);
 				userSettings = Settings.Load<XML.RepoUserSettings>(path + "\\" + Settings.repoUserSettingsFilename);
@@ -118,6 +118,12 @@ public static bool OpenRepo(string path)
 				
 				BranchManager.OpenRepo(repo);
 				AppManager.AddActiveRepoToHistory();
+
+				// warnings
+				if (userSettings.signatureName.Contains("TODO: ") || userSettings.signatureEmail.Contains("TODO: ") || userSettings.username.Contains("TODO: "))
+				{
+					Debug.LogWarning("Credentials not set, please go to the settings tab!", true);
+				}
 			}
 			catch (Exception e)
 			{
diff --git a/GitItGUI.Core/Tools/Settings.cs b/GitItGUI.Core/Tools/Settings.cs
index bc69da4..ec943e7 100644
--- a/GitItGUI.Core/Tools/Settings.cs
+++ b/GitItGUI.Core/Tools/Settings.cs
@@ -31,10 +31,10 @@ public class RepoSettings
 		[XmlRoot("RepoUserSettings")]
 		public class RepoUserSettings
 		{
-			[XmlAttribute("SignatureName")] public string signatureName = "First Last";
-			[XmlAttribute("SignatureEmail")] public string signatureEmail = "username@email.com";
-			[XmlAttribute("Username")] public string username = "Username";
-			[XmlAttribute("Password")] public string password = "password";
+			[XmlAttribute("SignatureName")] public string signatureName = "TODO: First Last";
+			[XmlAttribute("SignatureEmail")] public string signatureEmail = "TODO: username@email.com";
+			[XmlAttribute("Username")] public string username = "TODO: Username";
+			[XmlAttribute("Password")] public string password = "";
 		}
 	}
 	
diff --git a/GitItGUI/AppSettingsPage.xaml b/GitItGUI/AppSettingsPage.xaml
index 1b98ead..17b3002 100644
--- a/GitItGUI/AppSettingsPage.xaml
+++ b/GitItGUI/AppSettingsPage.xaml
@@ -1,15 +1,15 @@
 <UserControl xmlns="https://github.com/avaloniaui" Design.Width="640" Design.Height="400" Background="LightGray">
 	<Grid>
-		<TextBlock Margin="10,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">Merge / Diff tool</TextBlock>
-		<ListBox Name="mergeDiffToolListBox" Margin="10,30,-10,-30" Width="256" HorizontalAlignment="Left" VerticalAlignment="Top" Background="White" SelectionMode="Single">
+		<TextBlock Margin="10,10,10,-10" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Top">App Settings</TextBlock>
+		<TextBlock Margin="10,60,10,-60" HorizontalAlignment="Center" VerticalAlignment="Top">Merge / Diff tool</TextBlock>
+		<ListBox Name="mergeDiffToolListBox" Margin="10,80,-10,-80" Width="256" HorizontalAlignment="Center" VerticalAlignment="Top" Background="White" SelectionMode="Single">
 			<ListBoxItem>Meld</ListBoxItem>
 			<ListBoxItem>kDiff3</ListBoxItem>
 			<ListBoxItem>P4Merge</ListBoxItem>
 			<ListBoxItem>DiffMerge</ListBoxItem>
 		</ListBox>
 
-		<CheckBox Name="autoRefreshChanges" Margin="10,120,-10,0" HorizontalAlignment="Left" VerticalAlignment="Top">Auto Refresh Changes</CheckBox>
-
-		<Button Name="doneButton" Margin="0,10,10,0" Width="128" HorizontalAlignment="Right" VerticalAlignment="Top">Done</Button>
+		<CheckBox Name="autoRefreshChanges" Margin="10,-10,-10,10" HorizontalAlignment="Left" VerticalAlignment="Bottom">Auto Refresh Changes</CheckBox>
+		<Button Name="doneButton" Margin="-10,-10,10,10" Width="128" HorizontalAlignment="Right" VerticalAlignment="Bottom">Done</Button>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/GitItGUI/GitItGUI.csproj b/GitItGUI/GitItGUI.csproj
index 46345b3..188ff17 100644
--- a/GitItGUI/GitItGUI.csproj
+++ b/GitItGUI/GitItGUI.csproj
@@ -42,87 +42,87 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Avalonia.Animation, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Base, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Base.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.Cairo.0.4.1-build2590-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Cairo.0.4.1-build2693-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Controls, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DesignerSupport, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Diagnostics, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Direct2D1, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2590-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2693-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DotNetFrameworkRuntime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Avalonia.Gtk, Version=1.0.6239.39475, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2590-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
+    <Reference Include="Avalonia.Gtk, Version=1.0.6263.2538, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2693-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Input, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Input.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Input.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Interactivity, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Layout, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup.Xaml, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Skia.Desktop, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2590-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2693-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Styling, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Themes.Default, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Visuals, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Win32, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2590-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2693-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.23.1.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
@@ -153,16 +153,16 @@
       <HintPath>..\packages\SharpDX.DXGI.3.1.1\lib\net45\SharpDX.DXGI.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.56.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkiaSharp.1.56.1-beta\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Sprache, Version=2.0.0.52, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sprache.2.0.0.52\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid+Xamarin.iOS10+MonoTouch\Sprache.dll</HintPath>
+    <Reference Include="Sprache, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sprache.2.1.0\lib\net40\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -303,10 +303,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
     <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets'))" />
   </Target>
-  <Import Project="..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.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.
   <Target Name="BeforeBuild">
diff --git a/GitItGUI/MainContent.xaml b/GitItGUI/MainContent.xaml
index 8fe6c72..e144e8f 100644
--- a/GitItGUI/MainContent.xaml
+++ b/GitItGUI/MainContent.xaml
@@ -1,22 +1,29 @@
-<UserControl xmlns="https://github.com/avaloniaui" MinWidth="640" MinHeight="400"
+<UserControl xmlns="https://github.com/avaloniaui" MinWidth="1024" MinHeight="800"
 	xmlns:gititgui="clr-namespace:GitItGUI;assembly=GitItGUI">
 
-	<TabControl Name="tabControl" Margin="0,0,0,0">
-		<TabItem Name="changesPage" Header="Changes">
-			<gititgui:ChangesPage/>
-		</TabItem>
+	<Grid>
+		<TextBlock Name="repoName" HorizontalAlignment="Center" VerticalAlignment="Top" FontSize="24" Margin="0,5,0,-5" Height="30">My Repo Name</TextBlock>
+		<Button Name="closeRepoButton" HorizontalAlignment="Right" VerticalAlignment="Top" Width="110" Height="30" Margin="-10,5,10,-5">Close Repo</Button>
 
-		<TabItem Name="branchesPage" Header="Branches">
-			<gititgui:BranchesPage/>
-		</TabItem>
+		<Grid Margin="0,30,0,0">
+			<TabControl Name="tabControl">
+				<TabItem Name="changesPage" Header="Changes">
+					<gititgui:ChangesPage/>
+				</TabItem>
 
-		<TabItem Name="historyPage" Header="History">
-			<gititgui:HistoryPage/>
-		</TabItem>
+				<TabItem Name="branchesPage" Header="Branches">
+					<gititgui:BranchesPage/>
+				</TabItem>
 
-		<TabItem Name="settingsPage" Header="Settings">
-			<gititgui:SettingsPage/>
-		</TabItem>
-	</TabControl>
+				<TabItem Name="historyPage" Header="History">
+					<gititgui:HistoryPage/>
+				</TabItem>
+
+				<TabItem Name="settingsPage" Header="Settings">
+					<gititgui:SettingsPage/>
+				</TabItem>
+			</TabControl>
+		</Grid> 
+	</Grid>
 
 </UserControl>
\ No newline at end of file
diff --git a/GitItGUI/MainContent.xaml.cs b/GitItGUI/MainContent.xaml.cs
index a208954..12291e4 100644
--- a/GitItGUI/MainContent.xaml.cs
+++ b/GitItGUI/MainContent.xaml.cs
@@ -1,6 +1,11 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitItGUI.Core;
+using System.IO;
+using Avalonia.Interactivity;
+using System.Threading;
+using Avalonia.Threading;
 
 namespace GitItGUI
 {
@@ -11,6 +16,8 @@ public class MainContent : UserControl, NavigationPage
 		public static MainContent singleton;
 		public event MainContentPageNavigateMethod MainContentPageNavigatedTo, MainContentPageNavigateFrom;
 
+		private TextBlock repoName;
+		private Button closeRepoButton;
 		private TabControl tabControl;
 		public int tabControlNavigateIndex = -1;
 
@@ -19,7 +26,44 @@ public MainContent()
 			singleton = this;
 			AvaloniaXamlLoader.Load(this);
 
+			repoName = this.Find<TextBlock>("repoName");
+			closeRepoButton = this.Find<Button>("closeRepoButton");
 			tabControl = this.Find<TabControl>("tabControl");
+
+			closeRepoButton.Click += CloseRepoButton_Click;
+			RepoManager.RepoRefreshedCallback += RepoManager_RepoRefreshedCallback;
+		}
+
+		private void CloseRepoButton_Click(object sender, RoutedEventArgs e)
+		{
+			RepoManager.Close();
+			MainWindow.LoadPage(PageTypes.Start);
+		}
+
+		private void RepoManager_RepoRefreshedCallback()
+		{
+			if (Dispatcher.UIThread.CheckAccess())
+			{
+				RepoManager_RepoRefreshedCallback_UIThread();
+			}
+			else
+			{
+				bool isDone = false;
+				Dispatcher.UIThread.InvokeAsync(delegate
+				{
+					RepoManager_RepoRefreshedCallback_UIThread();
+					isDone = true;
+				});
+
+				while (!isDone) Thread.Sleep(1);
+			}
+		}
+
+		private void RepoManager_RepoRefreshedCallback_UIThread()
+		{
+			string name = RepoManager.repoPath;
+			if (!string.IsNullOrEmpty(name)) repoName.Text = name.Substring(Path.GetDirectoryName(name).Length + 1);
+			else repoName.Text = "";
 		}
 
 		public void NavigatedFrom()
diff --git a/GitItGUI/MainWindow.xaml.cs b/GitItGUI/MainWindow.xaml.cs
index 65ae2df..24f878a 100644
--- a/GitItGUI/MainWindow.xaml.cs
+++ b/GitItGUI/MainWindow.xaml.cs
@@ -4,6 +4,7 @@
 using GitItGUI.Core;
 using Avalonia.Threading;
 using System.Threading;
+using System.IO;
 
 namespace GitItGUI
 {
diff --git a/GitItGUI/ProcessingPage.xaml b/GitItGUI/ProcessingPage.xaml
index a50f573..2471ad1 100644
--- a/GitItGUI/ProcessingPage.xaml
+++ b/GitItGUI/ProcessingPage.xaml
@@ -2,7 +2,7 @@
 	<Grid>
 		<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="32" Margin="0,-40,0,40">Processing...</TextBlock>
 		<Image Source="resm:GitItGUI.Icons.AppIcon.png?assembly=GitItGUI" Margin="0,30,0,-30" HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="64" MaxHeight="64"/>
-		<TextBox Name="statusTextBox" IsReadOnly="True" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" Width="700" Margin="0,90,0,-90">Waiting...</TextBox>
+		<TextBox Name="statusTextBox" IsReadOnly="True" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" Margin="0,90,0,-90">Waiting...</TextBox>
 		<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom" FontSize="14" Margin="0,-10,0,10">This can take some time on large repositories.</TextBlock>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/GitItGUI/SettingsPage.xaml b/GitItGUI/SettingsPage.xaml
index fdab875..8f73999 100644
--- a/GitItGUI/SettingsPage.xaml
+++ b/GitItGUI/SettingsPage.xaml
@@ -1,39 +1,29 @@
 <UserControl xmlns="https://github.com/avaloniaui" Design.Width="740" Design.Height="500">
 	<Grid>
 		<Grid Background="LightGray">
-			<TextBlock FontSize="24" Margin="0,10,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">Settings</TextBlock>
-			<Grid Margin="10,50,10,10">
+			<TextBlock FontSize="24" Margin="0,10,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">Repo Settings</TextBlock>
+			<Grid>
 				<Grid.RowDefinitions>
-					<RowDefinition Height="50*" />
-					<RowDefinition Height="50*" />
+					<RowDefinition Height="75*" />
+					<RowDefinition Height="25*" />
 				</Grid.RowDefinitions>
 
-				<Grid Grid.Row="0">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="50*" />
-						<ColumnDefinition Width="50*" />
-					</Grid.ColumnDefinitions>
+				<Grid Grid.Row="0" Margin="0,50,0,-50">
+					<TextBlock Margin="10,30,-10,30" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top">Signature Name</TextBlock>
+					<TextBlock Margin="10,90,-10,-90" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top">Signature Email</TextBlock>
+					<TextBlock Margin="10,150,-10,-150" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top">Username</TextBlock>
+					<TextBlock Margin="10,210,-10,-210" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top">Password</TextBlock>
 
-					<Grid Grid.Column="0">
-						<TextBox Name="sigNameTextBox" Height="30" VerticalAlignment="Top" Margin="0,0,0,0">Sig Name</TextBox>
-						<TextBox Name="sigEmailTextBox" Height="30" VerticalAlignment="Top" Margin="0,30,0,0">Sig Email</TextBox>
-						<TextBox Name="usernameTextBox" Height="30" VerticalAlignment="Top" Margin="0,60,0,0">Username</TextBox>
-						<TextBox Name="passwordTextBox" Height="30" VerticalAlignment="Top" Margin="0,90,0,0" Background="White" Foreground="White">Password</TextBox>
-					</Grid>
-
-					<Grid Grid.Column="1">
-						<TextBlock Margin="10,5,0,0" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top">Signature Name</TextBlock>
-						<TextBlock Margin="10,35,0,0" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top">Signature Email</TextBlock>
-						<TextBlock Margin="10,65,0,0" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top">Username</TextBlock>
-						<TextBlock Margin="10,95,0,0" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top">Password</TextBlock>
-					</Grid>
+					<TextBox Name="sigNameTextBox" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="10,50,-10,-50" Width="256">Sig Name</TextBox>
+					<TextBox Name="sigEmailTextBox" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="10,110,-10,-110" Width="256">Sig Email</TextBox>
+					<TextBox Name="usernameTextBox" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="10,170,-10,-170" Width="256">Username</TextBox>
+					<TextBox Name="passwordTextBox" Height="30" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="10,230,-10,-230" Width="256" Background="White" Foreground="White">Password</TextBox>
 				</Grid>
 
 				<Grid Grid.Row="1">
-					<CheckBox Name="gitlfsSupportCheckBox" Margin="0,0,0,25" HorizontalAlignment="Left" VerticalAlignment="Bottom">Git-LFS Support</CheckBox>
-					<CheckBox Name="validateGitignoreCheckbox" Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Bottom">Validate .gitignore file exists</CheckBox>
-					<Button Name="applyChangesButton" Width="128" Height="64" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,0,0" Background="LightGreen">Apply Changes</Button>
-					<Button Name="closeRepoButton" Width="128" Height="32" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,0">Close Repo</Button>
+					<CheckBox Name="gitlfsSupportCheckBox" Margin="10,-035,-10,35" HorizontalAlignment="Left" VerticalAlignment="Bottom">Git-LFS Support</CheckBox>
+					<CheckBox Name="validateGitignoreCheckbox" Margin="10,-10,-10,10" HorizontalAlignment="Left" VerticalAlignment="Bottom">Validate .gitignore file exists</CheckBox>
+					<Button Name="applyChangesButton" Width="128" Height="64" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="-10,-10,10,10" Background="LightGreen">Apply Changes</Button>
 				</Grid>
 			</Grid>
 		</Grid>
diff --git a/GitItGUI/SettingsPage.xaml.cs b/GitItGUI/SettingsPage.xaml.cs
index c2dbd4d..35dd89e 100644
--- a/GitItGUI/SettingsPage.xaml.cs
+++ b/GitItGUI/SettingsPage.xaml.cs
@@ -20,7 +20,7 @@ public class SettingsPage : UserControl
 		private bool refreshMode;
 
 		// UI objects
-		Button applyChangesButton, closeRepoButton;
+		Button applyChangesButton;
 		TextBox sigNameTextBox, sigEmailTextBox, usernameTextBox, passwordTextBox;
 		CheckBox gitlfsSupportCheckBox, validateGitignoreCheckbox;
 
@@ -31,7 +31,6 @@ public SettingsPage()
 
 			// load ui items
 			applyChangesButton = this.Find<Button>("applyChangesButton");
-			closeRepoButton = this.Find<Button>("closeRepoButton");
 			sigNameTextBox = this.Find<TextBox>("sigNameTextBox");
 			sigEmailTextBox = this.Find<TextBox>("sigEmailTextBox");
 			usernameTextBox = this.Find<TextBox>("usernameTextBox");
@@ -41,7 +40,6 @@ public SettingsPage()
 
 			// apply bindings
 			applyChangesButton.Click += ApplyChangesButton_Click;
-			closeRepoButton.Click += CloseRepoButton_Click;
 			sigNameTextBox.TextInput += TextInputChanged;
 			sigEmailTextBox.TextInput += TextInputChanged;
 			usernameTextBox.TextInput += TextInputChanged;
@@ -56,13 +54,6 @@ public SettingsPage()
 			RepoManager.RepoRefreshedCallback += RepoManager_RepoRefreshedCallback;
 		}
 
-		private void CloseRepoButton_Click(object sender, RoutedEventArgs e)
-		{
-			applyChangesButton.IsVisible = false;
-			RepoManager.Close();
-			MainWindow.LoadPage(PageTypes.Start);
-		}
-
 		private void RepoManager_RepoRefreshedCallback()
 		{
 			if (Dispatcher.UIThread.CheckAccess())
@@ -85,6 +76,7 @@ private void RepoManager_RepoRefreshedCallback()
 		private void RepoManager_RepoRefreshedCallback_UIThread()
 		{
 			refreshMode = true;
+			applyChangesButton.IsVisible = false;
 			sigNameTextBox.Text = RepoManager.signatureName;
 			sigEmailTextBox.Text = RepoManager.signatureEmail;
 			usernameTextBox.Text = RepoManager.credentialUsername;
diff --git a/GitItGUI/StartPage.xaml.cs b/GitItGUI/StartPage.xaml.cs
index 545b5da..b970d07 100644
--- a/GitItGUI/StartPage.xaml.cs
+++ b/GitItGUI/StartPage.xaml.cs
@@ -86,6 +86,7 @@ private async void OpenButton_Click(object sender, RoutedEventArgs e)
 
 			// load main repo page
 			grid.IsVisible = true;
+			MainContent.singleton.tabControlNavigateIndex = 0;
 			MainWindow.LoadPage(PageTypes.MainContent);
 		}
 
@@ -105,6 +106,7 @@ private void RecentButton_Click(object sender, RoutedEventArgs e)
 			}
 
 			// load main repo page
+			MainContent.singleton.tabControlNavigateIndex = 0;
 			MainWindow.LoadPage(PageTypes.MainContent);
 		}
 	}
diff --git a/GitItGUI/VersionInfo.xml b/GitItGUI/VersionInfo.xml
index f540636..3e9365c 100644
--- a/GitItGUI/VersionInfo.xml
+++ b/GitItGUI/VersionInfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <VersionInfo>
-	<AppVersion>0.1.12</AppVersion>
+	<AppVersion>0.1.13</AppVersion>
 	<GitVersion>
 		<Windows>2.11.1</Windows>
 		<Mac>2.8.1</Mac>
diff --git a/GitItGUI/packages.config b/GitItGUI/packages.config
index 8f04286..450d8cd 100644
--- a/GitItGUI/packages.config
+++ b/GitItGUI/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Avalonia" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Cairo" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Direct2D1" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Gtk" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Win32" version="0.4.1-build2590-alpha" targetFramework="net462" />
+  <package id="Avalonia" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Cairo" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Direct2D1" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Gtk" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Win32" version="0.4.1-build2693-alpha" targetFramework="net462" />
   <package id="LibGit2Sharp" version="0.23.1" targetFramework="net462" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.164" targetFramework="net462" />
   <package id="Serilog" version="1.5.14" targetFramework="net462" />
@@ -14,9 +14,9 @@
   <package id="SharpDX.Direct2D1" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct3D11" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.DXGI" version="3.1.1" targetFramework="net462" />
-  <package id="SkiaSharp" version="1.54.1" targetFramework="net462" />
+  <package id="SkiaSharp" version="1.56.1-beta" targetFramework="net462" />
   <package id="Splat" version="1.6.2" targetFramework="net462" />
-  <package id="Sprache" version="2.0.0.52" targetFramework="net462" />
+  <package id="Sprache" version="2.1.0" targetFramework="net462" />
   <package id="System.Reactive" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="net462" />
diff --git a/MergeConflicPicker/MergeConflicPicker.csproj b/MergeConflicPicker/MergeConflicPicker.csproj
index f936ad7..d7e0a7f 100644
--- a/MergeConflicPicker/MergeConflicPicker.csproj
+++ b/MergeConflicPicker/MergeConflicPicker.csproj
@@ -37,87 +37,87 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Avalonia.Animation, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Base, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Base.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.Cairo.0.4.1-build2590-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Cairo.0.4.1-build2693-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Controls, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DesignerSupport, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Diagnostics, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Direct2D1, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2590-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2693-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DotNetFrameworkRuntime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Avalonia.Gtk, Version=1.0.6239.39475, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2590-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
+    <Reference Include="Avalonia.Gtk, Version=1.0.6263.2538, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2693-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Input, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Input.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Input.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Interactivity, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Layout, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup.Xaml, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Skia.Desktop, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2590-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2693-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Styling, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Themes.Default, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Visuals, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Win32, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2590-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2693-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">
@@ -144,16 +144,16 @@
       <HintPath>..\packages\SharpDX.DXGI.3.1.1\lib\net45\SharpDX.DXGI.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.56.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkiaSharp.1.56.1-beta\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Sprache, Version=2.0.0.51, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sprache.2.0.0.51\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid+Xamarin.iOS10+MonoTouch\Sprache.dll</HintPath>
+    <Reference Include="Sprache, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sprache.2.1.0\lib\net40\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -201,12 +201,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- 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.
diff --git a/MergeConflicPicker/packages.config b/MergeConflicPicker/packages.config
index a60eef5..262109b 100644
--- a/MergeConflicPicker/packages.config
+++ b/MergeConflicPicker/packages.config
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Avalonia" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Cairo" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Direct2D1" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Gtk" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Win32" version="0.4.1-build2590-alpha" targetFramework="net462" />
+  <package id="Avalonia" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Cairo" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Direct2D1" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Gtk" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Win32" version="0.4.1-build2693-alpha" targetFramework="net462" />
   <package id="Serilog" version="1.5.14" targetFramework="net462" />
   <package id="SharpDX" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct2D1" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct3D11" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.DXGI" version="3.1.1" targetFramework="net462" />
-  <package id="SkiaSharp" version="1.54.1" targetFramework="net462" />
+  <package id="SkiaSharp" version="1.56.1-beta" targetFramework="net462" />
   <package id="Splat" version="1.6.2" targetFramework="net462" />
-  <package id="Sprache" version="2.0.0.51" targetFramework="net462" />
+  <package id="Sprache" version="2.1.0" targetFramework="net462" />
   <package id="System.Reactive" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="net462" />
diff --git a/MessageBox/MessageBox.csproj b/MessageBox/MessageBox.csproj
index 7c1fd10..a53d47c 100644
--- a/MessageBox/MessageBox.csproj
+++ b/MessageBox/MessageBox.csproj
@@ -37,87 +37,87 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Avalonia.Animation, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Base, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Base.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.Cairo.0.4.1-build2590-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Cairo.0.4.1-build2693-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Controls, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DesignerSupport, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Diagnostics, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Direct2D1, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2590-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2693-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DotNetFrameworkRuntime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Avalonia.Gtk, Version=1.0.6239.39475, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2590-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
+    <Reference Include="Avalonia.Gtk, Version=1.0.6263.2538, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2693-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Input, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Input.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Input.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Interactivity, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Layout, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup.Xaml, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Skia.Desktop, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2590-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2693-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Styling, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Themes.Default, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Visuals, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Win32, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2590-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2693-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">
@@ -144,16 +144,16 @@
       <HintPath>..\packages\SharpDX.DXGI.3.1.1\lib\net45\SharpDX.DXGI.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.56.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkiaSharp.1.56.1-beta\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Sprache, Version=2.0.0.51, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sprache.2.0.0.51\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid+Xamarin.iOS10+MonoTouch\Sprache.dll</HintPath>
+    <Reference Include="Sprache, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sprache.2.1.0\lib\net40\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -200,12 +200,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- 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.
diff --git a/MessageBox/packages.config b/MessageBox/packages.config
index a60eef5..262109b 100644
--- a/MessageBox/packages.config
+++ b/MessageBox/packages.config
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Avalonia" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Cairo" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Direct2D1" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Gtk" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Win32" version="0.4.1-build2590-alpha" targetFramework="net462" />
+  <package id="Avalonia" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Cairo" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Direct2D1" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Gtk" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Win32" version="0.4.1-build2693-alpha" targetFramework="net462" />
   <package id="Serilog" version="1.5.14" targetFramework="net462" />
   <package id="SharpDX" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct2D1" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct3D11" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.DXGI" version="3.1.1" targetFramework="net462" />
-  <package id="SkiaSharp" version="1.54.1" targetFramework="net462" />
+  <package id="SkiaSharp" version="1.56.1-beta" targetFramework="net462" />
   <package id="Splat" version="1.6.2" targetFramework="net462" />
-  <package id="Sprache" version="2.0.0.51" targetFramework="net462" />
+  <package id="Sprache" version="2.1.0" targetFramework="net462" />
   <package id="System.Reactive" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="net462" />
diff --git a/NameEntry/NameEntry.csproj b/NameEntry/NameEntry.csproj
index 068be69..f15c4f6 100644
--- a/NameEntry/NameEntry.csproj
+++ b/NameEntry/NameEntry.csproj
@@ -37,87 +37,87 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Avalonia.Animation, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Base, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Base.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.Cairo.0.4.1-build2590-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Cairo.0.4.1-build2693-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Controls, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DesignerSupport, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Diagnostics, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Direct2D1, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2590-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2693-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DotNetFrameworkRuntime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Avalonia.Gtk, Version=1.0.6239.39475, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2590-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
+    <Reference Include="Avalonia.Gtk, Version=1.0.6263.2538, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Avalonia.Gtk.0.4.1-build2693-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Input, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Input.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Input.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Interactivity, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Layout, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup.Xaml, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\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.4.1-build2590-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Skia.Desktop, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2590-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2693-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Styling, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Themes.Default, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Visuals, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.0.4.1-build2590-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
+      <HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Win32, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2590-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
+      <HintPath>..\packages\Avalonia.Win32.0.4.1-build2693-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">
@@ -144,16 +144,16 @@
       <HintPath>..\packages\SharpDX.DXGI.3.1.1\lib\net45\SharpDX.DXGI.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.56.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkiaSharp.1.56.1-beta\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Sprache, Version=2.0.0.51, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sprache.2.0.0.51\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid+Xamarin.iOS10+MonoTouch\Sprache.dll</HintPath>
+    <Reference Include="Sprache, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sprache.2.1.0\lib\net40\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -200,12 +200,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.56.1-beta\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- 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.
diff --git a/NameEntry/packages.config b/NameEntry/packages.config
index a60eef5..262109b 100644
--- a/NameEntry/packages.config
+++ b/NameEntry/packages.config
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Avalonia" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Cairo" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Direct2D1" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Gtk" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2590-alpha" targetFramework="net462" />
-  <package id="Avalonia.Win32" version="0.4.1-build2590-alpha" targetFramework="net462" />
+  <package id="Avalonia" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Cairo" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Direct2D1" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Gtk" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Skia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
+  <package id="Avalonia.Win32" version="0.4.1-build2693-alpha" targetFramework="net462" />
   <package id="Serilog" version="1.5.14" targetFramework="net462" />
   <package id="SharpDX" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct2D1" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.Direct3D11" version="3.1.1" targetFramework="net462" />
   <package id="SharpDX.DXGI" version="3.1.1" targetFramework="net462" />
-  <package id="SkiaSharp" version="1.54.1" targetFramework="net462" />
+  <package id="SkiaSharp" version="1.56.1-beta" targetFramework="net462" />
   <package id="Splat" version="1.6.2" targetFramework="net462" />
-  <package id="Sprache" version="2.0.0.51" targetFramework="net462" />
+  <package id="Sprache" version="2.1.0" targetFramework="net462" />
   <package id="System.Reactive" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="net462" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="net462" />