diff --git a/build.cake b/build.cake
index 03a81789..6b763244 100644
--- a/build.cake
+++ b/build.cake
@@ -80,7 +80,7 @@ if (isRunningOnAppVeyor)
     }
 }
 
-var editbin = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\bin\HostX86\x86\editbin.exe";
+var editbin = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.12.25827\bin\HostX86\x86\editbin.exe";
 
 ///////////////////////////////////////////////////////////////////////////////
 // DIRECTORIES
diff --git a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
index d2ee06b7..9aa0049f 100644
--- a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
+++ b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.5.2-build4199-alpha" />    
+    <PackageReference Include="Avalonia.Desktop" Version="0.6.0" />    
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 72cccaa1..6e6b7e30 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,9 +9,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
-    <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
-    <PackageReference Include="Avalonia" Version="0.5.2-build4199-alpha" />
+    <PackageReference Include="Avalonia" Version="0.6.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
+    <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
   </ItemGroup>
 
+  <Target Name="ChangeAliasesOfSystemDrawing" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
+    <ItemGroup>
+      <ReferencePath Condition="'%(FileName)' == 'Splat'">
+        <Aliases>SystemDrawing</Aliases>
+      </ReferencePath>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml b/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml
index 79228529..2ece259e 100644
--- a/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml
+++ b/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml
@@ -24,7 +24,7 @@
                                     Grid.Column="0"
                                     Margin="0,0,4,0"
                                     Orientation="Horizontal"
-                                    IsVisible="{TemplateBinding Path=Provider.Count, Converter={Static cc:CollapseIfSingleOverloadConverter.Instance}}">
+                                    IsVisible="{TemplateBinding Path=Provider.Count, Converter={x:Static cc:CollapseIfSingleOverloadConverter.Instance}}">
                             <Button Name="PART_UP">
                                 <Path Stroke="Black"
                                       Fill="Black"
diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
index bb47e489..0c38bff8 100644
--- a/src/AvaloniaEdit/Editing/TextArea.cs
+++ b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -1024,11 +1024,12 @@ protected override Size ArrangeOverride(Size finalSize)
                 _viewPort = new Size(finalSize.Width, finalSize.Height / TextView.DefaultLineHeight);
                 _extent = new Size(finalSize.Width, LogicalScrollSize);
 
-                TextView.SetScrollData(new Size(_viewPort.Width, _viewPort.Height * TextView.DefaultLineHeight), _extent);
+                if(TextView.SetScrollData(new Size(_viewPort.Width, _viewPort.Height * TextView.DefaultLineHeight), _extent))
+                {
+                    TextView.Redraw();
+                }
 
                 (this as ILogicalScrollable).InvalidateScroll?.Invoke();
-                
-                TextView.Redraw();
             }
 
             return base.ArrangeOverride(finalSize);
@@ -1091,6 +1092,10 @@ Vector IScrollable.Offset
         }
 
         Size IScrollable.Viewport => _viewPort;
+
+        public bool CanHorizontallyScroll { get; set; } = false;
+
+        public bool CanVerticallyScroll { get; set; } = true;
     }
 
     /// <summary>
diff --git a/src/AvaloniaEdit/Highlighting/HighlightingColor.cs b/src/AvaloniaEdit/Highlighting/HighlightingColor.cs
index 894985a9..5cf1835b 100644
--- a/src/AvaloniaEdit/Highlighting/HighlightingColor.cs
+++ b/src/AvaloniaEdit/Highlighting/HighlightingColor.cs
@@ -28,7 +28,7 @@ namespace AvaloniaEdit.Highlighting
     /// <summary>
     /// A highlighting color is a set of font properties and foreground and background color.
     /// </summary>
-    public class HighlightingColor : IFreezable, AvaloniaEdit.Utils.ICloneable, IEquatable<HighlightingColor>
+    public class HighlightingColor : IFreezable, ICloneable, IEquatable<HighlightingColor>
     {
         internal static readonly HighlightingColor Empty = FreezableHelper.FreezeAndReturn(new HighlightingColor());
 
@@ -207,7 +207,7 @@ public virtual HighlightingColor Clone()
             return c;
         }
 
-        object AvaloniaEdit.Utils.ICloneable.Clone()
+        object ICloneable.Clone()
         {
             return Clone();
         }
diff --git a/src/AvaloniaEdit/Highlighting/Resources/Resources.cs b/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
index 92af58ce..ace5520e 100644
--- a/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
+++ b/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
@@ -58,6 +58,7 @@ internal static void RegisterBuiltInHighlightings(HighlightingManager.DefaultHig
 			                                 ".booproj;.build;.xfrm;.targets;.xaml;.xpt;" +
 			                                 ".xft;.map;.wsdl;.disco;.ps1xml;.nuspec").Split(';'),
 			                         "XML-Mode.xshd");
+            hlm.RegisterHighlighting("XAML", new[] { ".xaml", ".paml" }, "XML-Mode.xshd");
 			hlm.RegisterHighlighting("MarkDown", new[] { ".md" }, "MarkDown-Mode.xshd");
 		}
 	}
diff --git a/src/AvaloniaEdit/Rendering/TextView.cs b/src/AvaloniaEdit/Rendering/TextView.cs
index 0b1ae2aa..e00665c1 100644
--- a/src/AvaloniaEdit/Rendering/TextView.cs
+++ b/src/AvaloniaEdit/Rendering/TextView.cs
@@ -745,7 +745,7 @@ private void InvalidateMeasure(DispatcherPriority priority)
             {
                 if (_invalidateMeasureOperation == null)
                 {
-                    _invalidateMeasureOperation = Dispatcher.UIThread.InvokeTaskAsync(
+                    _invalidateMeasureOperation = Dispatcher.UIThread.InvokeAsync(
                         delegate
                         {
                             _invalidateMeasureOperation = null;
diff --git a/src/AvaloniaEdit/Utils/ExtensionMethods.cs b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
index 81458fa3..6ccee687 100644
--- a/src/AvaloniaEdit/Utils/ExtensionMethods.cs
+++ b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
@@ -15,7 +15,6 @@
 // FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/src/AvaloniaEdit/Utils/IFreezable.cs b/src/AvaloniaEdit/Utils/IFreezable.cs
index b8a0c585..ac0d97f1 100644
--- a/src/AvaloniaEdit/Utils/IFreezable.cs
+++ b/src/AvaloniaEdit/Utils/IFreezable.cs
@@ -34,12 +34,7 @@ internal interface IFreezable
 		/// Freezes this instance.
 		/// </summary>
 		void Freeze();
-	}
-
-    internal interface ICloneable
-    {
-        object Clone();
-    }
+	}    
 
     internal static class FreezableHelper
 	{