diff --git a/Avalonia.sln b/Avalonia.sln
index 76d8a14524..f71a94888d 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -186,6 +186,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Designer.HostApp.N
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.UnitTests", "tests\Avalonia.Skia.UnitTests\Avalonia.Skia.UnitTests.csproj", "{E1240B49-7B4B-4371-A00E-068778C5CF0B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.OpenGL", "src\Avalonia.OpenGL\Avalonia.OpenGL.csproj", "{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
@@ -1663,6 +1665,30 @@ Global
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhone.Build.0 = Release|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhone.Build.0 = Release|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build.cake b/build.cake
index 24f529ee4a..56653109ae 100644
--- a/build.cake
+++ b/build.cake
@@ -170,6 +170,7 @@ Task("Run-Unit-Tests-Impl")
     RunCoreTest("./tests/Avalonia.Styling.UnitTests", data.Parameters, false);
     RunCoreTest("./tests/Avalonia.Visuals.UnitTests", data.Parameters, false);
     RunCoreTest("./tests/Avalonia.Skia.UnitTests", data.Parameters, false);
+    RunCoreTest("./tests/Avalonia.ReactiveUI.UnitTests", data.Parameters, false);
     if (data.Parameters.IsRunningOnWindows)
     {
         RunCoreTest("./tests/Avalonia.Direct2D1.UnitTests", data.Parameters, false);
diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
index acdfdd215a..1208be34b8 100644
--- a/build/ReactiveUI.props
+++ b/build/ReactiveUI.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="reactiveui" Version="8.7.1" />
+    <PackageReference Include="reactiveui" Version="9.0.1" />
   </ItemGroup>
 </Project>
diff --git a/packages.cake b/packages.cake
index 9defa3004c..fea45153f1 100644
--- a/packages.cake
+++ b/packages.cake
@@ -167,6 +167,7 @@ public class Packages
             new [] { "./src/", "Avalonia.Logging.Serilog"},
             new [] { "./src/", "Avalonia.Visuals"},
             new [] { "./src/", "Avalonia.Styling"},
+            new [] { "./src/", "Avalonia.OpenGL"},
             new [] { "./src/", "Avalonia.Themes.Default"},
             new [] { "./src/Markup/", "Avalonia.Markup"},
             new [] { "./src/Markup/", "Avalonia.Markup.Xaml"},
diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index 43971dec4f..95d515ec60 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -14,6 +14,11 @@
       <Setter Property="FontSize" Value="13"/>
     </Style>
 
-    <StyleInclude Source="resm:ControlCatalog.SideBar.xaml"/>
+      <Style Selector="TextBlock.h3">
+          <Setter Property="Foreground" Value="#a2a2a2"/>
+          <Setter Property="FontSize" Value="13"/>
+      </Style>
+
+      <StyleInclude Source="resm:ControlCatalog.SideBar.xaml"/>
   </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml b/samples/ControlCatalog/Pages/MenuPage.xaml
index 296cfa8704..c5aa35312c 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml
@@ -7,29 +7,46 @@
               Margin="0,16,0,0"
               HorizontalAlignment="Center"
               Spacing="16">
-            <Menu>
-                <MenuItem Header="_First">
-                    <MenuItem Header="Standard _Menu Item"/>
-                    <Separator/>
-                    <MenuItem Header="Menu with _Submenu">
-                        <MenuItem Header="Submenu _1"/>
-                        <MenuItem Header="Submenu _2"/>
+            <StackPanel>
+                <TextBlock Classes="h3" Margin="4 8">Defined in XAML</TextBlock>
+                <Menu>
+                    <MenuItem Header="_First">
+                        <MenuItem Header="Standard _Menu Item"/>
+                        <Separator/>
+                        <MenuItem Header="Menu with _Submenu">
+                            <MenuItem Header="Submenu _1"/>
+                            <MenuItem Header="Submenu _2"/>
+                        </MenuItem>
+                        <MenuItem Header="Menu Item with _Icon">
+                            <MenuItem.Icon>
+                                <Image Source="resm:ControlCatalog.Assets.github_icon.png"/>
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="Menu Item with _Checkbox">
+                            <MenuItem.Icon>
+                                <CheckBox BorderThickness="0" IsHitTestVisible="False" IsChecked="True"/>
+                            </MenuItem.Icon>
+                        </MenuItem>
                     </MenuItem>
-                    <MenuItem Header="Menu Item with _Icon">
-                        <MenuItem.Icon>
-                            <Image Source="resm:ControlCatalog.Assets.github_icon.png"/>
-                        </MenuItem.Icon>
+                    <MenuItem Header="_Second">
+                        <MenuItem Header="Second _Menu Item"/>
                     </MenuItem>
-                    <MenuItem Header="Menu Item with _Checkbox">
-                        <MenuItem.Icon>
-                            <CheckBox BorderThickness="0" IsHitTestVisible="False" IsChecked="True"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </MenuItem>
-                <MenuItem Header="_Second">
-                    <MenuItem Header="Second _Menu Item"/>
-                </MenuItem>
-            </Menu>
+                </Menu>
+            </StackPanel>
+
+            <StackPanel>
+                <TextBlock Classes="h3" Margin="4 8">Dyanamically generated</TextBlock>
+                <Menu Items="{Binding MenuItems}">
+                    <Menu.Styles>
+                        <Style Selector="MenuItem">
+                            <Setter Property="Header" Value="{Binding Header}"/>
+                            <Setter Property="Items" Value="{Binding Items}"/>
+                            <Setter Property="Command" Value="{Binding Command}"/>
+                            <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
+                        </Style>
+                    </Menu.Styles>
+                </Menu>
+            </StackPanel>
         </StackPanel>
     </StackPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml.cs b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
index d637c172e1..ec7c000fe6 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
@@ -1,5 +1,10 @@
+using System.Collections.Generic;
+using System.Reactive;
+using System.Threading.Tasks;
+using System.Windows.Input;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using ReactiveUI;
 
 namespace ControlCatalog.Pages
 {
@@ -8,6 +13,51 @@ namespace ControlCatalog.Pages
         public MenuPage()
         {
             this.InitializeComponent();
+            var vm = new MenuPageViewModel();
+
+            vm.MenuItems = new[]
+            {
+                new MenuItemViewModel
+                {
+                    Header = "_File",
+                    Items = new[]
+                    {
+                        new MenuItemViewModel { Header = "_Open...", Command = vm.OpenCommand },
+                        new MenuItemViewModel { Header = "Save", Command = vm.SaveCommand },
+                        new MenuItemViewModel { Header = "-" },
+                        new MenuItemViewModel
+                        {
+                            Header = "Recent",
+                            Items = new[]
+                            {
+                                new MenuItemViewModel
+                                {
+                                    Header = "File1.txt",
+                                    Command = vm.OpenRecentCommand,
+                                    CommandParameter = @"c:\foo\File1.txt"
+                                },
+                                new MenuItemViewModel
+                                {
+                                    Header = "File2.txt",
+                                    Command = vm.OpenRecentCommand,
+                                    CommandParameter = @"c:\foo\File2.txt"
+                                },
+                            }
+                        },
+                    }
+                },
+                new MenuItemViewModel
+                {
+                    Header = "_Edit",
+                    Items = new[]
+                    {
+                        new MenuItemViewModel { Header = "_Copy" },
+                        new MenuItemViewModel { Header = "_Paste" },
+                    }
+                }
+            };
+
+            DataContext = vm;
         }
 
         private void InitializeComponent()
@@ -15,4 +65,51 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
         }
     }
+
+    public class MenuPageViewModel
+    {
+        public MenuPageViewModel()
+        {
+            OpenCommand = ReactiveCommand.CreateFromTask(Open);
+            SaveCommand = ReactiveCommand.Create(Save);
+            OpenRecentCommand = ReactiveCommand.Create<string>(OpenRecent);
+        }
+
+        public IReadOnlyList<MenuItemViewModel> MenuItems { get; set; }
+        public ReactiveCommand<Unit, Unit> OpenCommand { get; }
+        public ReactiveCommand<Unit, Unit> SaveCommand { get; }
+        public ReactiveCommand<string, Unit> OpenRecentCommand { get; }
+
+        public async Task Open()
+        {
+            var dialog = new OpenFileDialog();
+            var result = await dialog.ShowAsync();
+
+            if (result != null)
+            {
+                foreach (var path in result)
+                {
+                    System.Diagnostics.Debug.WriteLine($"Opened: {path}");
+                }
+            }
+        }
+
+        public void Save()
+        {
+            System.Diagnostics.Debug.WriteLine("Save");
+        }
+
+        public void OpenRecent(string path)
+        {
+            System.Diagnostics.Debug.WriteLine($"Open recent: {path}");
+        }
+    }
+
+    public class MenuItemViewModel
+    {
+        public string Header { get; set; }
+        public ICommand Command { get; set; }
+        public object CommandParameter { get; set; }
+        public IList<MenuItemViewModel> Items { get; set; }
+    }
 }
diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml
index 5287e4e373..473807ac50 100644
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml
@@ -107,9 +107,12 @@
   </UserControl.Styles>
   <Grid>
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" ClipToBounds="False">
+      <StackPanel.Clock>
+          <Clock />
+      </StackPanel.Clock>
       <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
         <TextBlock VerticalAlignment="Center">Hover to activate Transform Keyframe Animations.</TextBlock>
-        <Button Content="{Binding PlayStateText}" Command="{Binding ToggleGlobalPlayState}"/>
+        <Button Content="{Binding PlayStateText}" Command="{Binding TogglePlayState}" Click="ToggleClock" />
       </StackPanel>
       <WrapPanel ClipToBounds="False">
         <Border Classes="Test Rect1" Background="DarkRed"/>
@@ -120,4 +123,4 @@
       </WrapPanel>
     </StackPanel>
   </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml.cs b/samples/RenderDemo/Pages/AnimationsPage.xaml.cs
index 5b02fd9297..2195b3d494 100644
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml.cs
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using RenderDemo.ViewModels;
@@ -23,5 +24,20 @@ namespace RenderDemo.Pages
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        private void ToggleClock(object sender, RoutedEventArgs args)
+        {
+            var button = sender as Button;
+            var clock = button.Clock;
+
+            if (clock.PlayState == PlayState.Run)
+            {
+                clock.PlayState = PlayState.Pause;
+            }
+            else if (clock.PlayState == PlayState.Pause)
+            {
+                clock.PlayState = PlayState.Run;
+            }
+        }
     }
 }
diff --git a/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs b/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs
index f724baf3c6..7b89b7944c 100644
--- a/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs
+++ b/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs
@@ -6,27 +6,15 @@ namespace RenderDemo.ViewModels
 {
     public class AnimationsPageViewModel : ReactiveObject
     {
-        private string _playStateText = "Pause all animations";
+        private bool _isPlaying = true;
 
-        public AnimationsPageViewModel()
-        {
-            ToggleGlobalPlayState = ReactiveCommand.Create(() => TogglePlayState());
-        }
+        private string _playStateText = "Pause animations on this page";
 
-        void TogglePlayState()
+        public void TogglePlayState()
         {
-            switch (Animation.GlobalPlayState)
-            {
-                case PlayState.Run:
-                    PlayStateText = "Resume all animations";
-                    Animation.GlobalPlayState = PlayState.Pause;
-                    break;
-
-                case PlayState.Pause:
-                    PlayStateText = "Pause all animations";
-                    Animation.GlobalPlayState = PlayState.Run;
-                    break;
-            }
+            PlayStateText = _isPlaying
+                ? "Resume animations on this page" : "Pause animations on this page";
+            _isPlaying = !_isPlaying;
         }
 
         public string PlayStateText
@@ -34,7 +22,5 @@ namespace RenderDemo.ViewModels
             get { return _playStateText; }
             set { this.RaiseAndSetIfChanged(ref _playStateText, value); }
         }
-
-        public ReactiveCommand ToggleGlobalPlayState { get; }
     }
 }
diff --git a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
index eb08ef9656..eba17f92e4 100644
--- a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using ReactiveUI.Legacy;
 using ReactiveUI;
 
 namespace VirtualizationDemo.ViewModels
diff --git a/samples/interop/Direct3DInteropSample/MainWindow.cs b/samples/interop/Direct3DInteropSample/MainWindow.cs
index 19c31a3af1..1ac4b44a74 100644
--- a/samples/interop/Direct3DInteropSample/MainWindow.cs
+++ b/samples/interop/Direct3DInteropSample/MainWindow.cs
@@ -1,81 +1,83 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Direct2D1;
 using Avalonia.Direct2D1.Media;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+
 using SharpDX;
 using SharpDX.D3DCompiler;
 using SharpDX.Direct2D1;
 using SharpDX.Direct3D;
 using SharpDX.Direct3D11;
 using SharpDX.DXGI;
-using SharpDX.WIC;
-using SharpDX.Mathematics;
+
 using AlphaMode = SharpDX.Direct2D1.AlphaMode;
 using Buffer = SharpDX.Direct3D11.Buffer;
-using DeviceContext = SharpDX.Direct3D11.DeviceContext;
-using Factory1 = SharpDX.DXGI.Factory1;
+using DeviceContext = SharpDX.Direct2D1.DeviceContext;
+using Factory2 = SharpDX.DXGI.Factory2;
 using InputElement = SharpDX.Direct3D11.InputElement;
 using Matrix = SharpDX.Matrix;
 using PixelFormat = SharpDX.Direct2D1.PixelFormat;
+using Resource = SharpDX.Direct3D11.Resource;
 
 namespace Direct3DInteropSample
 {
-    class MainWindow : Window
+    public class MainWindow : Window
     {
-        private SharpDX.Direct3D11.Device _d3dDevice;
-        private SharpDX.DXGI.Device _dxgiDevice;
-        Texture2D backBuffer = null;
-        RenderTargetView renderView = null;
-        Texture2D depthBuffer = null;
-        DepthStencilView depthView = null;
+        Texture2D _backBuffer;
+        RenderTargetView _renderView;
+        Texture2D _depthBuffer;
+        DepthStencilView _depthView;
         private readonly SwapChain _swapChain;
-        private SwapChainDescription _desc;
+        private SwapChainDescription1 _desc;
         private Matrix _proj = Matrix.Identity;
-        private Matrix _view;
+        private readonly Matrix _view;
         private Buffer _contantBuffer;
-        private SharpDX.Direct2D1.Device _d2dDevice;
-        private SharpDX.Direct2D1.DeviceContext _d2dContext;
-        private RenderTarget _d2dRenderTarget;
-        private MainWindowViewModel _model;
+        private DeviceContext _deviceContext;
+        private readonly MainWindowViewModel _model;
 
         public MainWindow()
         {
-            _dxgiDevice = AvaloniaLocator.Current.GetService<SharpDX.DXGI.Device>();
-            _d3dDevice = _dxgiDevice.QueryInterface<SharpDX.Direct3D11.Device>();
-            _d2dDevice = AvaloniaLocator.Current.GetService<SharpDX.Direct2D1.Device>();
             DataContext = _model = new MainWindowViewModel();
-            _desc = new SwapChainDescription()
+
+            _desc = new SwapChainDescription1()
             {
                 BufferCount = 1,
-                ModeDescription =
-                   new ModeDescription((int)ClientSize.Width, (int)ClientSize.Height,
-                            new Rational(60, 1), Format.R8G8B8A8_UNorm),
-                IsWindowed = true,
-                OutputHandle = PlatformImpl?.Handle.Handle ?? IntPtr.Zero,
+                Width = (int)ClientSize.Width,
+                Height = (int)ClientSize.Height,
+                Format = Format.R8G8B8A8_UNorm,                
                 SampleDescription = new SampleDescription(1, 0),
                 SwapEffect = SwapEffect.Discard,
                 Usage = Usage.RenderTargetOutput
             };
 
-            _swapChain = new SwapChain(new Factory1(), _d3dDevice, _desc);
+            using (var factory = Direct2D1Platform.DxgiDevice.Adapter.GetParent<Factory2>())
+            {
+                _swapChain = new SwapChain1(factory, Direct2D1Platform.DxgiDevice, PlatformImpl?.Handle.Handle ?? IntPtr.Zero, ref _desc);
+            }              
 
-            _d2dContext = new SharpDX.Direct2D1.DeviceContext(_d2dDevice, DeviceContextOptions.None)
+            _deviceContext = new DeviceContext(Direct2D1Platform.Direct2D1Device, DeviceContextOptions.None)
             {
                 DotsPerInch = new Size2F(96, 96)
             };
 
             CreateMesh();
+
             _view = Matrix.LookAtLH(new Vector3(0, 0, -5), new Vector3(0, 0, 0), Vector3.UnitY);
+
             this.GetObservable(ClientSizeProperty).Subscribe(Resize);
+
             Resize(ClientSize);
+
             AvaloniaXamlLoader.Load(this);
+
             Background = Avalonia.Media.Brushes.Transparent;
         }
 
@@ -83,29 +85,32 @@ namespace Direct3DInteropSample
         protected override void HandlePaint(Rect rect)
         {
             var viewProj = Matrix.Multiply(_view, _proj);
-            var context = _d3dDevice.ImmediateContext;
+            var context = Direct2D1Platform.Direct3D11Device.ImmediateContext;
+
             // Clear views
-            context.ClearDepthStencilView(depthView, DepthStencilClearFlags.Depth, 1.0f, 0);
-            context.ClearRenderTargetView(renderView, Color.White);
+            context.ClearDepthStencilView(_depthView, DepthStencilClearFlags.Depth, 1.0f, 0);
+            context.ClearRenderTargetView(_renderView, Color.White);
 
             // Update WorldViewProj Matrix
-            var worldViewProj = Matrix.RotationX((float) _model.RotationX) * Matrix.RotationY((float) _model.RotationY) *
-                                Matrix.RotationZ((float) _model.RotationZ)
-                                * Matrix.Scaling((float) _model.Zoom) * viewProj;
+            var worldViewProj = Matrix.RotationX((float)_model.RotationX) * Matrix.RotationY((float)_model.RotationY)
+                                                                          * Matrix.RotationZ((float)_model.RotationZ)
+                                                                          * Matrix.Scaling((float)_model.Zoom)
+                                                                          * viewProj;
             worldViewProj.Transpose();
             context.UpdateSubresource(ref worldViewProj, _contantBuffer);
 
             // Draw the cube
             context.Draw(36, 0);
             base.HandlePaint(rect);
+
             // Present!
             _swapChain.Present(0, PresentFlags.None);
         }
 
-        
-        void CreateMesh()
+        private void CreateMesh()
         {
-            var device = _d3dDevice;
+            var device = Direct2D1Platform.Direct3D11Device;
+
             // Compile Vertex and Pixel shaders
             var vertexShaderByteCode = ShaderBytecode.CompileFromFile("MiniCube.fx", "VS", "vs_4_0");
             var vertexShader = new VertexShader(device, vertexShaderByteCode);
@@ -114,63 +119,72 @@ namespace Direct3DInteropSample
             var pixelShader = new PixelShader(device, pixelShaderByteCode);
 
             var signature = ShaderSignature.GetInputSignature(vertexShaderByteCode);
+
+            var inputElements = new[]
+                                {
+                                    new InputElement("POSITION", 0, Format.R32G32B32A32_Float, 0, 0),
+                                    new InputElement("COLOR", 0, Format.R32G32B32A32_Float, 16, 0)
+                                };
+
             // Layout from VertexShader input signature
-            var layout = new InputLayout(device, signature, new[]
-                    {
-                        new InputElement("POSITION", 0, Format.R32G32B32A32_Float, 0, 0),
-                        new InputElement("COLOR", 0, Format.R32G32B32A32_Float, 16, 0)
-                    });
-            
-            // Instantiate Vertex buiffer from vertex data
-            var vertices = Buffer.Create(device, BindFlags.VertexBuffer, new[]
-                                  {
-                                      new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f), // Front
-                                      new Vector4(-1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
-                                      new Vector4( 1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
-                                      new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
-                                      new Vector4( 1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
-                                      new Vector4( 1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
-
-                                      new Vector4(-1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f), // BACK
-                                      new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4(-1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4(-1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4( 1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
-
-                                      new Vector4(-1.0f, 1.0f, -1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f), // Top
-                                      new Vector4(-1.0f, 1.0f,  1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4( 1.0f, 1.0f,  1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4(-1.0f, 1.0f, -1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4( 1.0f, 1.0f,  1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4( 1.0f, 1.0f, -1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
-
-                                      new Vector4(-1.0f,-1.0f, -1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f), // Bottom
-                                      new Vector4( 1.0f,-1.0f,  1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4(-1.0f,-1.0f,  1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4(-1.0f,-1.0f, -1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4( 1.0f,-1.0f, -1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
-                                      new Vector4( 1.0f,-1.0f,  1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
-
-                                      new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f), // Left
-                                      new Vector4(-1.0f, -1.0f,  1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4(-1.0f,  1.0f,  1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4(-1.0f,  1.0f,  1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
-                                      new Vector4(-1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
-
-                                      new Vector4( 1.0f, -1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f), // Right
-                                      new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
-                                      new Vector4( 1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
-                                      new Vector4( 1.0f, -1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
-                                      new Vector4( 1.0f,  1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
-                                      new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
-                            });
+            var layout = new InputLayout(
+                device,
+                signature,
+                inputElements);
+
+            // Instantiate Vertex buffer from vertex data
+            var vertices = Buffer.Create(
+                device,
+                BindFlags.VertexBuffer,
+                new[]
+                {
+                    new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f), // Front
+                    new Vector4(-1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                    new Vector4( 1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                    new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                    new Vector4( 1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                    new Vector4( 1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+
+                    new Vector4(-1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f), // BACK
+                    new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4(-1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4(-1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4( 1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+
+                    new Vector4(-1.0f, 1.0f, -1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f), // Top
+                    new Vector4(-1.0f, 1.0f,  1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4( 1.0f, 1.0f,  1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4(-1.0f, 1.0f, -1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4( 1.0f, 1.0f,  1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4( 1.0f, 1.0f, -1.0f,  1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+
+                    new Vector4(-1.0f, -1.0f, -1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f), // Bottom
+                    new Vector4( 1.0f, -1.0f,  1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4(-1.0f, -1.0f,  1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4(-1.0f, -1.0f, -1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4( 1.0f, -1.0f, -1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4( 1.0f, -1.0f,  1.0f,  1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+
+                    new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f), // Left
+                    new Vector4(-1.0f, -1.0f,  1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4(-1.0f,  1.0f,  1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4(-1.0f,  1.0f,  1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                    new Vector4(-1.0f,  1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+
+                    new Vector4( 1.0f, -1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f), // Right
+                    new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                    new Vector4( 1.0f, -1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                    new Vector4( 1.0f, -1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                    new Vector4( 1.0f,  1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                    new Vector4( 1.0f,  1.0f,  1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                });
 
             // Create Constant Buffer
             _contantBuffer = new Buffer(device, Utilities.SizeOf<Matrix>(), ResourceUsage.Default, BindFlags.ConstantBuffer, CpuAccessFlags.None, ResourceOptionFlags.None, 0);
 
-            var context = _d3dDevice.ImmediateContext;
+            var context = Direct2D1Platform.Direct3D11Device.ImmediateContext;
 
             // Prepare All the stages
             context.InputAssembler.InputLayout = layout;
@@ -181,63 +195,73 @@ namespace Direct3DInteropSample
             context.PixelShader.Set(pixelShader);
         }
 
-        void Resize(Size size)
+        private void Resize(Size size)
         {
-            Utilities.Dispose(ref _d2dRenderTarget);
-            Utilities.Dispose(ref backBuffer);
-            Utilities.Dispose(ref renderView);
-            Utilities.Dispose(ref depthBuffer);
-            Utilities.Dispose(ref depthView);
-            var context = _d3dDevice.ImmediateContext;
+            Utilities.Dispose(ref _deviceContext);
+            Utilities.Dispose(ref _backBuffer);
+            Utilities.Dispose(ref _renderView);
+            Utilities.Dispose(ref _depthBuffer);
+            Utilities.Dispose(ref _depthView);
+            var context = Direct2D1Platform.Direct3D11Device.ImmediateContext;
+
             // Resize the backbuffer
-            _swapChain.ResizeBuffers(_desc.BufferCount, (int)size.Width, (int)size.Height, Format.Unknown, SwapChainFlags.None);
+            _swapChain.ResizeBuffers(0, 0, 0, Format.Unknown, SwapChainFlags.None);
 
             // Get the backbuffer from the swapchain
-            backBuffer = Texture2D.FromSwapChain<Texture2D>(_swapChain, 0);
+            _backBuffer = Resource.FromSwapChain<Texture2D>(_swapChain, 0);
 
             // Renderview on the backbuffer
-            renderView = new RenderTargetView(_d3dDevice, backBuffer);
+            _renderView = new RenderTargetView(Direct2D1Platform.Direct3D11Device, _backBuffer);
 
             // Create the depth buffer
-            depthBuffer = new Texture2D(_d3dDevice, new Texture2DDescription()
-            {
-                Format = Format.D32_Float_S8X24_UInt,
-                ArraySize = 1,
-                MipLevels = 1,
-                Width = (int)size.Width,
-                Height = (int)size.Height,
-                SampleDescription = new SampleDescription(1, 0),
-                Usage = ResourceUsage.Default,
-                BindFlags = BindFlags.DepthStencil,
-                CpuAccessFlags = CpuAccessFlags.None,
-                OptionFlags = ResourceOptionFlags.None
-            });
+            _depthBuffer = new Texture2D(
+                Direct2D1Platform.Direct3D11Device,
+                new Texture2DDescription()
+                {
+                    Format = Format.D32_Float_S8X24_UInt,
+                    ArraySize = 1,
+                    MipLevels = 1,
+                    Width = (int)size.Width,
+                    Height = (int)size.Height,
+                    SampleDescription = new SampleDescription(1, 0),
+                    Usage = ResourceUsage.Default,
+                    BindFlags = BindFlags.DepthStencil,
+                    CpuAccessFlags = CpuAccessFlags.None,
+                    OptionFlags = ResourceOptionFlags.None
+                });
 
             // Create the depth buffer view
-            depthView = new DepthStencilView(_d3dDevice, depthBuffer);
+            _depthView = new DepthStencilView(Direct2D1Platform.Direct3D11Device, _depthBuffer);
 
             // Setup targets and viewport for rendering
             context.Rasterizer.SetViewport(new Viewport(0, 0, (int)size.Width, (int)size.Height, 0.0f, 1.0f));
-            context.OutputMerger.SetTargets(depthView, renderView);
+            context.OutputMerger.SetTargets(_depthView, _renderView);
 
             // Setup new projection matrix with correct aspect ratio
             _proj = Matrix.PerspectiveFovLH((float)Math.PI / 4.0f, (float)(size.Width / size.Height), 0.1f, 100.0f);
 
             using (var dxgiBackBuffer = _swapChain.GetBackBuffer<Surface>(0))
             {
-                _d2dRenderTarget = new RenderTarget(AvaloniaLocator.Current.GetService<SharpDX.Direct2D1.Factory>()
-                    , dxgiBackBuffer, new RenderTargetProperties
+                var renderTarget = new SharpDX.Direct2D1.RenderTarget(
+                    Direct2D1Platform.Direct2D1Factory,
+                    dxgiBackBuffer,
+                    new RenderTargetProperties
                     {
                         DpiX = 96,
                         DpiY = 96,
                         Type = RenderTargetType.Default,
-                        PixelFormat = new PixelFormat(Format.Unknown, AlphaMode.Premultiplied)
+                        PixelFormat = new PixelFormat(
+                            Format.Unknown,
+                            AlphaMode.Premultiplied)
                     });
-            }
 
+                _deviceContext = renderTarget.QueryInterface<DeviceContext>();
+
+                renderTarget.Dispose();
+            }
         }
 
-        class D3DRenderTarget: IRenderTarget
+        private class D3DRenderTarget : IRenderTarget
         {
             private readonly MainWindow _window;
 
@@ -245,16 +269,14 @@ namespace Direct3DInteropSample
             {
                 _window = window;
             }
+
             public void Dispose()
             {
-                
             }
 
             public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
             {
-                return new DrawingContextImpl(visualBrushRenderer, null, _window._d2dRenderTarget,
-                    AvaloniaLocator.Current.GetService<SharpDX.DirectWrite.Factory>(),
-                    AvaloniaLocator.Current.GetService<ImagingFactory>());
+                return new DrawingContextImpl(visualBrushRenderer, null, _window._deviceContext);
             }
         }
 
diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 2b46bfa492..5f0edadf63 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -52,7 +52,8 @@ namespace Avalonia.Android
                 .Bind<ISystemDialogImpl>().ToTransient<SystemDialogImpl>()
                 .Bind<IWindowingPlatform>().ToConstant(Instance)
                 .Bind<IPlatformIconLoader>().ToSingleton<PlatformIconLoader>()
-                .Bind<IRenderLoop>().ToConstant(new DefaultRenderLoop(60))
+                .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
+                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IAssetLoader>().ToConstant(new AssetLoader(app.GetType().Assembly));
 
             SkiaPlatform.Initialize();
diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
index 8a1a17a6fc..516f383b92 100644
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@@ -14,26 +14,14 @@ namespace Avalonia.Animation
     /// Base class for all animatable objects.
     /// </summary>
     public class Animatable : AvaloniaObject
-    { 
-        /// <summary>
-        /// Defines the <see cref="PlayState"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animatable, PlayState> PlayStateProperty =
-            AvaloniaProperty.RegisterDirect<Animatable, PlayState>(
-                nameof(PlayState),
-                o => o.PlayState,
-                (o, v) => o.PlayState = v);
-
-        private PlayState _playState = PlayState.Run;
+    {
+        public static readonly StyledProperty<IClock> ClockProperty =
+            AvaloniaProperty.Register<Animatable, IClock>(nameof(Clock), inherits: true);
 
-        /// <summary>
-        /// Gets or sets the state of the animation for this
-        /// control.
-        /// </summary>
-        public PlayState PlayState
+        public IClock Clock
         {
-            get { return _playState; }
-            set { SetAndRaise(PlayStateProperty, ref _playState, value); }
+            get => GetValue(ClockProperty);
+            set => SetValue(ClockProperty, value);
         }
 
         /// <summary>
@@ -69,9 +57,9 @@ namespace Avalonia.Animation
 
                 if (match != null)
                 {
-                    match.Apply(this, e.OldValue, e.NewValue);
+                    match.Apply(this, Clock ?? Avalonia.Animation.Clock.GlobalClock, e.OldValue, e.NewValue);
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index 2c359ecac3..d7efc69e10 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -17,11 +17,6 @@ namespace Avalonia.Animation
     /// </summary>
     public class Animation : AvaloniaList<KeyFrame>, IAnimation
     {
-        /// <summary>
-        /// Gets or sets the animation play state for all animations
-        /// </summary> 
-        public static PlayState GlobalPlayState { get; set; } = PlayState.Run;
-
         /// <summary>
         /// Gets or sets the active time of this animation.
         /// </summary>
@@ -149,12 +144,12 @@ namespace Avalonia.Animation
         }
 
         /// <inheritdocs/>
-        public IDisposable Apply(Animatable control, IObservable<bool> match, Action onComplete)
+        public IDisposable Apply(Animatable control, IClock clock, IObservable<bool> match, Action onComplete)
         {
             var (animators, subscriptions) = InterpretKeyframes(control);
             if (animators.Count == 1)
             {
-                subscriptions.Add(animators[0].Apply(this, control, match, onComplete));
+                subscriptions.Add(animators[0].Apply(this, control, clock, match, onComplete));
             }
             else
             {
@@ -168,7 +163,7 @@ namespace Avalonia.Animation
                         animatorOnComplete = () => tcs.SetResult(null);
                         completionTasks.Add(tcs.Task);
                     }
-                    subscriptions.Add(animator.Apply(this, control, match, animatorOnComplete));
+                    subscriptions.Add(animator.Apply(this, control, clock, match, animatorOnComplete));
                 }
 
                 if (onComplete != null)
@@ -180,7 +175,7 @@ namespace Avalonia.Animation
         }
 
         /// <inheritdocs/>
-        public Task RunAsync(Animatable control)
+        public Task RunAsync(Animatable control, IClock clock = null)
         {
             var run = new TaskCompletionSource<object>();
 
@@ -188,7 +183,7 @@ namespace Avalonia.Animation
                 run.SetException(new InvalidOperationException("Looping animations must not use the Run method."));
 
             IDisposable subscriptions = null;
-            subscriptions = this.Apply(control, Observable.Return(true), () =>
+            subscriptions = this.Apply(control, clock, Observable.Return(true), () =>
             {
                 run.SetResult(null);
                 subscriptions?.Dispose();
diff --git a/src/Avalonia.Animation/AnimationInstance`1.cs b/src/Avalonia.Animation/AnimationInstance`1.cs
index 5a72904ed2..1ad609bce8 100644
--- a/src/Avalonia.Animation/AnimationInstance`1.cs
+++ b/src/Avalonia.Animation/AnimationInstance`1.cs
@@ -8,7 +8,7 @@ using Avalonia.Reactive;
 namespace Avalonia.Animation
 {
     /// <summary>
-    /// Handles interpolatoin and time-related functions 
+    /// Handles interpolation and time-related functions 
     /// for keyframe animations.
     /// </summary>
     internal class AnimationInstance<T> : SingleSubscriberObservableBase<T>
@@ -19,7 +19,6 @@ namespace Avalonia.Animation
         private double _currentIteration;
         private bool _isLooping;
         private bool _gotFirstKFValue;
-        private bool _gotFirstFrameCount;
         private bool _iterationDelay;
         private FillMode _fillMode;
         private PlaybackDirection _animationDirection;
@@ -29,15 +28,14 @@ namespace Avalonia.Animation
         private double _speedRatio;
         private TimeSpan _delay;
         private TimeSpan _duration;
-        private TimeSpan _firstFrameCount;
-        private TimeSpan _internalClock;
-        private TimeSpan? _previousClock;
         private Easings.Easing _easeFunc;
         private Action _onCompleteAction;
         private Func<double, T, T> _interpolator;
         private IDisposable _timerSubscription;
+        private readonly IClock _baseClock;
+        private IClock _clock;
 
-        public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, Action OnComplete, Func<double, T, T> Interpolator)
+        public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, IClock baseClock, Action OnComplete, Func<double, T, T> Interpolator)
         {
             if (animation.SpeedRatio <= 0)
                 throw new InvalidOperationException("Speed ratio cannot be negative or zero.");
@@ -73,17 +71,19 @@ namespace Avalonia.Animation
             _fillMode = animation.FillMode;
             _onCompleteAction = OnComplete;
             _interpolator = Interpolator;
+            _baseClock = baseClock;
         }
 
         protected override void Unsubscribed()
         {
             _timerSubscription?.Dispose();
+            _clock.PlayState = PlayState.Stop;
         }
 
         protected override void Subscribed()
         {
-            _timerSubscription = Timing.AnimationsTimer
-                                       .Subscribe(p => this.Step(p));
+            _clock = new Clock(_baseClock);
+            _timerSubscription = _clock.Subscribe(Step);
         }
 
         public void Step(TimeSpan frameTick)
@@ -116,46 +116,21 @@ namespace Avalonia.Animation
                     PublishNext(_lastInterpValue);
         }
 
-        private void DoPlayStatesAndTime(TimeSpan systemTime)
+        private void DoPlayStates()
         {
-            if (Animation.GlobalPlayState == PlayState.Stop || _targetControl.PlayState == PlayState.Stop)
+            if (_clock.PlayState == PlayState.Stop || _baseClock.PlayState == PlayState.Stop)
                 DoComplete();
 
-            if (!_previousClock.HasValue)
-            {
-                _previousClock = systemTime;
-                _internalClock = TimeSpan.Zero;
-            }
-            else
-            {
-                if (Animation.GlobalPlayState == PlayState.Pause || _targetControl.PlayState == PlayState.Pause)
-                {
-                    _previousClock = systemTime;
-                    return;
-                }
-                var delta = systemTime - _previousClock;
-                _internalClock += delta.Value;
-                _previousClock = systemTime;
-            }
-
             if (!_gotFirstKFValue)
             {
                 _firstKFValue = (T)_parent.First().Value;
                 _gotFirstKFValue = true;
             }
-
-            if (!_gotFirstFrameCount)
-            {
-                _firstFrameCount = _internalClock;
-                _gotFirstFrameCount = true;
-            }
         }
 
-        private void InternalStep(TimeSpan systemTime)
+        private void InternalStep(TimeSpan time)
         {
-            DoPlayStatesAndTime(systemTime);
- 
-            var time = _internalClock - _firstFrameCount;
+            DoPlayStates();
             var delayEndpoint = _delay;
             var iterationEndpoint = delayEndpoint + _duration;
 
@@ -176,22 +151,18 @@ namespace Avalonia.Animation
                 }
 
                 //Calculate the current iteration number
-                _currentIteration = (int)Math.Floor((double)time.Ticks / iterationEndpoint.Ticks) + 2;
+                _currentIteration = (int)Math.Floor((double)((double)time.Ticks / iterationEndpoint.Ticks)) + 2;
             }
             else
             {
-                _previousClock = systemTime;
                 return;
             }
 
-            time = TimeSpan.FromTicks(time.Ticks % iterationEndpoint.Ticks);
+            time = TimeSpan.FromTicks((long)(time.Ticks % iterationEndpoint.Ticks));
 
             if (!_isLooping)
             {
-                if (_currentIteration > _repeatCount)
-                    DoComplete();
-
-                if (time > iterationEndpoint)
+                if ((_currentIteration > _repeatCount) || (time > iterationEndpoint))
                     DoComplete();
             }
 
@@ -225,4 +196,4 @@ namespace Avalonia.Animation
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Animation/Animator`1.cs b/src/Avalonia.Animation/Animator`1.cs
index f0ef55aa9e..d1a8960a10 100644
--- a/src/Avalonia.Animation/Animator`1.cs
+++ b/src/Avalonia.Animation/Animator`1.cs
@@ -1,10 +1,14 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Animation.Utils;
 using Avalonia.Collections;
 using Avalonia.Data;
+using Avalonia.Reactive;
 
 namespace Avalonia.Animation
 {
@@ -17,7 +21,7 @@ namespace Avalonia.Animation
         /// List of type-converted keyframes.
         /// </summary>
         private readonly List<AnimatorKeyFrame> _convertedKeyframes = new List<AnimatorKeyFrame>();
- 
+
         private bool _isVerifiedAndConverted;
 
         /// <summary>
@@ -28,21 +32,17 @@ namespace Avalonia.Animation
         public Animator()
         {
             // Invalidate keyframes when changed.
-             this.CollectionChanged += delegate { _isVerifiedAndConverted = false; };
+            this.CollectionChanged += delegate { _isVerifiedAndConverted = false; };
         }
 
         /// <inheritdoc/>
-        public virtual IDisposable Apply(Animation animation, Animatable control, IObservable<bool> match, Action onComplete)
+        public virtual IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> match, Action onComplete)
         {
-             if (!_isVerifiedAndConverted)
+            if (!_isVerifiedAndConverted)
                 VerifyConvertKeyFrames();
 
-            return match
-                .Where(p => p)
-                .Subscribe(_ =>
-                {
-                    var timerObs = RunKeyFrames(animation, control, onComplete);
-                });
+            var subject = new DisposeAnimationInstanceSubject<T>(this, animation, control, clock, onComplete);
+            return match.Subscribe(subject);
         }
 
         /// <summary>
@@ -52,58 +52,84 @@ namespace Avalonia.Animation
         /// (i.e., the normalized time between the selected keyframes, relative to the
         /// time parameter).
         /// </summary>
-        /// <param name="t">The time parameter, relative to the total animation time</param>
-        protected (double IntraKFTime, KeyFramePair<T> KFPair) GetKFPairAndIntraKFTime(double t)
+        /// <param name="animationTime">The time parameter, relative to the total animation time</param>
+        protected (double IntraKFTime, KeyFramePair<T> KFPair) GetKFPairAndIntraKFTime(double animationTime)
         {
-            AnimatorKeyFrame firstCue, lastCue ;
+            AnimatorKeyFrame firstKeyframe, lastKeyframe;
             int kvCount = _convertedKeyframes.Count;
             if (kvCount > 2)
             {
-                if (t <= 0.0)
+                if (animationTime <= 0.0)
                 {
-                    firstCue = _convertedKeyframes[0];
-                    lastCue = _convertedKeyframes[1];
+                    firstKeyframe = _convertedKeyframes[0];
+                    lastKeyframe = _convertedKeyframes[1];
                 }
-                else if (t >= 1.0)
+                else if (animationTime >= 1.0)
                 {
-                    firstCue = _convertedKeyframes[_convertedKeyframes.Count - 2];
-                    lastCue = _convertedKeyframes[_convertedKeyframes.Count - 1];
+                    firstKeyframe = _convertedKeyframes[_convertedKeyframes.Count - 2];
+                    lastKeyframe = _convertedKeyframes[_convertedKeyframes.Count - 1];
                 }
                 else
                 {
-                    (double time, int index) maxval = (0.0d, 0);
-                    for (int i = 0; i < _convertedKeyframes.Count; i++)
-                    {
-                        var comp = _convertedKeyframes[i].Cue.CueValue;
-                        if (t >= comp)
-                        {
-                            maxval = (comp, i);
-                        }
-                    }
-                    firstCue = _convertedKeyframes[maxval.index];
-                    lastCue = _convertedKeyframes[maxval.index + 1];
+                    int index = FindClosestBeforeKeyFrame(animationTime);
+                    firstKeyframe = _convertedKeyframes[index];
+                    lastKeyframe = _convertedKeyframes[index + 1];
                 }
             }
             else
             {
-                firstCue = _convertedKeyframes[0];
-                lastCue = _convertedKeyframes[1];
+                firstKeyframe = _convertedKeyframes[0];
+                lastKeyframe = _convertedKeyframes[1];
             }
 
-            double t0 = firstCue.Cue.CueValue;
-            double t1 = lastCue.Cue.CueValue;
-            var intraframeTime = (t - t0) / (t1 - t0);
-            var firstFrameData = (firstCue.GetTypedValue<T>(), firstCue.isNeutral);
-            var lastFrameData = (lastCue.GetTypedValue<T>(), lastCue.isNeutral);
+            double t0 = firstKeyframe.Cue.CueValue;
+            double t1 = lastKeyframe.Cue.CueValue;
+            var intraframeTime = (animationTime - t0) / (t1 - t0);
+            var firstFrameData = (firstKeyframe.GetTypedValue<T>(), firstKeyframe.isNeutral);
+            var lastFrameData = (lastKeyframe.GetTypedValue<T>(), lastKeyframe.isNeutral);
             return (intraframeTime, new KeyFramePair<T>(firstFrameData, lastFrameData));
         }
 
+        private int FindClosestBeforeKeyFrame(double time)
+        {
+            int FindClosestBeforeKeyFrame(int startIndex, int length)
+            {
+                if (length == 0 || length == 1)
+                {
+                    return startIndex;
+                }
+
+                int middle = startIndex + (length / 2);
+
+                if (_convertedKeyframes[middle].Cue.CueValue < time)
+                {
+                    return FindClosestBeforeKeyFrame(middle, length - middle);
+                }
+                else if (_convertedKeyframes[middle].Cue.CueValue > time)
+                {
+                    return FindClosestBeforeKeyFrame(startIndex, middle - startIndex);
+                }
+                else
+                {
+                    return middle;
+                }
+            }
+
+            return FindClosestBeforeKeyFrame(0, _convertedKeyframes.Count);
+        }
+
         /// <summary>
         /// Runs the KeyFrames Animation.
         /// </summary>
-        private IDisposable RunKeyFrames(Animation animation, Animatable control, Action onComplete)
+        internal IDisposable Run(Animation animation, Animatable control, IClock clock, Action onComplete)
         {
-            var instance = new AnimationInstance<T>(animation, control, this, onComplete, DoInterpolation);
+            var instance = new AnimationInstance<T>(
+                animation,
+                control,
+                this,
+                clock ?? control.Clock ?? Clock.GlobalClock,
+                onComplete,
+                DoInterpolation);
             return control.Bind<T>((AvaloniaProperty<T>)Property, instance, BindingPriority.Animation);
         }
 
@@ -124,14 +150,6 @@ namespace Avalonia.Animation
 
             AddNeutralKeyFramesIfNeeded();
 
-            var copy = _convertedKeyframes.ToList().OrderBy(p => p.Cue.CueValue);
-            _convertedKeyframes.Clear();
-
-            foreach (AnimatorKeyFrame keyframe in copy)
-            {
-                _convertedKeyframes.Add(keyframe);
-            }
-
             _isVerifiedAndConverted = true;
         }
 
@@ -161,7 +179,7 @@ namespace Avalonia.Animation
         {
             if (!hasStartKey)
             {
-                _convertedKeyframes.Add(new AnimatorKeyFrame(null, new Cue(0.0d)) { Value = default(T), isNeutral = true });
+                _convertedKeyframes.Insert(0, new AnimatorKeyFrame(null, new Cue(0.0d)) { Value = default(T), isNeutral = true });
             }
 
             if (!hasEndKey)
@@ -170,4 +188,4 @@ namespace Avalonia.Animation
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Animation/Clock.cs b/src/Avalonia.Animation/Clock.cs
new file mode 100644
index 0000000000..bea6c75982
--- /dev/null
+++ b/src/Avalonia.Animation/Clock.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Linq;
+using System.Text;
+using Avalonia.Reactive;
+
+namespace Avalonia.Animation
+{
+    public class Clock : ClockBase
+    {
+        public static IClock GlobalClock => AvaloniaLocator.Current.GetService<IGlobalClock>();
+
+        private IDisposable _parentSubscription;
+
+        public Clock()
+            :this(GlobalClock)
+        {
+        }
+        
+        public Clock(IClock parent)
+        {
+            _parentSubscription = parent.Subscribe(Pulse);
+        }
+
+        protected override void Stop()
+        {
+            _parentSubscription?.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/ClockBase.cs b/src/Avalonia.Animation/ClockBase.cs
new file mode 100644
index 0000000000..a2b29e728e
--- /dev/null
+++ b/src/Avalonia.Animation/ClockBase.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Linq;
+using System.Text;
+using Avalonia.Reactive;
+
+namespace Avalonia.Animation
+{
+    public class ClockBase : IClock
+    {
+        private ClockObservable _observable;
+
+        private IObservable<TimeSpan> _connectedObservable;
+
+        private TimeSpan? _previousTime;
+        private TimeSpan _internalTime;
+
+        protected ClockBase()
+        {
+            _observable = new ClockObservable();
+            _connectedObservable = _observable.Publish().RefCount();
+        }
+
+        protected bool HasSubscriptions => _observable.HasSubscriptions;
+
+        public PlayState PlayState { get; set; }
+
+        protected void Pulse(TimeSpan systemTime)
+        {
+            if (!_previousTime.HasValue)
+            {
+                _previousTime = systemTime;
+                _internalTime = TimeSpan.Zero;
+            }
+            else
+            {
+                if (PlayState == PlayState.Pause)
+                {
+                    _previousTime = systemTime;
+                    return;
+                }
+                var delta = systemTime - _previousTime;
+                _internalTime += delta.Value;
+                _previousTime = systemTime;
+            }
+
+            _observable.Pulse(_internalTime);
+
+            if (PlayState == PlayState.Stop)
+            {
+                Stop();
+            }
+        }
+
+        protected virtual void Stop()
+        {
+        }
+
+        public IDisposable Subscribe(IObserver<TimeSpan> observer)
+        {
+            return _connectedObservable.Subscribe(observer);
+        }
+
+        private class ClockObservable : LightweightObservableBase<TimeSpan>
+        {
+            public bool HasSubscriptions { get; private set; }
+            public void Pulse(TimeSpan time) => PublishNext(time);
+            protected override void Initialize() => HasSubscriptions = true;
+            protected override void Deinitialize() => HasSubscriptions = false;
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs b/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
new file mode 100644
index 0000000000..a535b30b58
--- /dev/null
+++ b/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
@@ -0,0 +1,65 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Animation.Utils;
+using Avalonia.Collections;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Manages the lifetime of animation instances as determined by its selector state.
+    /// </summary>
+    internal class DisposeAnimationInstanceSubject<T> : IObserver<bool>, IDisposable
+    {
+        private IDisposable _lastInstance;
+        private bool _lastMatch;
+        private Animator<T> _animator;
+        private Animation _animation;
+        private Animatable _control;
+        private Action _onComplete;
+        private IClock _clock;
+
+        public DisposeAnimationInstanceSubject(Animator<T> animator, Animation animation, Animatable control, IClock clock, Action onComplete)
+        {
+            this._animator = animator;
+            this._animation = animation;
+            this._control = control;
+            this._onComplete = onComplete;
+            this._clock = clock;
+        }
+
+
+        public void Dispose()
+        {
+            _lastInstance?.Dispose();
+        }
+
+        public void OnCompleted()
+        {
+        }
+
+        public void OnError(Exception error)
+        {
+            _lastInstance?.Dispose();
+        }
+
+        void IObserver<bool>.OnNext(bool matchVal)
+        {
+            if (matchVal != _lastMatch)
+            {
+                _lastInstance?.Dispose();
+                if (matchVal)
+                {
+                    _lastInstance = _animator.Run(_animation, _control, _clock, _onComplete);
+                }
+                _lastMatch = matchVal;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Animation/DoubleAnimator.cs b/src/Avalonia.Animation/DoubleAnimator.cs
index aeeb29a7dd..2e0ce64185 100644
--- a/src/Avalonia.Animation/DoubleAnimator.cs
+++ b/src/Avalonia.Animation/DoubleAnimator.cs
@@ -1,4 +1,7 @@
-namespace Avalonia.Animation
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Animator that handles <see cref="double"/> properties.
diff --git a/src/Avalonia.Animation/FillMode.cs b/src/Avalonia.Animation/FillMode.cs
index 001e1cdeb4..39beecf455 100644
--- a/src/Avalonia.Animation/FillMode.cs
+++ b/src/Avalonia.Animation/FillMode.cs
@@ -1,4 +1,7 @@
-namespace Avalonia.Animation
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Animation
 {
     public enum FillMode
     {
diff --git a/src/Avalonia.Animation/IAnimation.cs b/src/Avalonia.Animation/IAnimation.cs
index 1d545a322a..26cf4a6fd1 100644
--- a/src/Avalonia.Animation/IAnimation.cs
+++ b/src/Avalonia.Animation/IAnimation.cs
@@ -1,3 +1,6 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
 using System;
 using System.Threading.Tasks;
 
@@ -9,13 +12,13 @@ namespace Avalonia.Animation
     public interface IAnimation
     {
         /// <summary>
-        /// Apply the animation to the specified control
+        /// Apply the animation to the specified control and run it when <paramref name="match" /> produces <c>true</c>.
         /// </summary>
-        IDisposable Apply(Animatable control, IObservable<bool> match, Action onComplete = null);
+        IDisposable Apply(Animatable control, IClock clock, IObservable<bool> match, Action onComplete = null);
 
         /// <summary>
-        /// Run the animation to the specified control
+        /// Run the animation on the specified control.
         /// </summary>
-        Task RunAsync(Animatable control);
+        Task RunAsync(Animatable control, IClock clock);
     }
 }
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
index 2d22377286..9c8365ea37 100644
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ b/src/Avalonia.Animation/IAnimationSetter.cs
@@ -1,3 +1,6 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
 namespace Avalonia.Animation
 {
     public interface IAnimationSetter
diff --git a/src/Avalonia.Animation/IAnimator.cs b/src/Avalonia.Animation/IAnimator.cs
index 9a4da35a02..d09f396d70 100644
--- a/src/Avalonia.Animation/IAnimator.cs
+++ b/src/Avalonia.Animation/IAnimator.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 
 namespace Avalonia.Animation
@@ -16,6 +19,6 @@ namespace Avalonia.Animation
         /// <summary>
         /// Applies the current KeyFrame group to the specified control.
         /// </summary>
-        IDisposable Apply(Animation animation, Animatable control, IObservable<bool> obsMatch, Action onComplete);
+        IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> match, Action onComplete);
     }
 }
diff --git a/src/Avalonia.Animation/IClock.cs b/src/Avalonia.Animation/IClock.cs
new file mode 100644
index 0000000000..ae44102077
--- /dev/null
+++ b/src/Avalonia.Animation/IClock.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Animation
+{
+    public interface IClock : IObservable<TimeSpan>
+    {
+        PlayState PlayState { get; set; }
+    }
+}
diff --git a/src/Avalonia.Animation/IGlobalClock.cs b/src/Avalonia.Animation/IGlobalClock.cs
new file mode 100644
index 0000000000..b0455e2c80
--- /dev/null
+++ b/src/Avalonia.Animation/IGlobalClock.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Animation
+{
+    public interface IGlobalClock : IClock
+    {
+    }
+}
diff --git a/src/Avalonia.Animation/ITransition.cs b/src/Avalonia.Animation/ITransition.cs
index e2ffe7fc6e..e5d8466f04 100644
--- a/src/Avalonia.Animation/ITransition.cs
+++ b/src/Avalonia.Animation/ITransition.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Animation
         /// <summary>
         /// Applies the transition to the specified <see cref="Animatable"/>.
         /// </summary>
-        IDisposable Apply(Animatable control, object oldValue, object newValue);
+        IDisposable Apply(Animatable control, IClock clock, object oldValue, object newValue);
 
         /// <summary>
         /// Gets the property to be animated.
diff --git a/src/Avalonia.Animation/KeyFrame.cs b/src/Avalonia.Animation/KeyFrame.cs
index 5eb0d2e901..44e39e042e 100644
--- a/src/Avalonia.Animation/KeyFrame.cs
+++ b/src/Avalonia.Animation/KeyFrame.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using Avalonia.Collections;
 
diff --git a/src/Avalonia.Animation/KeyFramePair`1.cs b/src/Avalonia.Animation/KeyFramePair`1.cs
index b0622a1580..60a16d094f 100644
--- a/src/Avalonia.Animation/KeyFramePair`1.cs
+++ b/src/Avalonia.Animation/KeyFramePair`1.cs
@@ -1,3 +1,6 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
 namespace Avalonia.Animation
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/PlayState.cs b/src/Avalonia.Animation/PlayState.cs
index 313d33d586..8d28f06eb1 100644
--- a/src/Avalonia.Animation/PlayState.cs
+++ b/src/Avalonia.Animation/PlayState.cs
@@ -1,4 +1,7 @@
-namespace Avalonia.Animation
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Determines the playback state of an animation.
diff --git a/src/Avalonia.Animation/PlaybackDirection.cs b/src/Avalonia.Animation/PlaybackDirection.cs
index bbce6106e1..a44dd388ae 100644
--- a/src/Avalonia.Animation/PlaybackDirection.cs
+++ b/src/Avalonia.Animation/PlaybackDirection.cs
@@ -1,4 +1,7 @@
-namespace Avalonia.Animation
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Determines the playback direction of an animation.
diff --git a/src/Avalonia.Animation/Timing.cs b/src/Avalonia.Animation/Timing.cs
deleted file mode 100644
index 6367425911..0000000000
--- a/src/Avalonia.Animation/Timing.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Threading;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Provides global timing functions for animations.
-    /// </summary>
-    public static class Timing
-    {
-        /// <summary>
-        /// The number of frames per second.
-        /// </summary>
-        public const int FramesPerSecond = 60;
-
-        /// <summary>
-        /// The time span of each frame.
-        /// </summary>
-        internal static readonly TimeSpan FrameTick = TimeSpan.FromSeconds(1.0 / FramesPerSecond);
-
-        /// <summary>
-        /// Initializes static members of the <see cref="Timing"/> class.
-        /// </summary>
-        static Timing()
-        { 
-            var globalTimer = Observable.Interval(FrameTick, AvaloniaScheduler.Instance);
-
-            AnimationsTimer = globalTimer
-                .Select(_ => GetTickCount())
-                .Publish()
-                .RefCount();
-        }
-
-        internal static TimeSpan GetTickCount() => TimeSpan.FromMilliseconds(Environment.TickCount);
-
-        /// <summary>
-        /// Gets the animation timer.
-        /// </summary>
-        /// <remarks>
-        /// The animation timer triggers usually at 60 times per second or as
-        /// defined in <see cref="FramesPerSecond"/>.
-        /// The parameter passed to a subsciber is the current playstate of the animation.
-        /// </remarks>
-        internal static IObservable<TimeSpan> AnimationsTimer
-        {
-            get;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Animation/TransitionInstance.cs b/src/Avalonia.Animation/TransitionInstance.cs
index e2719cb472..eff2c4e9f3 100644
--- a/src/Avalonia.Animation/TransitionInstance.cs
+++ b/src/Avalonia.Animation/TransitionInstance.cs
@@ -15,21 +15,22 @@ namespace Avalonia.Animation
     /// </summary>
     internal class TransitionInstance : SingleSubscriberObservableBase<double>
     {
-        private IDisposable timerSubscription;
-        private TimeSpan startTime;
-        private TimeSpan duration;
+        private IDisposable _timerSubscription;
+        private TimeSpan _duration;
+        private readonly IClock _baseClock;
+        private IClock _clock;
 
-        public TransitionInstance(TimeSpan Duration)
+        public TransitionInstance(IClock clock, TimeSpan Duration)
         {
-            duration = Duration;
+            _duration = Duration;
+            _baseClock = clock;
         }
 
         private void TimerTick(TimeSpan t)
         {
-            var interpVal = (double)(t.Ticks - startTime.Ticks) / duration.Ticks;
+            var interpVal = (double)t.Ticks / _duration.Ticks;
 
-            if (interpVal > 1d
-             || interpVal < 0d)
+            if (interpVal > 1d || interpVal < 0d)
             {
                 PublishCompleted();
                 return;
@@ -40,15 +41,15 @@ namespace Avalonia.Animation
 
         protected override void Unsubscribed()
         {
-            timerSubscription?.Dispose();
+            _timerSubscription?.Dispose();
+            _clock.PlayState = PlayState.Stop;
         }
 
         protected override void Subscribed()
         {
-            startTime = Timing.GetTickCount();
-            timerSubscription = Timing.AnimationsTimer
-                                      .Subscribe(t => TimerTick(t));
+            _clock = new Clock(_baseClock);
+            _timerSubscription = _clock.Subscribe(TimerTick);
             PublishNext(0.0d);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Animation/Transition`1.cs b/src/Avalonia.Animation/Transition`1.cs
index 4b01c54f5c..cd0d5d9ce9 100644
--- a/src/Avalonia.Animation/Transition`1.cs
+++ b/src/Avalonia.Animation/Transition`1.cs
@@ -14,7 +14,6 @@ namespace Avalonia.Animation
     public abstract class Transition<T> : AvaloniaObject, ITransition
     {
         private AvaloniaProperty _prop;
-        private Easing _easing;
 
         /// <summary>
         /// Gets the duration of the animation.
@@ -49,12 +48,10 @@ namespace Avalonia.Animation
         public abstract IObservable<T> DoTransition(IObservable<double> progress, T oldValue, T newValue);
 
         /// <inheritdocs/>
-        public virtual IDisposable Apply(Animatable control, object oldValue, object newValue)
+        public virtual IDisposable Apply(Animatable control, IClock clock, object oldValue, object newValue)
         {
-            var transition = DoTransition(new TransitionInstance(Duration), (T)oldValue, (T)newValue);
+            var transition = DoTransition(new TransitionInstance(clock, Duration), (T)oldValue, (T)newValue);
             return control.Bind<T>((AvaloniaProperty<T>)Property, transition, Data.BindingPriority.Animation);
         }
-
-
     }
 }
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index bc068857ff..3d13169aa8 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Avalonia.Base</AssemblyName>
     <RootNamespace>Avalonia</RootNamespace>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="..\..\build\Base.props" />
   <Import Project="..\..\build\Binding.props" />
diff --git a/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs b/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
new file mode 100644
index 0000000000..8124ce6bc4
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace Avalonia.Platform.Interop
+{
+    public interface IDynamicLibraryLoader
+    {
+        IntPtr LoadLibrary(string dll);
+        IntPtr GetProcAddress(IntPtr dll, string proc, bool optional);
+    }
+
+    public class DynamicLibraryLoaderException : Exception
+    {
+        public DynamicLibraryLoaderException(string message) : base(message)
+        {
+            
+        }
+    }
+}
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Utf8Buffer.cs b/src/Avalonia.Base/Platform/Interop/Utf8Buffer.cs
similarity index 94%
rename from src/Gtk/Avalonia.Gtk3/Interop/Utf8Buffer.cs
rename to src/Avalonia.Base/Platform/Interop/Utf8Buffer.cs
index c932aac950..dc7a3e5634 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Utf8Buffer.cs
+++ b/src/Avalonia.Base/Platform/Interop/Utf8Buffer.cs
@@ -2,9 +2,9 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Avalonia.Gtk3.Interop
+namespace Avalonia.Platform.Interop
 {
-    class Utf8Buffer : SafeHandle
+    public class Utf8Buffer : SafeHandle
     {
         private GCHandle _gchandle;
         private byte[] _data;
diff --git a/src/Avalonia.Base/PriorityBindingEntry.cs b/src/Avalonia.Base/PriorityBindingEntry.cs
index 570bfe03dc..d4a47306a7 100644
--- a/src/Avalonia.Base/PriorityBindingEntry.cs
+++ b/src/Avalonia.Base/PriorityBindingEntry.cs
@@ -50,6 +50,11 @@ namespace Avalonia
             get;
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the binding has completed.
+        /// </summary>
+        public bool HasCompleted { get; private set; }
+
         /// <summary>
         /// The current value of the binding.
         /// </summary>
@@ -129,6 +134,8 @@ namespace Avalonia
 
         private void Completed()
         {
+            HasCompleted = true;
+
             if (Dispatcher.UIThread.CheckAccess())
             {
                 _owner.Completed(this);
diff --git a/src/Avalonia.Base/PriorityLevel.cs b/src/Avalonia.Base/PriorityLevel.cs
index 96661bd7ea..909558b0ce 100644
--- a/src/Avalonia.Base/PriorityLevel.cs
+++ b/src/Avalonia.Base/PriorityLevel.cs
@@ -112,12 +112,16 @@ namespace Avalonia
 
             return Disposable.Create(() =>
             {
-                Bindings.Remove(node);
-                entry.Dispose();
-
-                if (entry.Index >= ActiveBindingIndex)
+                if (!entry.HasCompleted)
                 {
-                    ActivateFirstBinding();
+                    Bindings.Remove(node);
+
+                    entry.Dispose();
+
+                    if (entry.Index >= ActiveBindingIndex)
+                    {
+                        ActivateFirstBinding();
+                    }
                 }
             });
         }
diff --git a/src/Avalonia.Base/Reactive/LightweightObservableBase.cs b/src/Avalonia.Base/Reactive/LightweightObservableBase.cs
index a2786d63da..41009e4cd3 100644
--- a/src/Avalonia.Base/Reactive/LightweightObservableBase.cs
+++ b/src/Avalonia.Base/Reactive/LightweightObservableBase.cs
@@ -82,18 +82,10 @@ namespace Avalonia.Reactive
                         if (observers.Count == 0)
                         {
                             observers.TrimExcess();
+                            Deinitialize();
                         }
-                        else
-                        {
-                            return;
-                        }
-                    } else
-                    {
-                        return;
                     }
                 }
-
-                Deinitialize();
             }
         }
 
diff --git a/src/Avalonia.Base/Reactive/ObservableEx.cs b/src/Avalonia.Base/Reactive/ObservableEx.cs
index 5b2a39d5ff..a1ec8f9a8a 100644
--- a/src/Avalonia.Base/Reactive/ObservableEx.cs
+++ b/src/Avalonia.Base/Reactive/ObservableEx.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Reactive
         {
             return new SingleValueImpl<T>(value);
         }
-
+ 
         private class SingleValueImpl<T> : IObservable<T>
         {
             private T _value;
@@ -30,7 +30,6 @@ namespace Avalonia.Reactive
             {
                 _value = value;
             }
-
             public IDisposable Subscribe(IObserver<T> observer)
             {
                 observer.OnNext(_value);
@@ -38,4 +37,4 @@ namespace Avalonia.Reactive
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index c92d5d7694..9561282274 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -272,10 +272,10 @@ namespace Avalonia.Controls
 
             s_setupWasAlreadyCalled = true;
 
-            Instance.RegisterServices();
             RuntimePlatformServicesInitializer();
             WindowingSubsystemInitializer();
             RenderingSubsystemInitializer();
+            Instance.RegisterServices();
             Instance.Initialize();
             AfterSetupCallback(Self);
         }
diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 4c549ac7d4..37796ff9ba 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -4,12 +4,14 @@
 using System;
 using System.Reactive.Concurrency;
 using System.Threading;
+using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
+using Avalonia.Rendering;
 using Avalonia.Styling;
 using Avalonia.Threading;
 
@@ -335,6 +337,11 @@ namespace Avalonia
                 .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance)
                 .Bind<IDragDropDevice>().ToConstant(DragDropDevice.Instance)
                 .Bind<IPlatformDragSource>().ToTransient<InProcessDragSource>();
+
+            var clock = new RenderLoopClock();
+            AvaloniaLocator.CurrentMutable
+                .Bind<IGlobalClock>().ToConstant(clock)
+                .GetService<IRenderLoop>()?.Add(clock);
         }
     }
 }
diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 8b2a45b090..0edb272015 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -43,7 +43,11 @@ namespace Avalonia.Controls
         /// </summary>
         static Border()
         {
-            AffectsRender<Border>(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty, CornerRadiusProperty);
+            AffectsRender<Border>(
+                BackgroundProperty,
+                BorderBrushProperty,
+                BorderThicknessProperty,
+                CornerRadiusProperty);
             AffectsMeasure<Border>(BorderThicknessProperty);
         }
 
diff --git a/src/Avalonia.Controls/DrawingPresenter.cs b/src/Avalonia.Controls/DrawingPresenter.cs
index 34ce598218..b30a8668fd 100644
--- a/src/Avalonia.Controls/DrawingPresenter.cs
+++ b/src/Avalonia.Controls/DrawingPresenter.cs
@@ -49,7 +49,7 @@ namespace Avalonia.Controls
             if (Drawing != null)
             {
                 using (context.PushPreTransform(_transform))
-                using (context.PushClip(Bounds))
+                using (context.PushClip(new Rect(Bounds.Size)))
                 {
                     Drawing.Draw(context);
                 }
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index 882d2f4ddd..f1a1f94a01 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls.Generators
     /// </summary>
     public class ItemContainerGenerator : IItemContainerGenerator
     {
-        private Dictionary<int, ItemContainerInfo> _containers = new Dictionary<int, ItemContainerInfo>();
+        private SortedDictionary<int, ItemContainerInfo> _containers = new SortedDictionary<int, ItemContainerInfo>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemContainerGenerator"/> class.
@@ -246,4 +246,4 @@ namespace Avalonia.Controls.Generators
             Recycled?.Invoke(this, e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/Image.cs b/src/Avalonia.Controls/Image.cs
index 802b700a07..40203bab02 100644
--- a/src/Avalonia.Controls/Image.cs
+++ b/src/Avalonia.Controls/Image.cs
@@ -26,6 +26,7 @@ namespace Avalonia.Controls
         static Image()
         {
             AffectsRender<Image>(SourceProperty, StretchProperty);
+            AffectsMeasure<Image>(SourceProperty, StretchProperty);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 7b57783c5a..055d49fb0b 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -99,6 +99,7 @@ namespace Avalonia.Controls
             SelectableMixin.Attach<MenuItem>(IsSelectedProperty);
             CommandProperty.Changed.Subscribe(CommandChanged);
             FocusableProperty.OverrideDefaultValue<MenuItem>(true);
+            HeaderProperty.Changed.AddClassHandler<MenuItem>(x => x.HeaderChanged);
             IconProperty.Changed.AddClassHandler<MenuItem>(x => x.IconChanged);
             IsSelectedProperty.Changed.AddClassHandler<MenuItem>(x => x.IsSelectedChanged);
             ItemsPanelProperty.OverrideDefaultValue<MenuItem>(DefaultPanel);
@@ -357,10 +358,21 @@ namespace Avalonia.Controls
         {
             base.OnTemplateApplied(e);
 
-            _popup = e.NameScope.Get<Popup>("PART_Popup");
-            _popup.DependencyResolver = DependencyResolver.Instance;
-            _popup.Opened += PopupOpened;
-            _popup.Closed += PopupClosed;
+            if (_popup != null)
+            {
+                _popup.Opened -= PopupOpened;
+                _popup.Closed -= PopupClosed;
+                _popup.DependencyResolver = null;
+            }
+
+            _popup = e.NameScope.Find<Popup>("PART_Popup");
+
+            if (_popup != null)
+            {
+                _popup.DependencyResolver = DependencyResolver.Instance;
+                _popup.Opened += PopupOpened;
+                _popup.Closed += PopupClosed;
+            }
         }
 
         /// <summary>
@@ -408,6 +420,24 @@ namespace Avalonia.Controls
             IsEnabled = Command == null || Command.CanExecute(CommandParameter);
         }
 
+        /// <summary>
+        /// Called when the <see cref="Header"/> property changes.
+        /// </summary>
+        /// <param name="e">The property change event.</param>
+        private void HeaderChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.NewValue is string newValue && newValue == "-")
+            {
+                PseudoClasses.Add(":separator");
+                Focusable = false;
+            }
+            else if (e.OldValue is string oldValue && oldValue == "-")
+            {
+                PseudoClasses.Remove(":separator");
+                Focusable = true;
+            }
+        }
+
         /// <summary>
         /// Called when the <see cref="Icon"/> property changes.
         /// </summary>
diff --git a/src/Avalonia.Controls/Panel.cs b/src/Avalonia.Controls/Panel.cs
index c0d211effb..5415f3974d 100644
--- a/src/Avalonia.Controls/Panel.cs
+++ b/src/Avalonia.Controls/Panel.cs
@@ -30,6 +30,7 @@ namespace Avalonia.Controls
         /// </summary>
         static Panel()
         {
+            AffectsRender<Panel>(BackgroundProperty);
             ClipToBoundsProperty.OverrideDefaultValue<Panel>(true);
         }
 
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index a44495b90c..6b03e67897 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -331,7 +331,7 @@ namespace Avalonia.Controls.Platform
         {
             var item = GetMenuItem(e.Source as IControl);
 
-            if (e.MouseButton == MouseButton.Left && item.HasSubMenu == false)
+            if (e.MouseButton == MouseButton.Left && item?.HasSubMenu == false)
             {
                 Click(item);
                 e.Handled = true;
diff --git a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
index 400bf5ccc3..bb357453ff 100644
--- a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
+++ b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
@@ -9,12 +9,15 @@ using Avalonia.Threading;
 
 namespace Avalonia.Controls.Platform
 {
-    public class InternalPlatformThreadingInterface : IPlatformThreadingInterface, IRenderLoop
+    public class InternalPlatformThreadingInterface : IPlatformThreadingInterface, IRenderTimer
     {
         public InternalPlatformThreadingInterface()
         {
             TlsCurrentThreadIsLoopThread = true;
-            StartTimer(DispatcherPriority.Render, new TimeSpan(0, 0, 0, 0, 66), () => Tick?.Invoke(this, new EventArgs()));
+            StartTimer(
+                DispatcherPriority.Render,
+                new TimeSpan(0, 0, 0, 0, 66),
+                () => Tick?.Invoke(TimeSpan.FromMilliseconds(Environment.TickCount)));
         }
 
         private readonly AutoResetEvent _signaled = new AutoResetEvent(false);
@@ -105,7 +108,7 @@ namespace Avalonia.Controls.Platform
 
         public bool CurrentThreadIsLoopThread => TlsCurrentThreadIsLoopThread;
         public event Action<DispatcherPriority?> Signaled;
-        public event EventHandler<EventArgs> Tick;
+        public event Action<TimeSpan> Tick;
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 8d703cfc1c..83d8616e90 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -197,13 +197,6 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
-        /// <inheritdoc/>
-        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnAttachedToVisualTree(e);
-            _dataTemplate = null;
-        }
-
         /// <summary>
         /// Updates the <see cref="Child"/> control based on the control's <see cref="Content"/>.
         /// </summary>
@@ -268,6 +261,7 @@ namespace Avalonia.Controls.Presenters
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnAttachedToLogicalTree(e);
+            _dataTemplate = null;
             _createdChild = false;
             InvalidateMeasure();
         }
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 676cdc456a..4b58197ef3 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -6,11 +6,12 @@ using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.VisualTree;
 using Avalonia.Media;
+using Avalonia.Rendering;
 
 namespace Avalonia.Controls.Primitives
 {
     // TODO: Need to track position of adorned elements and move the adorner if they move.
-    public class AdornerLayer : Panel
+    public class AdornerLayer : Panel, ICustomSimpleHitTest
     {
         public static AttachedProperty<Visual> AdornedElementProperty =
             AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, Visual>("AdornedElement");
@@ -137,6 +138,11 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        public bool HitTest(Point point)
+        {
+            return Children.Any(ctrl => ctrl.TransformedBounds?.Contains(point) == true);
+        }
+
         private class AdornedElementInfo
         {
             public IDisposable Subscription { get; set; }
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index bb39b005cc..f8440aac47 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -289,12 +289,12 @@ namespace Avalonia.Controls.Primitives
         /// <inheritdoc/>
         public override void EndInit()
         {
-            base.EndInit();
-
             if (--_updateCount == 0)
             {
                 UpdateFinished();
             }
+
+            base.EndInit();
         }
 
         /// <summary>
@@ -871,8 +871,8 @@ namespace Avalonia.Controls.Primitives
                         RaisePropertyChanged(SelectedItemProperty, oldItem, item, BindingPriority.LocalValue);
                     }
 
-                    added = e.OldItems;
-                    removed = e.NewItems;
+                    added = e.NewItems;
+                    removed = e.OldItems;
                     break;
             }
 
diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 7f4b549849..a0f51099cd 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -37,7 +37,8 @@ namespace Avalonia.Controls
             PseudoClass<ProgressBar, Orientation>(OrientationProperty, o => o == Avalonia.Controls.Orientation.Horizontal, ":horizontal");
             PseudoClass<ProgressBar>(IsIndeterminateProperty, ":indeterminate");
 
-            ValueProperty.Changed.AddClassHandler<ProgressBar>(x => x.ValueChanged);
+            ValueProperty.Changed.AddClassHandler<ProgressBar>(x => x.UpdateIndicatorWhenPropChanged);
+            IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>(x => x.UpdateIndicatorWhenPropChanged);
         }
 
         public bool IsIndeterminate
@@ -114,9 +115,9 @@ namespace Avalonia.Controls
             }
         }
 
-        private void ValueChanged(AvaloniaPropertyChangedEventArgs e)
+        private void UpdateIndicatorWhenPropChanged(AvaloniaPropertyChangedEventArgs e)
         {
             UpdateIndicator(Bounds.Size);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index 541e55625a..af7b0f835e 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -6,6 +6,7 @@ using System.Reactive;
 using System.Reactive.Linq;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
+using Avalonia.Media.Immutable;
 using Avalonia.Metadata;
 
 namespace Avalonia.Controls
@@ -65,7 +66,7 @@ namespace Avalonia.Controls
         public static readonly AttachedProperty<IBrush> ForegroundProperty =
             AvaloniaProperty.RegisterAttached<TextBlock, Control, IBrush>(
                 nameof(Foreground),
-                new SolidColorBrush(0xff000000),
+                Brushes.Black,
                 inherits: true);
 
         /// <summary>
@@ -100,6 +101,7 @@ namespace Avalonia.Controls
         {
             ClipToBoundsProperty.OverrideDefaultValue<TextBlock>(true);
             AffectsRender<TextBlock>(
+                BackgroundProperty,
                 ForegroundProperty,
                 FontWeightProperty,
                 FontSizeProperty,
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 388f984b78..e2d2f562ec 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -212,7 +212,10 @@ namespace Avalonia.Controls
             {
                 if (!_ignoreTextChanges)
                 {
-                    CaretIndex = CoerceCaretIndex(CaretIndex, value?.Length ?? 0);
+                    var caretIndex = CaretIndex;
+                    SelectionStart = CoerceCaretIndex(SelectionStart, value?.Length ?? 0);
+                    SelectionEnd = CoerceCaretIndex(SelectionEnd, value?.Length ?? 0);
+                    CaretIndex = CoerceCaretIndex(caretIndex, value?.Length ?? 0);
 
                     if (SetAndRaise(TextProperty, ref _text, value) && !_isUndoingRedoing)
                     {
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 5f8eac1fe3..5443baf225 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -96,7 +96,6 @@ namespace Avalonia.Controls
             _applicationLifecycle = TryGetService<IApplicationLifecycle>(dependencyResolver);
             _renderInterface = TryGetService<IPlatformRenderInterface>(dependencyResolver);
 
-            var renderLoop = TryGetService<IRenderLoop>(dependencyResolver);
             Renderer = impl.CreateRenderer(this);
 
             impl.SetInputRoot(this);
diff --git a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
index 0fd6593fbe..a91e6a3a48 100644
--- a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
+++ b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
@@ -88,24 +88,82 @@ namespace Avalonia.Controls.Utils
             }
             else
             {
-                var borderThickness = borders.Left;
-                var cornerRadius = (float)radii.TopLeft;
-                var rect = new Rect(size);
+                var borderThickness = borders.Top;
+                var top = borderThickness * 0.5;
+                var cornerRadius = (float)Math.Max(0, radii.TopLeft - borderThickness - top);
 
                 if (background != null)
                 {
-                    context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
+                    var topLeft = new Point(borders.Left, borders.Top);
+                    var bottomRight = new Point(size.Width - borders.Right, size.Height - borders.Bottom);
+                    var innerRect = new Rect(topLeft, bottomRight);
+                    context.FillRectangle(background, innerRect, cornerRadius);
                 }
 
                 if (borderBrush != null && borderThickness > 0)
                 {
-                    context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
+                    var topLeft = new Point(top, top);
+                    var bottomRight = new Point(size.Width - top, size.Height - top);
+                    var outerRect = new Rect(topLeft, bottomRight);
+                    context.DrawRectangle(new Pen(borderBrush, borderThickness), outerRect, (float)radii.TopLeft);
                 }
             }
+        }    
+
+        private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, BorderGeometryKeypoints keypoints)
+        {
+            context.BeginFigure(keypoints.TopLeft, true);
+
+            // Top
+            context.LineTo(keypoints.TopRight);
+
+            // TopRight corner
+            var radiusX = boundRect.TopRight.X - keypoints.TopRight.X;
+            var radiusY = keypoints.RightTop.Y - boundRect.TopRight.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(keypoints.RightTop, new Size(radiusY, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            // Right
+            context.LineTo(keypoints.RightBottom);
+
+            // BottomRight corner
+            radiusX = boundRect.BottomRight.X - keypoints.BottomRight.X;
+            radiusY = boundRect.BottomRight.Y - keypoints.RightBottom.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(keypoints.BottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            // Bottom
+            context.LineTo(keypoints.BottomLeft);
+
+            // BottomLeft corner
+            radiusX = keypoints.BottomLeft.X - boundRect.BottomLeft.X;
+            radiusY = boundRect.BottomLeft.Y - keypoints.LeftBottom.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(keypoints.LeftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            // Left
+            context.LineTo(keypoints.LeftTop);
+
+            // TopLeft corner
+            radiusX = keypoints.TopLeft.X - boundRect.TopLeft.X;
+            radiusY = keypoints.LeftTop.Y - boundRect.TopLeft.Y;
+
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(keypoints.TopLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            context.EndFigure(true);
         }
 
         private class BorderGeometryKeypoints
-        {           
+        {
             internal BorderGeometryKeypoints(Rect boundRect, Thickness borderThickness, CornerRadius cornerRadius, bool inner)
             {
                 var left = 0.5 * borderThickness.Left;
@@ -135,25 +193,24 @@ namespace Avalonia.Controls.Utils
                 }
                 else
                 {
-                   
                     leftTopY = cornerRadius.TopLeft + top + boundRect.TopLeft.Y;
-                    topLeftX = cornerRadius.TopLeft + left + boundRect.TopLeft.X;                   
+                    topLeftX = cornerRadius.TopLeft + left + boundRect.TopLeft.X;
                     topRightX = boundRect.Width - (cornerRadius.TopRight + right) + boundRect.TopLeft.X;
-                    rightTopY = cornerRadius.TopRight + top + boundRect.TopLeft.Y;                                   
+                    rightTopY = cornerRadius.TopRight + top + boundRect.TopLeft.Y;
                     rightBottomY = boundRect.Height - (cornerRadius.BottomRight + bottom) + boundRect.TopLeft.Y;
-                    bottomRightX = boundRect.Width - (cornerRadius.BottomRight + right) + boundRect.TopLeft.X;                
-                    bottomLeftX = cornerRadius.BottomLeft + left + boundRect.TopLeft.X;               
+                    bottomRightX = boundRect.Width - (cornerRadius.BottomRight + right) + boundRect.TopLeft.X;
+                    bottomLeftX = cornerRadius.BottomLeft + left + boundRect.TopLeft.X;
                     leftBottomY = boundRect.Height - (cornerRadius.BottomLeft + bottom) + boundRect.TopLeft.Y;
-                }              
+                }
 
-                var leftTopX = boundRect.TopLeft.X;               
-                var topLeftY = boundRect.TopLeft.Y;              
+                var leftTopX = boundRect.TopLeft.X;
+                var topLeftY = boundRect.TopLeft.Y;
                 var topRightY = boundRect.TopLeft.Y;
-                var rightTopX = boundRect.Width + boundRect.TopLeft.X;              
-                var rightBottomX = boundRect.Width + boundRect.TopLeft.X;                             
-                var bottomRightY = boundRect.Height + boundRect.TopLeft.Y;            
+                var rightTopX = boundRect.Width + boundRect.TopLeft.X;
+                var rightBottomX = boundRect.Width + boundRect.TopLeft.X;
+                var bottomRightY = boundRect.Height + boundRect.TopLeft.Y;
                 var bottomLeftY = boundRect.Height + boundRect.TopLeft.Y;
-                var leftBottomX = boundRect.TopLeft.X;           
+                var leftBottomX = boundRect.TopLeft.X;
 
                 LeftTop = new Point(leftTopX, leftTopY);
                 TopLeft = new Point(topLeftX, topLeftY);
@@ -164,7 +221,7 @@ namespace Avalonia.Controls.Utils
                 BottomLeft = new Point(bottomLeftX, bottomLeftY);
                 LeftBottom = new Point(leftBottomX, leftBottomY);
 
-                //Fix overlap
+                // Fix overlap
                 if (TopLeft.X > TopRight.X)
                 {
                     var scaledX = topLeftX / (topLeftX + topRightX) * boundRect.Width;
@@ -194,66 +251,21 @@ namespace Avalonia.Controls.Utils
                 }
             }
 
-            internal Point LeftTop { get; private set; }
-            internal Point TopLeft { get; private set; }
-            internal Point TopRight { get; private set; }
-            internal Point RightTop { get; private set; }
-            internal Point RightBottom { get; private set; }
-            internal Point BottomRight { get; private set; }
-            internal Point BottomLeft { get; private set; }
-            internal Point LeftBottom { get; private set; }
-        }
+            internal Point LeftTop { get; }
 
-        private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, BorderGeometryKeypoints keypoints)
-        {
-            context.BeginFigure(keypoints.TopLeft, true);
+            internal Point TopLeft { get; }
 
-            //Top
-            context.LineTo(keypoints.TopRight);
+            internal Point TopRight { get; }
 
-            //TopRight corner
-            var radiusX = boundRect.TopRight.X - keypoints.TopRight.X;
-            var radiusY = keypoints.RightTop.Y - boundRect.TopRight.Y;
-            if (radiusX != 0 || radiusY != 0)
-            {
-                context.ArcTo(keypoints.RightTop, new Size(radiusY, radiusY), 0, false, SweepDirection.Clockwise);
-            }
+            internal Point RightTop { get; }
 
-            //Right
-            context.LineTo(keypoints.RightBottom);
+            internal Point RightBottom { get; }
 
-            //BottomRight corner
-            radiusX = boundRect.BottomRight.X - keypoints.BottomRight.X;
-            radiusY = boundRect.BottomRight.Y - keypoints.RightBottom.Y;
-            if (radiusX != 0 || radiusY != 0)
-            {
-                context.ArcTo(keypoints.BottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
-            }
-
-            //Bottom
-            context.LineTo(keypoints.BottomLeft);
-
-            //BottomLeft corner
-            radiusX = keypoints.BottomLeft.X - boundRect.BottomLeft.X;
-            radiusY = boundRect.BottomLeft.Y - keypoints.LeftBottom.Y;
-            if (radiusX != 0 || radiusY != 0)
-            {
-                context.ArcTo(keypoints.LeftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
-            }
+            internal Point BottomRight { get; }
 
-            //Left
-            context.LineTo(keypoints.LeftTop);
-
-            //TopLeft corner
-            radiusX = keypoints.TopLeft.X - boundRect.TopLeft.X;
-            radiusY = keypoints.LeftTop.Y - boundRect.TopLeft.Y;
-
-            if (radiusX != 0 || radiusY != 0)
-            {
-                context.ArcTo(keypoints.TopLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
-            }
+            internal Point BottomLeft { get; }
 
-            context.EndFigure(true);
+            internal Point LeftBottom { get; }
         }
     }
 }
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
index 01998052d9..20acc30118 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
@@ -53,7 +53,8 @@ namespace Avalonia.DesignerSupport.Remote
                 .Bind<IKeyboardDevice>().ToConstant(Keyboard)
                 .Bind<IPlatformSettings>().ToConstant(instance)
                 .Bind<IPlatformThreadingInterface>().ToConstant(threading)
-                .Bind<IRenderLoop>().ToConstant(threading)
+                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
+                .Bind<IRenderTimer>().ToConstant(threading)
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsStub>()
                 .Bind<IWindowingPlatform>().ToConstant(instance)
                 .Bind<IPlatformIconLoader>().ToSingleton<IconLoaderStub>();
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index a2ff0ecf02..b807571a38 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -2,6 +2,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Views\EventsView.xaml" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
@@ -17,4 +20,9 @@
   </ItemGroup>  
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\Rx.props" />
+  <ItemGroup>
+    <EmbeddedResource Update="Views\EventsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Diagnostics/DevTools.xaml b/src/Avalonia.Diagnostics/DevTools.xaml
index 844670e794..a3b12f0ec5 100644
--- a/src/Avalonia.Diagnostics/DevTools.xaml
+++ b/src/Avalonia.Diagnostics/DevTools.xaml
@@ -3,6 +3,7 @@
     <TabStrip SelectedIndex="{Binding SelectedTab, Mode=TwoWay}">
       <TabStripItem Content="Logical Tree"/>
       <TabStripItem Content="Visual Tree"/>
+      <TabStripItem Content="Events"/>
     </TabStrip>
 
     <ContentControl Content="{Binding Content}" Grid.Row="1"/> 
diff --git a/src/Avalonia.Diagnostics/DevTools.xaml.cs b/src/Avalonia.Diagnostics/DevTools.xaml.cs
index be0863954a..d084ec3014 100644
--- a/src/Avalonia.Diagnostics/DevTools.xaml.cs
+++ b/src/Avalonia.Diagnostics/DevTools.xaml.cs
@@ -10,6 +10,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Avalonia.Rendering;
 using Avalonia.VisualTree;
 
 namespace Avalonia
@@ -28,6 +29,7 @@ namespace Avalonia.Diagnostics
 	public class DevTools : UserControl
     {
         private static Dictionary<TopLevel, Window> s_open = new Dictionary<TopLevel, Window>();
+        private static HashSet<IRenderRoot> s_visualTreeRoots = new HashSet<IRenderRoot>();
         private IDisposable _keySubscription;
 
         public DevTools(IControl root)
@@ -79,6 +81,7 @@ namespace Avalonia.Diagnostics
 
                     devToolsWindow.Closed += devTools.DevToolsClosed;
                     s_open.Add(control, devToolsWindow);
+                    MarkAsDevTool(devToolsWindow);
                     devToolsWindow.Show();
                 }
             }
@@ -89,6 +92,7 @@ namespace Avalonia.Diagnostics
             var devToolsWindow = (Window)sender;
             var devTools = (DevTools)devToolsWindow.Content;
             s_open.Remove((TopLevel)devTools.Root);
+            RemoveDevTool(devToolsWindow);
             _keySubscription.Dispose();
             devToolsWindow.Closed -= DevToolsClosed;
         }
@@ -116,5 +120,24 @@ namespace Avalonia.Diagnostics
                 }
             }
         }
+
+        /// <summary>
+        /// Marks a visual as part of the DevTools, so it can be excluded from event tracking.
+        /// </summary>
+        /// <param name="visual">The visual whose root is to be marked.</param>
+        public static void MarkAsDevTool(IVisual visual)
+        {
+            s_visualTreeRoots.Add(visual.GetVisualRoot());
+        }
+
+        public static void RemoveDevTool(IVisual visual)
+        {
+            s_visualTreeRoots.Remove(visual.GetVisualRoot());
+        }
+
+        public static bool BelongsToDevTool(IVisual visual)
+        {
+            return s_visualTreeRoots.Contains(visual.GetVisualRoot());
+        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Models/EventChainLink.cs b/src/Avalonia.Diagnostics/Models/EventChainLink.cs
new file mode 100644
index 0000000000..aab50a13dd
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Models/EventChainLink.cs
@@ -0,0 +1,38 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Diagnostics.Models
+{
+    internal class EventChainLink
+    {
+        public EventChainLink(object handler, bool handled, RoutingStrategies route)
+        {
+            Contract.Requires<ArgumentNullException>(handler != null);
+
+            this.Handler = handler;
+            this.Handled = handled;
+            this.Route = route;
+        }
+
+        public object Handler { get; }
+
+        public string HandlerName
+        {
+            get
+            {
+                if (Handler is INamed named && !string.IsNullOrEmpty(named.Name))
+                {
+                    return named.Name + " (" + Handler.GetType().Name + ")";
+                }
+                return Handler.GetType().Name;
+            }
+        }
+
+        public bool Handled { get; }
+
+        public RoutingStrategies Route { get; }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
index ce8ad36c17..c6d3f02e8b 100644
--- a/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
+++ b/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
@@ -14,6 +14,7 @@ namespace Avalonia.Diagnostics.ViewModels
         private int _selectedTab;
         private TreePageViewModel _logicalTree;
         private TreePageViewModel _visualTree;
+        private EventsViewModel _eventsView;
         private string _focusedControl;
         private string _pointerOverElement;
 
@@ -21,6 +22,7 @@ namespace Avalonia.Diagnostics.ViewModels
         {
             _logicalTree = new TreePageViewModel(LogicalTreeNode.Create(root));
             _visualTree = new TreePageViewModel(VisualTreeNode.Create(root));
+            _eventsView = new EventsViewModel(root);
 
             UpdateFocusedControl();
             KeyboardDevice.Instance.PropertyChanged += (s, e) =>
@@ -57,6 +59,9 @@ namespace Avalonia.Diagnostics.ViewModels
                     case 1:
                         Content = _visualTree;
                         break;
+                    case 2:
+                        Content = _eventsView;
+                        break;
                 }
 
                 RaisePropertyChanged();
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventOwnerTreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/EventOwnerTreeNode.cs
new file mode 100644
index 0000000000..0674918400
--- /dev/null
+++ b/src/Avalonia.Diagnostics/ViewModels/EventOwnerTreeNode.cs
@@ -0,0 +1,61 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class EventOwnerTreeNode : EventTreeNodeBase
+    {
+        private static readonly RoutedEvent[] s_defaultEvents = new RoutedEvent[]
+        {
+           Button.ClickEvent,
+           InputElement.KeyDownEvent,
+           InputElement.KeyUpEvent,
+           InputElement.TextInputEvent,
+           InputElement.PointerReleasedEvent,
+           InputElement.PointerPressedEvent,
+        };
+
+        public EventOwnerTreeNode(Type type, IEnumerable<RoutedEvent> events, EventsViewModel vm)
+            : base(null, type.Name)
+        {
+            this.Children = new AvaloniaList<EventTreeNodeBase>(events.OrderBy(e => e.Name)
+                .Select(e => new EventTreeNode(this, e, vm) { IsEnabled = s_defaultEvents.Contains(e) }));
+            this.IsExpanded = true;
+        }
+
+        public override bool? IsEnabled
+        {
+            get => base.IsEnabled;
+            set
+            {
+                if (base.IsEnabled != value)
+                {
+                    base.IsEnabled = value;
+                    if (_updateChildren && value != null)
+                    {
+                        foreach (var child in Children)
+                        {
+                            try
+                            {
+                                child._updateParent = false;
+                                child.IsEnabled = value;
+                            }
+                            finally
+                            {
+                                child._updateParent = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs
new file mode 100644
index 0000000000..59c0f82414
--- /dev/null
+++ b/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs
@@ -0,0 +1,98 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+using Avalonia.Diagnostics.Models;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class EventTreeNode : EventTreeNodeBase
+    {
+        private RoutedEvent _event;
+        private EventsViewModel _parentViewModel;
+        private bool _isRegistered;
+        private FiredEvent _currentEvent;
+
+        public EventTreeNode(EventOwnerTreeNode parent, RoutedEvent @event, EventsViewModel vm)
+            : base(parent, @event.Name)
+        {
+            Contract.Requires<ArgumentNullException>(@event != null);
+            Contract.Requires<ArgumentNullException>(vm != null);
+
+            this._event = @event;
+            this._parentViewModel = vm;
+        }
+
+        public override bool? IsEnabled
+        {
+            get => base.IsEnabled;
+            set
+            {
+                if (base.IsEnabled != value)
+                {
+                    base.IsEnabled = value;
+                    UpdateTracker();
+                    if (Parent != null && _updateParent)
+                    {
+                        try
+                        {
+                            Parent._updateChildren = false;
+                            Parent.UpdateChecked();
+                        }
+                        finally
+                        {
+                            Parent._updateChildren = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        private void UpdateTracker()
+        {
+            if (IsEnabled.GetValueOrDefault() && !_isRegistered)
+            {
+                _event.AddClassHandler(typeof(object), HandleEvent, (RoutingStrategies)7, handledEventsToo: true);
+                _isRegistered = true;
+            }
+        }
+
+        private void HandleEvent(object sender, RoutedEventArgs e)
+        {
+            if (!_isRegistered || IsEnabled == false)
+                return;
+            if (sender is IVisual v && DevTools.BelongsToDevTool(v))
+                return;
+
+            var s = sender;
+            var handled = e.Handled;
+            var route = e.Route;
+
+            Action handler = delegate
+            {
+                if (_currentEvent == null || !_currentEvent.IsPartOfSameEventChain(e))
+                {
+                    _currentEvent = new FiredEvent(e, new EventChainLink(s, handled, route));
+
+                    _parentViewModel.RecordedEvents.Add(_currentEvent);
+
+                    while (_parentViewModel.RecordedEvents.Count > 100)
+                        _parentViewModel.RecordedEvents.RemoveAt(0);
+                }
+                else
+                {
+                    _currentEvent.AddToChain(new EventChainLink(s, handled, route));
+                }
+            };
+
+            if (!Dispatcher.UIThread.CheckAccess())
+                Dispatcher.UIThread.Post(handler);
+            else
+                handler();
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventTreeNodeBase.cs b/src/Avalonia.Diagnostics/ViewModels/EventTreeNodeBase.cs
new file mode 100644
index 0000000000..146a8cea8e
--- /dev/null
+++ b/src/Avalonia.Diagnostics/ViewModels/EventTreeNodeBase.cs
@@ -0,0 +1,78 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Collections;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal abstract class EventTreeNodeBase : ViewModelBase
+    {
+        internal bool _updateChildren = true;
+        internal bool _updateParent = true;
+        private bool _isExpanded;
+        private bool? _isEnabled = false;
+
+        public EventTreeNodeBase(EventTreeNodeBase parent, string text)
+        {
+            this.Parent = parent;
+            this.Text = text;
+        }
+
+        public IAvaloniaReadOnlyList<EventTreeNodeBase> Children
+        {
+            get;
+            protected set;
+        }
+
+        public bool IsExpanded
+        {
+            get { return _isExpanded; }
+            set { RaiseAndSetIfChanged(ref _isExpanded, value); }
+        }
+
+        public virtual bool? IsEnabled
+        {
+            get { return _isEnabled; }
+            set { RaiseAndSetIfChanged(ref _isEnabled, value); }
+        }
+
+        public EventTreeNodeBase Parent
+        {
+            get;
+        }
+
+        public string Text
+        {
+            get;
+            private set;
+        }
+
+        internal void UpdateChecked()
+        {
+            IsEnabled = GetValue();
+
+            bool? GetValue()
+            {
+                if (Children == null)
+                    return false;
+                bool? value = false;
+                for (int i = 0; i < Children.Count; i++)
+                {
+                    if (i == 0)
+                    {
+                        value = Children[i].IsEnabled;
+                        continue;
+                    }
+
+                    if (value != Children[i].IsEnabled)
+                    {
+                        value = null;
+                        break;
+                    }
+                }
+
+                return value;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventsViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/EventsViewModel.cs
new file mode 100644
index 0000000000..a23677afc8
--- /dev/null
+++ b/src/Avalonia.Diagnostics/ViewModels/EventsViewModel.cs
@@ -0,0 +1,60 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Input;
+
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class EventsViewModel : ViewModelBase
+    {
+        private readonly IControl _root;
+        private FiredEvent _selectedEvent;
+
+        public EventsViewModel(IControl root)
+        {
+            this._root = root;
+            this.Nodes = RoutedEventRegistry.Instance.GetAllRegistered()
+                .GroupBy(e => e.OwnerType)
+                .OrderBy(e => e.Key.Name)
+                .Select(g => new EventOwnerTreeNode(g.Key, g, this))
+                .ToArray();
+        }
+
+        public EventTreeNodeBase[] Nodes { get; }
+
+        public ObservableCollection<FiredEvent> RecordedEvents { get; } = new ObservableCollection<FiredEvent>();
+
+        public FiredEvent SelectedEvent
+        {
+            get => _selectedEvent;
+            set => RaiseAndSetIfChanged(ref _selectedEvent, value);
+        }
+
+        private void Clear()
+        {
+            RecordedEvents.Clear();
+        }
+    }
+
+    internal class BoolToBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (bool)value ? Brushes.LightGreen : Brushes.Transparent;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/ViewModels/FiredEvent.cs b/src/Avalonia.Diagnostics/ViewModels/FiredEvent.cs
new file mode 100644
index 0000000000..049280c390
--- /dev/null
+++ b/src/Avalonia.Diagnostics/ViewModels/FiredEvent.cs
@@ -0,0 +1,80 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.ObjectModel;
+
+using Avalonia.Diagnostics.Models;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class FiredEvent : ViewModelBase
+    {
+        private RoutedEventArgs _eventArgs;
+        private EventChainLink _handledBy;
+
+        public FiredEvent(RoutedEventArgs eventArgs, EventChainLink originator)
+        {
+            Contract.Requires<ArgumentNullException>(eventArgs != null);
+            Contract.Requires<ArgumentNullException>(originator != null);
+
+            this._eventArgs = eventArgs;
+            this.Originator = originator;
+            AddToChain(originator);
+        }
+
+        public bool IsPartOfSameEventChain(RoutedEventArgs e)
+        {
+            return e == _eventArgs;
+        }
+
+        public RoutedEvent Event => _eventArgs.RoutedEvent;
+
+        public bool IsHandled => HandledBy?.Handled == true;
+
+        public ObservableCollection<EventChainLink> EventChain { get; } = new ObservableCollection<EventChainLink>();
+
+        public string DisplayText
+        {
+            get
+            {
+                if (IsHandled)
+                {
+                    return $"{Event.Name} on {Originator.HandlerName};" + Environment.NewLine +
+                        $"strategies: {Event.RoutingStrategies}; handled by: {HandledBy.HandlerName}";
+                }
+                return $"{Event.Name} on {Originator.HandlerName}; strategies: {Event.RoutingStrategies}";
+            }
+        }
+
+        public EventChainLink Originator { get; }
+
+        public EventChainLink HandledBy
+        {
+            get { return _handledBy; }
+            set
+            {
+                if (_handledBy != value)
+                {
+                    _handledBy = value;
+                    RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(IsHandled));
+                    RaisePropertyChanged(nameof(DisplayText));
+                }
+            }
+        }
+
+        public void AddToChain(object handler, bool handled, RoutingStrategies route)
+        {
+            AddToChain(new EventChainLink(handler, handled, route));
+        }
+
+        public void AddToChain(EventChainLink link)
+        {
+            EventChain.Add(link);
+            if (HandledBy == null && link.Handled)
+                HandledBy = link;
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Views/EventsView.xaml b/src/Avalonia.Diagnostics/Views/EventsView.xaml
new file mode 100644
index 0000000000..a5be86b613
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Views/EventsView.xaml
@@ -0,0 +1,53 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels">
+    <UserControl.Resources>
+        <vm:BoolToBrushConverter x:Key="boolToBrush" />
+    </UserControl.Resources>
+    <Grid ColumnDefinitions="*,4,3*">
+        <TreeView Name="tree" Items="{Binding Nodes}" SelectedItem="{Binding SelectedNode, Mode=TwoWay}" Grid.RowSpan="2">
+            <TreeView.DataTemplates>
+                <TreeDataTemplate DataType="vm:EventTreeNodeBase"
+                                  ItemsSource="{Binding Children}">
+                    <CheckBox Content="{Binding Text}" IsChecked="{Binding IsEnabled, Mode=TwoWay}" />
+                </TreeDataTemplate>
+            </TreeView.DataTemplates>
+            <TreeView.Styles>
+                <Style Selector="TreeViewItem">
+                    <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
+                </Style>
+            </TreeView.Styles>
+        </TreeView>
+                          
+        <GridSplitter Width="4" Grid.Column="1" />
+        <Grid RowDefinitions="*,4,2*,Auto" Grid.Column="2">
+            <ListBox Name="eventsList" Items="{Binding RecordedEvents}" SelectedItem="{Binding SelectedEvent, Mode=TwoWay}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Background="{Binding IsHandled, Converter={StaticResource boolToBrush}}" Text="{Binding DisplayText}" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+            <GridSplitter Height="4" Grid.Row="1" />
+            <DockPanel Grid.Row="2" LastChildFill="True">
+                <TextBlock DockPanel.Dock="Top" FontSize="16" Text="Event chain:" />
+                <ListBox Items="{Binding SelectedEvent.EventChain}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal" Background="{Binding Handled, Converter={StaticResource boolToBrush}}">
+                                <TextBlock Text="{Binding Route}" />
+                                <TextBlock Text=": " />
+                                <TextBlock Text="{Binding HandlerName}" />
+                                <TextBlock Text=" handled: " />
+                                <TextBlock Text="{Binding Handled}" />
+                            </StackPanel>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </DockPanel>
+            <StackPanel Orientation="Horizontal" Grid.Row="3">
+                <Button Content="Clear" Margin="3" Command="{Binding Clear}"  />
+            </StackPanel>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/src/Avalonia.Diagnostics/Views/EventsView.xaml.cs b/src/Avalonia.Diagnostics/Views/EventsView.xaml.cs
new file mode 100644
index 0000000000..a51cb4b7d9
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Views/EventsView.xaml.cs
@@ -0,0 +1,32 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Linq;
+
+using Avalonia.Controls;
+using Avalonia.Diagnostics.ViewModels;
+using Avalonia.Markup.Xaml;
+
+namespace Avalonia.Diagnostics.Views
+{
+    public class EventsView : UserControl
+    {
+        private ListBox _events;
+
+        public EventsView()
+        {
+            this.InitializeComponent();
+            _events = this.FindControl<ListBox>("events");
+        }
+
+        private void RecordedEvents_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            _events.ScrollIntoView(_events.Items.OfType<FiredEvent>().LastOrDefault());
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
new file mode 100644
index 0000000000..310d0c8dba
--- /dev/null
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+      <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/Avalonia.OpenGL/EglConsts.cs b/src/Avalonia.OpenGL/EglConsts.cs
new file mode 100644
index 0000000000..62fb3faef6
--- /dev/null
+++ b/src/Avalonia.OpenGL/EglConsts.cs
@@ -0,0 +1,196 @@
+// ReSharper disable UnusedMember.Global
+// ReSharper disable IdentifierTypo
+namespace Avalonia.OpenGL
+{
+    public static class EglConsts
+    {
+        public const int EGL_ALPHA_SIZE = 0x3021;
+        public const int EGL_BAD_ACCESS = 0x3002;
+        public const int EGL_BAD_ALLOC = 0x3003;
+        public const int EGL_BAD_ATTRIBUTE = 0x3004;
+        public const int EGL_BAD_CONFIG = 0x3005;
+        public const int EGL_BAD_CONTEXT = 0x3006;
+        public const int EGL_BAD_CURRENT_SURFACE = 0x3007;
+        public const int EGL_BAD_DISPLAY = 0x3008;
+        public const int EGL_BAD_MATCH = 0x3009;
+        public const int EGL_BAD_NATIVE_PIXMAP = 0x300A;
+        public const int EGL_BAD_NATIVE_WINDOW = 0x300B;
+        public const int EGL_BAD_PARAMETER = 0x300C;
+        public const int EGL_BAD_SURFACE = 0x300D;
+        public const int EGL_BLUE_SIZE = 0x3022;
+        public const int EGL_BUFFER_SIZE = 0x3020;
+        public const int EGL_CONFIG_CAVEAT = 0x3027;
+        public const int EGL_CONFIG_ID = 0x3028;
+        public const int EGL_CORE_NATIVE_ENGINE = 0x305B;
+        public const int EGL_DEPTH_SIZE = 0x3025;
+        public const int EGL_DONT_CARE = -1;
+        public const int EGL_DRAW = 0x3059;
+        public const int EGL_EXTENSIONS = 0x3055;
+        public const int EGL_FALSE = 0;
+        public const int EGL_GREEN_SIZE = 0x3023;
+        public const int EGL_HEIGHT = 0x3056;
+        public const int EGL_LARGEST_PBUFFER = 0x3058;
+        public const int EGL_LEVEL = 0x3029;
+        public const int EGL_MAX_PBUFFER_HEIGHT = 0x302A;
+        public const int EGL_MAX_PBUFFER_PIXELS = 0x302B;
+        public const int EGL_MAX_PBUFFER_WIDTH = 0x302C;
+        public const int EGL_NATIVE_RENDERABLE = 0x302D;
+        public const int EGL_NATIVE_VISUAL_ID = 0x302E;
+        public const int EGL_NATIVE_VISUAL_TYPE = 0x302F;
+        public const int EGL_NONE = 0x3038;
+        public const int EGL_NON_CONFORMANT_CONFIG = 0x3051;
+        public const int EGL_NOT_INITIALIZED = 0x3001;
+        public const int EGL_NO_CONTEXT = 0;
+        public const int EGL_NO_DISPLAY = 0;
+        public const int EGL_NO_SURFACE = 0;
+        public const int EGL_PBUFFER_BIT = 0x0001;
+        public const int EGL_PIXMAP_BIT = 0x0002;
+        public const int EGL_READ = 0x305A;
+        public const int EGL_RED_SIZE = 0x3024;
+        public const int EGL_SAMPLES = 0x3031;
+        public const int EGL_SAMPLE_BUFFERS = 0x3032;
+        public const int EGL_SLOW_CONFIG = 0x3050;
+        public const int EGL_STENCIL_SIZE = 0x3026;
+        public const int EGL_SUCCESS = 0x3000;
+        public const int EGL_SURFACE_TYPE = 0x3033;
+        public const int EGL_TRANSPARENT_BLUE_VALUE = 0x3035;
+        public const int EGL_TRANSPARENT_GREEN_VALUE = 0x3036;
+        public const int EGL_TRANSPARENT_RED_VALUE = 0x3037;
+        public const int EGL_TRANSPARENT_RGB = 0x3052;
+        public const int EGL_TRANSPARENT_TYPE = 0x3034;
+        public const int EGL_TRUE = 1;
+        public const int EGL_VENDOR = 0x3053;
+        public const int EGL_VERSION = 0x3054;
+        public const int EGL_WIDTH = 0x3057;
+        public const int EGL_WINDOW_BIT = 0x0004;
+
+        public const int EGL_BACK_BUFFER = 0x3084;
+        public const int EGL_BIND_TO_TEXTURE_RGB = 0x3039;
+        public const int EGL_BIND_TO_TEXTURE_RGBA = 0x303A;
+        public const int EGL_CONTEXT_LOST = 0x300E;
+        public const int EGL_MIN_SWAP_INTERVAL = 0x303B;
+        public const int EGL_MAX_SWAP_INTERVAL = 0x303C;
+        public const int EGL_MIPMAP_TEXTURE = 0x3082;
+        public const int EGL_MIPMAP_LEVEL = 0x3083;
+        public const int EGL_NO_TEXTURE = 0x305C;
+        public const int EGL_TEXTURE_2D = 0x305F;
+        public const int EGL_TEXTURE_FORMAT = 0x3080;
+        public const int EGL_TEXTURE_RGB = 0x305D;
+        public const int EGL_TEXTURE_RGBA = 0x305E;
+        public const int EGL_TEXTURE_TARGET = 0x3081;
+
+        public const int EGL_ALPHA_FORMAT = 0x3088;
+        public const int EGL_ALPHA_FORMAT_NONPRE = 0x308B;
+        public const int EGL_ALPHA_FORMAT_PRE = 0x308C;
+        public const int EGL_ALPHA_MASK_SIZE = 0x303E;
+        public const int EGL_BUFFER_PRESERVED = 0x3094;
+        public const int EGL_BUFFER_DESTROYED = 0x3095;
+        public const int EGL_CLIENT_APIS = 0x308D;
+        public const int EGL_COLORSPACE = 0x3087;
+        public const int EGL_COLORSPACE_sRGB = 0x3089;
+        public const int EGL_COLORSPACE_LINEAR = 0x308A;
+        public const int EGL_COLOR_BUFFER_TYPE = 0x303F;
+        public const int EGL_CONTEXT_CLIENT_TYPE = 0x3097;
+        public const int EGL_DISPLAY_SCALING = 10000;
+        public const int EGL_HORIZONTAL_RESOLUTION = 0x3090;
+        public const int EGL_LUMINANCE_BUFFER = 0x308F;
+        public const int EGL_LUMINANCE_SIZE = 0x303D;
+        public const int EGL_OPENGL_ES_BIT = 0x0001;
+        public const int EGL_OPENVG_BIT = 0x0002;
+        public const int EGL_OPENGL_ES_API = 0x30A0;
+        public const int EGL_OPENVG_API = 0x30A1;
+        public const int EGL_OPENVG_IMAGE = 0x3096;
+        public const int EGL_PIXEL_ASPECT_RATIO = 0x3092;
+        public const int EGL_RENDERABLE_TYPE = 0x3040;
+        public const int EGL_RENDER_BUFFER = 0x3086;
+        public const int EGL_RGB_BUFFER = 0x308E;
+        public const int EGL_SINGLE_BUFFER = 0x3085;
+        public const int EGL_SWAP_BEHAVIOR = 0x3093;
+        public const int EGL_UNKNOWN = -1;
+        public const int EGL_VERTICAL_RESOLUTION = 0x3091;
+        public const int EGL_CONFORMANT = 0x3042;
+        public const int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+        public const int EGL_MATCH_NATIVE_PIXMAP = 0x3041;
+        public const int EGL_OPENGL_ES2_BIT = 0x0004;
+        public const int EGL_VG_ALPHA_FORMAT = 0x3088;
+        public const int EGL_VG_ALPHA_FORMAT_NONPRE = 0x308B;
+        public const int EGL_VG_ALPHA_FORMAT_PRE = 0x308C;
+        public const int EGL_VG_ALPHA_FORMAT_PRE_BIT = 0x0040;
+        public const int EGL_VG_COLORSPACE = 0x3087;
+        public const int EGL_VG_COLORSPACE_sRGB = 0x3089;
+        public const int EGL_VG_COLORSPACE_LINEAR = 0x308A;
+        public const int EGL_VG_COLORSPACE_LINEAR_BIT = 0x0020;
+        public const int EGL_DEFAULT_DISPLAY = 0;
+        public const int EGL_MULTISAMPLE_RESOLVE_BOX_BIT = 0x0200;
+        public const int EGL_MULTISAMPLE_RESOLVE = 0x3099;
+        public const int EGL_MULTISAMPLE_RESOLVE_DEFAULT = 0x309A;
+        public const int EGL_MULTISAMPLE_RESOLVE_BOX = 0x309B;
+        public const int EGL_OPENGL_API = 0x30A2;
+        public const int EGL_OPENGL_BIT = 0x0008;
+        public const int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;
+        public const int EGL_CONTEXT_MAJOR_VERSION = 0x3098;
+        public const int EGL_CONTEXT_MINOR_VERSION = 0x30FB;
+        public const int EGL_CONTEXT_OPENGL_PROFILE_MASK = 0x30FD;
+        public const int EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY = 0x31BD;
+        public const int EGL_NO_RESET_NOTIFICATION = 0x31BE;
+        public const int EGL_LOSE_CONTEXT_ON_RESET = 0x31BF;
+        public const int EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT = 0x00000001;
+        public const int EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT = 0x00000002;
+        public const int EGL_CONTEXT_OPENGL_DEBUG = 0x31B0;
+        public const int EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE = 0x31B1;
+        public const int EGL_CONTEXT_OPENGL_ROBUST_ACCESS = 0x31B2;
+        public const int EGL_OPENGL_ES3_BIT = 0x00000040;
+        public const int EGL_CL_EVENT_HANDLE = 0x309C;
+        public const int EGL_SYNC_CL_EVENT = 0x30FE;
+        public const int EGL_SYNC_CL_EVENT_COMPLETE = 0x30FF;
+        public const int EGL_SYNC_PRIOR_COMMANDS_COMPLETE = 0x30F0;
+        public const int EGL_SYNC_TYPE = 0x30F7;
+        public const int EGL_SYNC_STATUS = 0x30F1;
+        public const int EGL_SYNC_CONDITION = 0x30F8;
+        public const int EGL_SIGNALED = 0x30F2;
+        public const int EGL_UNSIGNALED = 0x30F3;
+
+        public const int EGL_SYNC_FLUSH_COMMANDS_BIT = 0x0001;
+
+        public const int EGL_TIMEOUT_EXPIRED = 0x30F5;
+        public const int EGL_CONDITION_SATISFIED = 0x30F6;
+        public const int EGL_NO_SYNC = 0;
+        public const int EGL_SYNC_FENCE = 0x30F9;
+        public const int EGL_GL_COLORSPACE = 0x309D;
+        public const int EGL_GL_COLORSPACE_SRGB = 0x3089;
+        public const int EGL_GL_COLORSPACE_LINEAR = 0x308A;
+        public const int EGL_GL_RENDERBUFFER = 0x30B9;
+        public const int EGL_GL_TEXTURE_2D = 0x30B1;
+        public const int EGL_GL_TEXTURE_LEVEL = 0x30BC;
+        public const int EGL_GL_TEXTURE_3D = 0x30B2;
+        public const int EGL_GL_TEXTURE_ZOFFSET = 0x30BD;
+        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x30B3;
+        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x30B4;
+        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x30B5;
+        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x30B6;
+        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x30B7;
+        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x30B8;
+        public const int EGL_IMAGE_PRESERVED = 0x30D2;
+        public const int EGL_NO_IMAGE = 0;
+
+
+        public const int EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE = 0x3207;
+        public const int EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE = 0x3208;
+        
+        //EGL_ANGLE_platform_angle
+        public const int EGL_PLATFORM_ANGLE_ANGLE = 0x3202;
+        public const int EGL_PLATFORM_ANGLE_TYPE_ANGLE = 0x3203;
+        public const int EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE = 0x3204;
+        public const int EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE = 0x3205;
+        public const int EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED = 0x3451;
+        public const int EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE = 0x3206;
+        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE = 0x320A;
+        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE = 0x345E;
+        
+        //EGL_ANGLE_platform_angle_d3d
+        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE = 0x3209;
+        public const int EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE = 0x320F;
+        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE = 0x320B;
+        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE = 0x320C;
+    }
+}
diff --git a/src/Avalonia.OpenGL/EglDisplay.cs b/src/Avalonia.OpenGL/EglDisplay.cs
new file mode 100644
index 0000000000..ea0a9bf087
--- /dev/null
+++ b/src/Avalonia.OpenGL/EglDisplay.cs
@@ -0,0 +1,205 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using Avalonia.Platform.Interop;
+using static Avalonia.OpenGL.EglConsts;
+
+namespace Avalonia.OpenGL
+{
+    public class EglDisplay : IGlDisplay
+    {
+        private readonly EglInterface _egl;
+        private readonly IntPtr _display;
+        private readonly IntPtr _config;
+        private readonly int[] _contextAttributes;
+        
+        public EglDisplay(EglInterface egl)
+        {
+            _egl = egl;  
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _egl.GetPlatformDisplayEXT != null)
+            {
+                foreach (var dapi in new[] {EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE})
+                {
+                    _display = _egl.GetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, IntPtr.Zero, new[]
+                    {
+                        EGL_PLATFORM_ANGLE_TYPE_ANGLE, dapi, EGL_NONE
+                    });
+                    if(_display != IntPtr.Zero)
+                        break;
+                }
+            }
+
+            if (_display == IntPtr.Zero)
+                _display = _egl.GetDisplay(IntPtr.Zero);
+            
+            if(_display == IntPtr.Zero)
+                throw new OpenGlException("eglGetDisplay failed");
+            
+            if (!_egl.Initialize(_display, out var major, out var minor))
+                throw new OpenGlException("eglInitialize failed");
+
+            foreach (var cfg in new[]
+            {
+                new
+                {
+                    Attributes = new[] {EGL_NONE},
+                    Api = EGL_OPENGL_API,
+                    RenderableTypeBit = EGL_OPENGL_BIT,
+                    Type = GlDisplayType.OpenGL2
+                },
+                new
+                {
+                    Attributes = new[]
+                    {
+                        EGL_CONTEXT_CLIENT_VERSION, 2,
+                        EGL_NONE
+                    },
+                    Api = EGL_OPENGL_ES_API,
+                    RenderableTypeBit = EGL_OPENGL_ES2_BIT,
+                    Type = GlDisplayType.OpenGLES2
+                }
+            })
+            {
+                if (!_egl.BindApi(cfg.Api))
+                    continue;
+
+                var attribs = new[]
+                {
+                    EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+                    EGL_RENDERABLE_TYPE, cfg.RenderableTypeBit,
+                    EGL_RED_SIZE, 8,
+                    EGL_GREEN_SIZE, 8,
+                    EGL_BLUE_SIZE, 8,
+                    EGL_ALPHA_SIZE, 8,
+                    EGL_STENCIL_SIZE, 8,
+                    EGL_DEPTH_SIZE, 8,
+                    EGL_NONE
+                };
+                if (!_egl.ChooseConfig(_display, attribs, out _config, 1, out int numConfigs))
+                    continue;
+                if (numConfigs == 0)
+                    continue;
+                _contextAttributes = cfg.Attributes;
+                Type = cfg.Type;
+            }
+
+            if (_contextAttributes == null)
+                throw new OpenGlException("No suitable EGL config was found");
+            
+            GlInterface = new GlInterface((proc, optional) =>
+            {
+
+                using (var u = new Utf8Buffer(proc))
+                {
+                    var rv = _egl.GetProcAddress(u);
+                    if (rv == IntPtr.Zero && !optional)
+                        throw new OpenGlException("Missing function " + proc);
+                    return rv;
+                }
+            });
+        }
+
+        public EglDisplay() : this(new EglInterface())
+        {
+            
+        }
+        
+        public GlDisplayType Type { get; }
+        public GlInterface GlInterface { get; }
+        public IGlContext CreateContext(IGlContext share)
+        {
+            var shareCtx = (EglContext)share;
+            var ctx = _egl.CreateContext(_display, _config, shareCtx?.Context ?? IntPtr.Zero, _contextAttributes);
+            if (ctx == IntPtr.Zero)
+                throw new OpenGlException("eglCreateContext failed");
+            var surf = _egl.CreatePBufferSurface(_display, _config, new[]
+            {
+                EGL_WIDTH, 1,
+                EGL_HEIGHT, 1,
+                EGL_NONE
+            });
+            if (surf == IntPtr.Zero)
+                throw new OpenGlException("eglCreatePbufferSurface failed");
+            var rv = new EglContext(this, ctx, surf);
+            rv.MakeCurrent(null);
+            return rv;
+        }
+
+        public void ClearContext()
+        {
+            if (!_egl.MakeCurrent(_display, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero))
+                throw new OpenGlException("eglMakeCurrent failed");
+        }
+
+        public IGlSurface CreateWindowSurface(IntPtr window)
+        {
+            var s = _egl.CreateWindowSurface(_display, _config, window, new[] {EGL_NONE, EGL_NONE});
+            if (s == IntPtr.Zero)
+                throw new OpenGlException("eglCreateWindowSurface failed");
+            return new EglSurface(this, s);
+        }
+
+        public int SampleCount
+        {
+            get
+            {
+                _egl.GetConfigAttrib(_display, _config, EGL_SAMPLES, out var rv);
+                return rv;
+            }
+        }
+
+        public int StencilSize
+        {
+            get
+            {
+                _egl.GetConfigAttrib(_display, _config, EGL_STENCIL_SIZE, out var rv);
+                return rv;
+            }
+        }
+
+        class EglSurface : SafeHandle, IGlSurface
+        {
+            private readonly EglDisplay _display;
+
+            public EglSurface(EglDisplay display, IntPtr surface)  : base(surface, true)
+            {
+                _display = display;
+            }
+
+            protected override bool ReleaseHandle()
+            {
+                _display._egl.DestroySurface(_display._display, handle);
+                return true;
+            }
+
+            public override bool IsInvalid => handle == IntPtr.Zero;
+
+            public IGlDisplay Display => _display;
+            public void SwapBuffers() => _display._egl.SwapBuffers(_display._display, handle);
+        }
+        
+        class EglContext : IGlContext
+        {
+            private readonly EglDisplay _disp;
+
+            public EglContext(EglDisplay display, IntPtr ctx, IntPtr offscreenSurface)
+            {
+                _disp = display;
+                Context = ctx;
+                OffscreenSurface = offscreenSurface;
+            }
+
+            public IntPtr Context { get; }
+            public IntPtr OffscreenSurface { get; }
+            public IGlDisplay Display => _disp;
+
+            public void MakeCurrent(IGlSurface surface)
+            {
+                var surf = ((EglSurface)surface)?.DangerousGetHandle() ?? OffscreenSurface;
+                if (!_disp._egl.MakeCurrent(_disp._display, surf, surf, Context))
+                    throw new OpenGlException("eglMakeCurrent failed");
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/EglGlPlatformFeature.cs b/src/Avalonia.OpenGL/EglGlPlatformFeature.cs
new file mode 100644
index 0000000000..535e32924e
--- /dev/null
+++ b/src/Avalonia.OpenGL/EglGlPlatformFeature.cs
@@ -0,0 +1,39 @@
+using System;
+using Avalonia.Logging;
+
+namespace Avalonia.OpenGL
+{
+    public class EglGlPlatformFeature : IWindowingPlatformGlFeature
+    {
+        public IGlDisplay Display { get; set; }
+        public IGlContext ImmediateContext { get; set; }
+        public IGlContext DeferredContext { get; set; }
+
+        public static void TryInitialize()
+        {
+            var feature = TryCreate();
+            if (feature != null)
+                AvaloniaLocator.CurrentMutable.Bind<IWindowingPlatformGlFeature>().ToConstant(feature);
+        }
+        
+        public static EglGlPlatformFeature TryCreate()
+        {
+            try
+            {
+                var disp = new EglDisplay();
+                var ctx = disp.CreateContext(null);
+                return new EglGlPlatformFeature
+                {
+                    Display = disp,
+                    ImmediateContext = ctx,
+                    DeferredContext = disp.CreateContext(ctx)
+                };
+            }
+            catch(Exception e)
+            {
+                Logger.Error("OpenGL", null, "Unable to initialize EGL-based rendering: {0}", e);
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/EglGlPlatformSurface.cs b/src/Avalonia.OpenGL/EglGlPlatformSurface.cs
new file mode 100644
index 0000000000..19894e4ec5
--- /dev/null
+++ b/src/Avalonia.OpenGL/EglGlPlatformSurface.cs
@@ -0,0 +1,80 @@
+using System;
+
+namespace Avalonia.OpenGL
+{
+    public class EglGlPlatformSurface : IGlPlatformSurface
+    {
+        public interface IEglWindowGlPlatformSurfaceInfo
+        {
+            IntPtr Handle { get; }
+            // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged
+            System.Drawing.Size PixelSize { get; }
+            double Scaling { get; }
+        }
+
+        private readonly EglDisplay _display;
+        private readonly IGlContext _context;
+        private readonly IEglWindowGlPlatformSurfaceInfo _info;
+        
+        public EglGlPlatformSurface(EglDisplay display, IGlContext context, IEglWindowGlPlatformSurfaceInfo info)
+        {
+            _display = display;
+            _context = context;
+            _info = info;
+        }
+        
+        public IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            var glSurface = _display.CreateWindowSurface(_info.Handle);
+            return new RenderTarget(_context, glSurface, _info);
+        }
+
+        class RenderTarget : IGlPlatformSurfaceRenderTarget
+        {
+            private readonly IGlContext _context;
+            private readonly IGlSurface _glSurface;
+            private readonly IEglWindowGlPlatformSurfaceInfo _info;
+
+            public RenderTarget(IGlContext context, IGlSurface glSurface, IEglWindowGlPlatformSurfaceInfo info)
+            {
+                _context = context;
+                _glSurface = glSurface;
+                _info = info;
+            }
+
+            public void Dispose() => _glSurface.Dispose();
+
+            public IGlPlatformSurfaceRenderingSession BeginDraw()
+            {
+                _context.MakeCurrent(_glSurface);
+                return new Session(_context, _glSurface, _info);
+            }
+            
+            class Session : IGlPlatformSurfaceRenderingSession
+            {
+                private readonly IGlContext _context;
+                private readonly IGlSurface _glSurface;
+                private readonly IEglWindowGlPlatformSurfaceInfo _info;
+
+                public Session(IGlContext context, IGlSurface glSurface, IEglWindowGlPlatformSurfaceInfo info)
+                {
+                    _context = context;
+                    _glSurface = glSurface;
+                    _info = info;
+                }
+
+                public void Dispose()
+                {
+                    _context.Display.GlInterface.Flush();
+                    _glSurface.SwapBuffers();
+                    _context.Display.ClearContext();
+                }
+
+                public IGlDisplay Display => _context.Display;
+                public System.Drawing.Size PixelSize => _info.PixelSize;
+                public double Scaling => _info.Scaling;
+            }
+        }
+    }
+}
+
diff --git a/src/Avalonia.OpenGL/EglInterface.cs b/src/Avalonia.OpenGL/EglInterface.cs
new file mode 100644
index 0000000000..535f66ee1f
--- /dev/null
+++ b/src/Avalonia.OpenGL/EglInterface.cs
@@ -0,0 +1,93 @@
+using System;
+using Avalonia.Platform;
+using Avalonia.Platform.Interop;
+using static Avalonia.OpenGL.EglConsts;
+
+namespace Avalonia.OpenGL
+{
+    public class EglInterface : GlInterfaceBase
+    {
+        public EglInterface() : base(Load())
+        {
+            
+        }
+        
+        public EglInterface(string library) : base(Load(library))
+        {
+        }
+
+        static Func<string, bool, IntPtr> Load()
+        {
+            var os = AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem;
+            if(os == OperatingSystemType.Linux || os == OperatingSystemType.Android)
+                return Load("libEGL.so.1");
+            if (os == OperatingSystemType.WinNT)
+                return Load(@"libegl.dll");
+            throw new PlatformNotSupportedException();
+        }
+
+        static Func<string, bool, IntPtr> Load(string library)
+        {
+            var dyn = AvaloniaLocator.Current.GetService<IDynamicLibraryLoader>();
+            var lib = dyn.LoadLibrary(library);
+            return (s, o) => dyn.GetProcAddress(lib, s, o);
+        }
+        
+        // ReSharper disable UnassignedGetOnlyAutoProperty
+        public delegate IntPtr EglGetDisplay(IntPtr nativeDisplay);
+        [EntryPoint("eglGetDisplay")]
+        public EglGetDisplay GetDisplay { get; }
+        
+        public delegate IntPtr EglGetPlatformDisplayEXT(int platform, IntPtr nativeDisplay, int[] attrs);
+        [EntryPoint("eglGetPlatformDisplayEXT", true)]
+        public EglGetPlatformDisplayEXT GetPlatformDisplayEXT { get; }
+
+        public delegate bool EglInitialize(IntPtr display, out int major, out int minor);
+        [EntryPoint("eglInitialize")]
+        public EglInitialize Initialize { get; }        
+        
+        public delegate IntPtr EglGetProcAddress(Utf8Buffer proc);
+        [EntryPoint("eglGetProcAddress")]
+        public EglGetProcAddress GetProcAddress { get; }
+
+        public delegate bool EglBindApi(int api);
+        [EntryPoint("eglBindAPI")]
+        public EglBindApi BindApi { get; }
+
+        public delegate bool EglChooseConfig(IntPtr display, int[] attribs,
+            out IntPtr surfaceConfig, int numConfigs, out int choosenConfig);
+        [EntryPoint("eglChooseConfig")]
+        public EglChooseConfig ChooseConfig { get; }
+
+        public delegate IntPtr EglCreateContext(IntPtr display, IntPtr config,
+            IntPtr share, int[] attrs);
+        [EntryPoint("eglCreateContext")]
+        public EglCreateContext CreateContext { get; }
+
+        public delegate IntPtr EglCreatePBufferSurface(IntPtr display, IntPtr config, int[] attrs);
+        [EntryPoint("eglCreatePbufferSurface")]
+        public EglCreatePBufferSurface CreatePBufferSurface { get; }
+
+        public delegate bool EglMakeCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
+        [EntryPoint("eglMakeCurrent")]
+        public EglMakeCurrent MakeCurrent { get; }
+
+        public delegate void EglDisplaySurfaceVoidDelegate(IntPtr display, IntPtr surface);
+        [EntryPoint("eglDestroySurface")]
+        public EglDisplaySurfaceVoidDelegate DestroySurface { get; }
+        
+        [EntryPoint("eglSwapBuffers")]
+        public EglDisplaySurfaceVoidDelegate SwapBuffers { get; }
+        
+        public delegate IntPtr
+            EglCreateWindowSurface(IntPtr display, IntPtr config, IntPtr window, int[] attrs);
+        [EntryPoint("eglCreateWindowSurface")]
+        public EglCreateWindowSurface CreateWindowSurface { get; }
+
+        public delegate bool EglGetConfigAttrib(IntPtr display, IntPtr config, int attr, out int rv);
+        [EntryPoint("eglGetConfigAttrib")]
+        public EglGetConfigAttrib GetConfigAttrib { get; }
+
+        // ReSharper restore UnassignedGetOnlyAutoProperty
+    }
+}
diff --git a/src/Avalonia.OpenGL/EntryPointAttribute.cs b/src/Avalonia.OpenGL/EntryPointAttribute.cs
new file mode 100644
index 0000000000..241f517df9
--- /dev/null
+++ b/src/Avalonia.OpenGL/EntryPointAttribute.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Avalonia.OpenGL
+{
+    class EntryPointAttribute : Attribute
+    {
+        public string EntryPoint { get; }
+        public bool Optional { get; }
+
+        public EntryPointAttribute(string entryPoint, bool optional = false)
+        {
+            EntryPoint = entryPoint;
+            Optional = optional;
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/GlConsts.cs b/src/Avalonia.OpenGL/GlConsts.cs
new file mode 100644
index 0000000000..3084a6f958
--- /dev/null
+++ b/src/Avalonia.OpenGL/GlConsts.cs
@@ -0,0 +1,789 @@
+// ReSharper disable UnusedMember.Global
+// ReSharper disable IdentifierTypo
+namespace Avalonia.OpenGL
+{
+    public static class GlConsts
+    {
+        public const int GL_BYTE = 0x1400;
+        public const int GL_UNSIGNED_BYTE = 0x1401;
+        public const int GL_SHORT = 0x1402;
+        public const int GL_UNSIGNED_SHORT = 0x1403;
+        public const int GL_INT = 0x1404;
+        public const int GL_UNSIGNED_INT = 0x1405;
+        public const int GL_FLOAT = 0x1406;
+        public const int GL_2_BYTES = 0x1407;
+        public const int GL_3_BYTES = 0x1408;
+        public const int GL_4_BYTES = 0x1409;
+        public const int GL_DOUBLE = 0x140A;
+        public const int GL_POINTS = 0x0000;
+        public const int GL_LINES = 0x0001;
+        public const int GL_LINE_LOOP = 0x0002;
+        public const int GL_LINE_STRIP = 0x0003;
+        public const int GL_TRIANGLES = 0x0004;
+        public const int GL_TRIANGLE_STRIP = 0x0005;
+        public const int GL_TRIANGLE_FAN = 0x0006;
+        public const int GL_QUADS = 0x0007;
+        public const int GL_QUAD_STRIP = 0x0008;
+        public const int GL_POLYGON = 0x0009;
+        public const int GL_VERTEX_ARRAY = 0x8074;
+        public const int GL_NORMAL_ARRAY = 0x8075;
+        public const int GL_COLOR_ARRAY = 0x8076;
+        public const int GL_INDEX_ARRAY = 0x8077;
+        public const int GL_TEXTURE_COORD_ARRAY = 0x8078;
+        public const int GL_EDGE_FLAG_ARRAY = 0x8079;
+        public const int GL_VERTEX_ARRAY_SIZE = 0x807A;
+        public const int GL_VERTEX_ARRAY_TYPE = 0x807B;
+        public const int GL_VERTEX_ARRAY_STRIDE = 0x807C;
+        public const int GL_NORMAL_ARRAY_TYPE = 0x807E;
+        public const int GL_NORMAL_ARRAY_STRIDE = 0x807F;
+        public const int GL_COLOR_ARRAY_SIZE = 0x8081;
+        public const int GL_COLOR_ARRAY_TYPE = 0x8082;
+        public const int GL_COLOR_ARRAY_STRIDE = 0x8083;
+        public const int GL_INDEX_ARRAY_TYPE = 0x8085;
+        public const int GL_INDEX_ARRAY_STRIDE = 0x8086;
+        public const int GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088;
+        public const int GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089;
+        public const int GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A;
+        public const int GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C;
+        public const int GL_VERTEX_ARRAY_POINTER = 0x808E;
+        public const int GL_NORMAL_ARRAY_POINTER = 0x808F;
+        public const int GL_COLOR_ARRAY_POINTER = 0x8090;
+        public const int GL_INDEX_ARRAY_POINTER = 0x8091;
+        public const int GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092;
+        public const int GL_EDGE_FLAG_ARRAY_POINTER = 0x8093;
+        public const int GL_V2F = 0x2A20;
+        public const int GL_V3F = 0x2A21;
+        public const int GL_C4UB_V2F = 0x2A22;
+        public const int GL_C4UB_V3F = 0x2A23;
+        public const int GL_C3F_V3F = 0x2A24;
+        public const int GL_N3F_V3F = 0x2A25;
+        public const int GL_C4F_N3F_V3F = 0x2A26;
+        public const int GL_T2F_V3F = 0x2A27;
+        public const int GL_T4F_V4F = 0x2A28;
+        public const int GL_T2F_C4UB_V3F = 0x2A29;
+        public const int GL_T2F_C3F_V3F = 0x2A2A;
+        public const int GL_T2F_N3F_V3F = 0x2A2B;
+        public const int GL_T2F_C4F_N3F_V3F = 0x2A2C;
+        public const int GL_T4F_C4F_N3F_V4F = 0x2A2D;
+        public const int GL_MATRIX_MODE = 0x0BA0;
+        public const int GL_MODELVIEW = 0x1700;
+        public const int GL_PROJECTION = 0x1701;
+        public const int GL_TEXTURE = 0x1702;
+        public const int GL_POINT_SMOOTH = 0x0B10;
+        public const int GL_POINT_SIZE = 0x0B11;
+        public const int GL_POINT_SIZE_GRANULARITY = 0x0B13;
+        public const int GL_POINT_SIZE_RANGE = 0x0B12;
+        public const int GL_LINE_SMOOTH = 0x0B20;
+        public const int GL_LINE_STIPPLE = 0x0B24;
+        public const int GL_LINE_STIPPLE_PATTERN = 0x0B25;
+        public const int GL_LINE_STIPPLE_REPEAT = 0x0B26;
+        public const int GL_LINE_WIDTH = 0x0B21;
+        public const int GL_LINE_WIDTH_GRANULARITY = 0x0B23;
+        public const int GL_LINE_WIDTH_RANGE = 0x0B22;
+        public const int GL_POINT = 0x1B00;
+        public const int GL_LINE = 0x1B01;
+        public const int GL_FILL = 0x1B02;
+        public const int GL_CW = 0x0900;
+        public const int GL_CCW = 0x0901;
+        public const int GL_FRONT = 0x0404;
+        public const int GL_BACK = 0x0405;
+        public const int GL_POLYGON_MODE = 0x0B40;
+        public const int GL_POLYGON_SMOOTH = 0x0B41;
+        public const int GL_POLYGON_STIPPLE = 0x0B42;
+        public const int GL_EDGE_FLAG = 0x0B43;
+        public const int GL_CULL_FACE = 0x0B44;
+        public const int GL_CULL_FACE_MODE = 0x0B45;
+        public const int GL_FRONT_FACE = 0x0B46;
+        public const int GL_POLYGON_OFFSET_FACTOR = 0x8038;
+        public const int GL_POLYGON_OFFSET_UNITS = 0x2A00;
+        public const int GL_POLYGON_OFFSET_POINT = 0x2A01;
+        public const int GL_POLYGON_OFFSET_LINE = 0x2A02;
+        public const int GL_POLYGON_OFFSET_FILL = 0x8037;
+        public const int GL_COMPILE = 0x1300;
+        public const int GL_COMPILE_AND_EXECUTE = 0x1301;
+        public const int GL_LIST_BASE = 0x0B32;
+        public const int GL_LIST_INDEX = 0x0B33;
+        public const int GL_LIST_MODE = 0x0B30;
+        public const int GL_NEVER = 0x0200;
+        public const int GL_LESS = 0x0201;
+        public const int GL_EQUAL = 0x0202;
+        public const int GL_LEQUAL = 0x0203;
+        public const int GL_GREATER = 0x0204;
+        public const int GL_NOTEQUAL = 0x0205;
+        public const int GL_GEQUAL = 0x0206;
+        public const int GL_ALWAYS = 0x0207;
+        public const int GL_DEPTH_TEST = 0x0B71;
+        public const int GL_DEPTH_BITS = 0x0D56;
+        public const int GL_DEPTH_CLEAR_VALUE = 0x0B73;
+        public const int GL_DEPTH_FUNC = 0x0B74;
+        public const int GL_DEPTH_RANGE = 0x0B70;
+        public const int GL_DEPTH_WRITEMASK = 0x0B72;
+        public const int GL_DEPTH_COMPONENT = 0x1902;
+        public const int GL_LIGHTING = 0x0B50;
+        public const int GL_LIGHT0 = 0x4000;
+        public const int GL_LIGHT1 = 0x4001;
+        public const int GL_LIGHT2 = 0x4002;
+        public const int GL_LIGHT3 = 0x4003;
+        public const int GL_LIGHT4 = 0x4004;
+        public const int GL_LIGHT5 = 0x4005;
+        public const int GL_LIGHT6 = 0x4006;
+        public const int GL_LIGHT7 = 0x4007;
+        public const int GL_SPOT_EXPONENT = 0x1205;
+        public const int GL_SPOT_CUTOFF = 0x1206;
+        public const int GL_CONSTANT_ATTENUATION = 0x1207;
+        public const int GL_LINEAR_ATTENUATION = 0x1208;
+        public const int GL_QUADRATIC_ATTENUATION = 0x1209;
+        public const int GL_AMBIENT = 0x1200;
+        public const int GL_DIFFUSE = 0x1201;
+        public const int GL_SPECULAR = 0x1202;
+        public const int GL_SHININESS = 0x1601;
+        public const int GL_EMISSION = 0x1600;
+        public const int GL_POSITION = 0x1203;
+        public const int GL_SPOT_DIRECTION = 0x1204;
+        public const int GL_AMBIENT_AND_DIFFUSE = 0x1602;
+        public const int GL_COLOR_INDEXES = 0x1603;
+        public const int GL_LIGHT_MODEL_TWO_SIDE = 0x0B52;
+        public const int GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51;
+        public const int GL_LIGHT_MODEL_AMBIENT = 0x0B53;
+        public const int GL_FRONT_AND_BACK = 0x0408;
+        public const int GL_SHADE_MODEL = 0x0B54;
+        public const int GL_FLAT = 0x1D00;
+        public const int GL_SMOOTH = 0x1D01;
+        public const int GL_COLOR_MATERIAL = 0x0B57;
+        public const int GL_COLOR_MATERIAL_FACE = 0x0B55;
+        public const int GL_COLOR_MATERIAL_PARAMETER = 0x0B56;
+        public const int GL_NORMALIZE = 0x0BA1;
+        public const int GL_CLIP_PLANE0 = 0x3000;
+        public const int GL_CLIP_PLANE1 = 0x3001;
+        public const int GL_CLIP_PLANE2 = 0x3002;
+        public const int GL_CLIP_PLANE3 = 0x3003;
+        public const int GL_CLIP_PLANE4 = 0x3004;
+        public const int GL_CLIP_PLANE5 = 0x3005;
+        public const int GL_ACCUM_RED_BITS = 0x0D58;
+        public const int GL_ACCUM_GREEN_BITS = 0x0D59;
+        public const int GL_ACCUM_BLUE_BITS = 0x0D5A;
+        public const int GL_ACCUM_ALPHA_BITS = 0x0D5B;
+        public const int GL_ACCUM_CLEAR_VALUE = 0x0B80;
+        public const int GL_ACCUM = 0x0100;
+        public const int GL_ADD = 0x0104;
+        public const int GL_LOAD = 0x0101;
+        public const int GL_MULT = 0x0103;
+        public const int GL_RETURN = 0x0102;
+        public const int GL_ALPHA_TEST = 0x0BC0;
+        public const int GL_ALPHA_TEST_REF = 0x0BC2;
+        public const int GL_ALPHA_TEST_FUNC = 0x0BC1;
+        public const int GL_BLEND = 0x0BE2;
+        public const int GL_BLEND_SRC = 0x0BE1;
+        public const int GL_BLEND_DST = 0x0BE0;
+        public const int GL_SRC_COLOR = 0x0300;
+        public const int GL_ONE_MINUS_SRC_COLOR = 0x0301;
+        public const int GL_SRC_ALPHA = 0x0302;
+        public const int GL_ONE_MINUS_SRC_ALPHA = 0x0303;
+        public const int GL_DST_ALPHA = 0x0304;
+        public const int GL_ONE_MINUS_DST_ALPHA = 0x0305;
+        public const int GL_DST_COLOR = 0x0306;
+        public const int GL_ONE_MINUS_DST_COLOR = 0x0307;
+        public const int GL_SRC_ALPHA_SATURATE = 0x0308;
+        public const int GL_FEEDBACK = 0x1C01;
+        public const int GL_RENDER = 0x1C00;
+        public const int GL_SELECT = 0x1C02;
+        public const int GL_2D = 0x0600;
+        public const int GL_3D = 0x0601;
+        public const int GL_3D_COLOR = 0x0602;
+        public const int GL_3D_COLOR_TEXTURE = 0x0603;
+        public const int GL_4D_COLOR_TEXTURE = 0x0604;
+        public const int GL_POINT_TOKEN = 0x0701;
+        public const int GL_LINE_TOKEN = 0x0702;
+        public const int GL_LINE_RESET_TOKEN = 0x0707;
+        public const int GL_POLYGON_TOKEN = 0x0703;
+        public const int GL_BITMAP_TOKEN = 0x0704;
+        public const int GL_DRAW_PIXEL_TOKEN = 0x0705;
+        public const int GL_COPY_PIXEL_TOKEN = 0x0706;
+        public const int GL_PASS_THROUGH_TOKEN = 0x0700;
+        public const int GL_FEEDBACK_BUFFER_POINTER = 0x0DF0;
+        public const int GL_FEEDBACK_BUFFER_SIZE = 0x0DF1;
+        public const int GL_FEEDBACK_BUFFER_TYPE = 0x0DF2;
+        public const int GL_SELECTION_BUFFER_POINTER = 0x0DF3;
+        public const int GL_SELECTION_BUFFER_SIZE = 0x0DF4;
+        public const int GL_FOG = 0x0B60;
+        public const int GL_FOG_MODE = 0x0B65;
+        public const int GL_FOG_DENSITY = 0x0B62;
+        public const int GL_FOG_COLOR = 0x0B66;
+        public const int GL_FOG_INDEX = 0x0B61;
+        public const int GL_FOG_START = 0x0B63;
+        public const int GL_FOG_END = 0x0B64;
+        public const int GL_LINEAR = 0x2601;
+        public const int GL_EXP = 0x0800;
+        public const int GL_EXP2 = 0x0801;
+        public const int GL_LOGIC_OP = 0x0BF1;
+        public const int GL_INDEX_LOGIC_OP = 0x0BF1;
+        public const int GL_COLOR_LOGIC_OP = 0x0BF2;
+        public const int GL_LOGIC_OP_MODE = 0x0BF0;
+        public const int GL_CLEAR = 0x1500;
+        public const int GL_SET = 0x150F;
+        public const int GL_COPY = 0x1503;
+        public const int GL_COPY_INVERTED = 0x150C;
+        public const int GL_NOOP = 0x1505;
+        public const int GL_INVERT = 0x150A;
+        public const int GL_AND = 0x1501;
+        public const int GL_NAND = 0x150E;
+        public const int GL_OR = 0x1507;
+        public const int GL_NOR = 0x1508;
+        public const int GL_XOR = 0x1506;
+        public const int GL_EQUIV = 0x1509;
+        public const int GL_AND_REVERSE = 0x1502;
+        public const int GL_AND_INVERTED = 0x1504;
+        public const int GL_OR_REVERSE = 0x150B;
+        public const int GL_OR_INVERTED = 0x150D;
+        public const int GL_STENCIL_BITS = 0x0D57;
+        public const int GL_STENCIL_TEST = 0x0B90;
+        public const int GL_STENCIL_CLEAR_VALUE = 0x0B91;
+        public const int GL_STENCIL_FUNC = 0x0B92;
+        public const int GL_STENCIL_VALUE_MASK = 0x0B93;
+        public const int GL_STENCIL_FAIL = 0x0B94;
+        public const int GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95;
+        public const int GL_STENCIL_PASS_DEPTH_PASS = 0x0B96;
+        public const int GL_STENCIL_REF = 0x0B97;
+        public const int GL_STENCIL_WRITEMASK = 0x0B98;
+        public const int GL_STENCIL_INDEX = 0x1901;
+        public const int GL_KEEP = 0x1E00;
+        public const int GL_REPLACE = 0x1E01;
+        public const int GL_INCR = 0x1E02;
+        public const int GL_DECR = 0x1E03;
+        public const int GL_LEFT = 0x0406;
+        public const int GL_RIGHT = 0x0407;
+        public const int GL_FRONT_LEFT = 0x0400;
+        public const int GL_FRONT_RIGHT = 0x0401;
+        public const int GL_BACK_LEFT = 0x0402;
+        public const int GL_BACK_RIGHT = 0x0403;
+        public const int GL_AUX0 = 0x0409;
+        public const int GL_AUX1 = 0x040A;
+        public const int GL_AUX2 = 0x040B;
+        public const int GL_AUX3 = 0x040C;
+        public const int GL_COLOR_INDEX = 0x1900;
+        public const int GL_RED = 0x1903;
+        public const int GL_GREEN = 0x1904;
+        public const int GL_BLUE = 0x1905;
+        public const int GL_ALPHA = 0x1906;
+        public const int GL_LUMINANCE = 0x1909;
+        public const int GL_LUMINANCE_ALPHA = 0x190A;
+        public const int GL_ALPHA_BITS = 0x0D55;
+        public const int GL_RED_BITS = 0x0D52;
+        public const int GL_GREEN_BITS = 0x0D53;
+        public const int GL_BLUE_BITS = 0x0D54;
+        public const int GL_INDEX_BITS = 0x0D51;
+        public const int GL_SUBPIXEL_BITS = 0x0D50;
+        public const int GL_AUX_BUFFERS = 0x0C00;
+        public const int GL_READ_BUFFER = 0x0C02;
+        public const int GL_DRAW_BUFFER = 0x0C01;
+        public const int GL_DOUBLEBUFFER = 0x0C32;
+        public const int GL_STEREO = 0x0C33;
+        public const int GL_BITMAP = 0x1A00;
+        public const int GL_COLOR = 0x1800;
+        public const int GL_DEPTH = 0x1801;
+        public const int GL_STENCIL = 0x1802;
+        public const int GL_DITHER = 0x0BD0;
+        public const int GL_RGB = 0x1907;
+        public const int GL_RGBA = 0x1908;
+        public const int GL_MAX_LIST_NESTING = 0x0B31;
+        public const int GL_MAX_EVAL_ORDER = 0x0D30;
+        public const int GL_MAX_LIGHTS = 0x0D31;
+        public const int GL_MAX_CLIP_PLANES = 0x0D32;
+        public const int GL_MAX_TEXTURE_SIZE = 0x0D33;
+        public const int GL_MAX_PIXEL_MAP_TABLE = 0x0D34;
+        public const int GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35;
+        public const int GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36;
+        public const int GL_MAX_NAME_STACK_DEPTH = 0x0D37;
+        public const int GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38;
+        public const int GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39;
+        public const int GL_MAX_VIEWPORT_DIMS = 0x0D3A;
+        public const int GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = 0x0D3B;
+        public const int GL_ATTRIB_STACK_DEPTH = 0x0BB0;
+        public const int GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1;
+        public const int GL_COLOR_CLEAR_VALUE = 0x0C22;
+        public const int GL_COLOR_WRITEMASK = 0x0C23;
+        public const int GL_CURRENT_INDEX = 0x0B01;
+        public const int GL_CURRENT_COLOR = 0x0B00;
+        public const int GL_CURRENT_NORMAL = 0x0B02;
+        public const int GL_CURRENT_RASTER_COLOR = 0x0B04;
+        public const int GL_CURRENT_RASTER_DISTANCE = 0x0B09;
+        public const int GL_CURRENT_RASTER_INDEX = 0x0B05;
+        public const int GL_CURRENT_RASTER_POSITION = 0x0B07;
+        public const int GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06;
+        public const int GL_CURRENT_RASTER_POSITION_VALID = 0x0B08;
+        public const int GL_CURRENT_TEXTURE_COORDS = 0x0B03;
+        public const int GL_INDEX_CLEAR_VALUE = 0x0C20;
+        public const int GL_INDEX_MODE = 0x0C30;
+        public const int GL_INDEX_WRITEMASK = 0x0C21;
+        public const int GL_MODELVIEW_MATRIX = 0x0BA6;
+        public const int GL_MODELVIEW_STACK_DEPTH = 0x0BA3;
+        public const int GL_NAME_STACK_DEPTH = 0x0D70;
+        public const int GL_PROJECTION_MATRIX = 0x0BA7;
+        public const int GL_PROJECTION_STACK_DEPTH = 0x0BA4;
+        public const int GL_RENDER_MODE = 0x0C40;
+        public const int GL_RGBA_MODE = 0x0C31;
+        public const int GL_TEXTURE_MATRIX = 0x0BA8;
+        public const int GL_TEXTURE_STACK_DEPTH = 0x0BA5;
+        public const int GL_VIEWPORT = 0x0BA2;
+        public const int GL_AUTO_NORMAL = 0x0D80;
+        public const int GL_MAP1_COLOR_4 = 0x0D90;
+        public const int GL_MAP1_INDEX = 0x0D91;
+        public const int GL_MAP1_NORMAL = 0x0D92;
+        public const int GL_MAP1_TEXTURE_COORD_1 = 0x0D93;
+        public const int GL_MAP1_TEXTURE_COORD_2 = 0x0D94;
+        public const int GL_MAP1_TEXTURE_COORD_3 = 0x0D95;
+        public const int GL_MAP1_TEXTURE_COORD_4 = 0x0D96;
+        public const int GL_MAP1_VERTEX_3 = 0x0D97;
+        public const int GL_MAP1_VERTEX_4 = 0x0D98;
+        public const int GL_MAP2_COLOR_4 = 0x0DB0;
+        public const int GL_MAP2_INDEX = 0x0DB1;
+        public const int GL_MAP2_NORMAL = 0x0DB2;
+        public const int GL_MAP2_TEXTURE_COORD_1 = 0x0DB3;
+        public const int GL_MAP2_TEXTURE_COORD_2 = 0x0DB4;
+        public const int GL_MAP2_TEXTURE_COORD_3 = 0x0DB5;
+        public const int GL_MAP2_TEXTURE_COORD_4 = 0x0DB6;
+        public const int GL_MAP2_VERTEX_3 = 0x0DB7;
+        public const int GL_MAP2_VERTEX_4 = 0x0DB8;
+        public const int GL_MAP1_GRID_DOMAIN = 0x0DD0;
+        public const int GL_MAP1_GRID_SEGMENTS = 0x0DD1;
+        public const int GL_MAP2_GRID_DOMAIN = 0x0DD2;
+        public const int GL_MAP2_GRID_SEGMENTS = 0x0DD3;
+        public const int GL_COEFF = 0x0A00;
+        public const int GL_ORDER = 0x0A01;
+        public const int GL_DOMAIN = 0x0A02;
+        public const int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50;
+        public const int GL_POINT_SMOOTH_HINT = 0x0C51;
+        public const int GL_LINE_SMOOTH_HINT = 0x0C52;
+        public const int GL_POLYGON_SMOOTH_HINT = 0x0C53;
+        public const int GL_FOG_HINT = 0x0C54;
+        public const int GL_DONT_CARE = 0x1100;
+        public const int GL_FASTEST = 0x1101;
+        public const int GL_NICEST = 0x1102;
+        public const int GL_SCISSOR_BOX = 0x0C10;
+        public const int GL_SCISSOR_TEST = 0x0C11;
+        public const int GL_MAP_COLOR = 0x0D10;
+        public const int GL_MAP_STENCIL = 0x0D11;
+        public const int GL_INDEX_SHIFT = 0x0D12;
+        public const int GL_INDEX_OFFSET = 0x0D13;
+        public const int GL_RED_SCALE = 0x0D14;
+        public const int GL_RED_BIAS = 0x0D15;
+        public const int GL_GREEN_SCALE = 0x0D18;
+        public const int GL_GREEN_BIAS = 0x0D19;
+        public const int GL_BLUE_SCALE = 0x0D1A;
+        public const int GL_BLUE_BIAS = 0x0D1B;
+        public const int GL_ALPHA_SCALE = 0x0D1C;
+        public const int GL_ALPHA_BIAS = 0x0D1D;
+        public const int GL_DEPTH_SCALE = 0x0D1E;
+        public const int GL_DEPTH_BIAS = 0x0D1F;
+        public const int GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1;
+        public const int GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0;
+        public const int GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2;
+        public const int GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3;
+        public const int GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4;
+        public const int GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5;
+        public const int GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6;
+        public const int GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7;
+        public const int GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8;
+        public const int GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9;
+        public const int GL_PIXEL_MAP_S_TO_S = 0x0C71;
+        public const int GL_PIXEL_MAP_I_TO_I = 0x0C70;
+        public const int GL_PIXEL_MAP_I_TO_R = 0x0C72;
+        public const int GL_PIXEL_MAP_I_TO_G = 0x0C73;
+        public const int GL_PIXEL_MAP_I_TO_B = 0x0C74;
+        public const int GL_PIXEL_MAP_I_TO_A = 0x0C75;
+        public const int GL_PIXEL_MAP_R_TO_R = 0x0C76;
+        public const int GL_PIXEL_MAP_G_TO_G = 0x0C77;
+        public const int GL_PIXEL_MAP_B_TO_B = 0x0C78;
+        public const int GL_PIXEL_MAP_A_TO_A = 0x0C79;
+        public const int GL_PACK_ALIGNMENT = 0x0D05;
+        public const int GL_PACK_LSB_FIRST = 0x0D01;
+        public const int GL_PACK_ROW_LENGTH = 0x0D02;
+        public const int GL_PACK_SKIP_PIXELS = 0x0D04;
+        public const int GL_PACK_SKIP_ROWS = 0x0D03;
+        public const int GL_PACK_SWAP_BYTES = 0x0D00;
+        public const int GL_UNPACK_ALIGNMENT = 0x0CF5;
+        public const int GL_UNPACK_LSB_FIRST = 0x0CF1;
+        public const int GL_UNPACK_ROW_LENGTH = 0x0CF2;
+        public const int GL_UNPACK_SKIP_PIXELS = 0x0CF4;
+        public const int GL_UNPACK_SKIP_ROWS = 0x0CF3;
+        public const int GL_UNPACK_SWAP_BYTES = 0x0CF0;
+        public const int GL_ZOOM_X = 0x0D16;
+        public const int GL_ZOOM_Y = 0x0D17;
+        public const int GL_TEXTURE_ENV = 0x2300;
+        public const int GL_TEXTURE_ENV_MODE = 0x2200;
+        public const int GL_TEXTURE_1D = 0x0DE0;
+        public const int GL_TEXTURE_2D = 0x0DE1;
+        public const int GL_TEXTURE_WRAP_S = 0x2802;
+        public const int GL_TEXTURE_WRAP_T = 0x2803;
+        public const int GL_TEXTURE_MAG_FILTER = 0x2800;
+        public const int GL_TEXTURE_MIN_FILTER = 0x2801;
+        public const int GL_TEXTURE_ENV_COLOR = 0x2201;
+        public const int GL_TEXTURE_GEN_S = 0x0C60;
+        public const int GL_TEXTURE_GEN_T = 0x0C61;
+        public const int GL_TEXTURE_GEN_R = 0x0C62;
+        public const int GL_TEXTURE_GEN_Q = 0x0C63;
+        public const int GL_TEXTURE_GEN_MODE = 0x2500;
+        public const int GL_TEXTURE_BORDER_COLOR = 0x1004;
+        public const int GL_TEXTURE_WIDTH = 0x1000;
+        public const int GL_TEXTURE_HEIGHT = 0x1001;
+        public const int GL_TEXTURE_BORDER = 0x1005;
+        public const int GL_TEXTURE_COMPONENTS = 0x1003;
+        public const int GL_TEXTURE_RED_SIZE = 0x805C;
+        public const int GL_TEXTURE_GREEN_SIZE = 0x805D;
+        public const int GL_TEXTURE_BLUE_SIZE = 0x805E;
+        public const int GL_TEXTURE_ALPHA_SIZE = 0x805F;
+        public const int GL_TEXTURE_LUMINANCE_SIZE = 0x8060;
+        public const int GL_TEXTURE_INTENSITY_SIZE = 0x8061;
+        public const int GL_NEAREST_MIPMAP_NEAREST = 0x2700;
+        public const int GL_NEAREST_MIPMAP_LINEAR = 0x2702;
+        public const int GL_LINEAR_MIPMAP_NEAREST = 0x2701;
+        public const int GL_LINEAR_MIPMAP_LINEAR = 0x2703;
+        public const int GL_OBJECT_LINEAR = 0x2401;
+        public const int GL_OBJECT_PLANE = 0x2501;
+        public const int GL_EYE_LINEAR = 0x2400;
+        public const int GL_EYE_PLANE = 0x2502;
+        public const int GL_SPHERE_MAP = 0x2402;
+        public const int GL_DECAL = 0x2101;
+        public const int GL_MODULATE = 0x2100;
+        public const int GL_NEAREST = 0x2600;
+        public const int GL_REPEAT = 0x2901;
+        public const int GL_CLAMP = 0x2900;
+        public const int GL_S = 0x2000;
+        public const int GL_T = 0x2001;
+        public const int GL_R = 0x2002;
+        public const int GL_Q = 0x2003;
+        public const int GL_VENDOR = 0x1F00;
+        public const int GL_RENDERER = 0x1F01;
+        public const int GL_VERSION = 0x1F02;
+        public const int GL_EXTENSIONS = 0x1F03;
+        public const int GL_INVALID_ENUM = 0x0500;
+        public const int GL_INVALID_VALUE = 0x0501;
+        public const int GL_INVALID_OPERATION = 0x0502;
+        public const int GL_STACK_OVERFLOW = 0x0503;
+        public const int GL_STACK_UNDERFLOW = 0x0504;
+        public const int GL_OUT_OF_MEMORY = 0x0505;
+        public const int GL_CURRENT_BIT = 0x00000001;
+        public const int GL_POINT_BIT = 0x00000002;
+        public const int GL_LINE_BIT = 0x00000004;
+        public const int GL_POLYGON_BIT = 0x00000008;
+        public const int GL_POLYGON_STIPPLE_BIT = 0x00000010;
+        public const int GL_PIXEL_MODE_BIT = 0x00000020;
+        public const int GL_LIGHTING_BIT = 0x00000040;
+        public const int GL_FOG_BIT = 0x00000080;
+        public const int GL_DEPTH_BUFFER_BIT = 0x00000100;
+        public const int GL_ACCUM_BUFFER_BIT = 0x00000200;
+        public const int GL_STENCIL_BUFFER_BIT = 0x00000400;
+        public const int GL_VIEWPORT_BIT = 0x00000800;
+        public const int GL_TRANSFORM_BIT = 0x00001000;
+        public const int GL_ENABLE_BIT = 0x00002000;
+        public const int GL_COLOR_BUFFER_BIT = 0x00004000;
+        public const int GL_HINT_BIT = 0x00008000;
+        public const int GL_EVAL_BIT = 0x00010000;
+        public const int GL_LIST_BIT = 0x00020000;
+        public const int GL_TEXTURE_BIT = 0x00040000;
+        public const int GL_SCISSOR_BIT = 0x00080000;
+        public const int GL_ALL_ATTRIB_BITS = -1;
+        public const int GL_PROXY_TEXTURE_1D = 0x8063;
+        public const int GL_PROXY_TEXTURE_2D = 0x8064;
+        public const int GL_TEXTURE_PRIORITY = 0x8066;
+        public const int GL_TEXTURE_RESIDENT = 0x8067;
+        public const int GL_TEXTURE_BINDING_1D = 0x8068;
+        public const int GL_TEXTURE_BINDING_2D = 0x8069;
+        public const int GL_TEXTURE_INTERNAL_FORMAT = 0x1003;
+        public const int GL_ALPHA4 = 0x803B;
+        public const int GL_ALPHA8 = 0x803C;
+        public const int GL_ALPHA12 = 0x803D;
+        public const int GL_ALPHA16 = 0x803E;
+        public const int GL_LUMINANCE4 = 0x803F;
+        public const int GL_LUMINANCE8 = 0x8040;
+        public const int GL_LUMINANCE12 = 0x8041;
+        public const int GL_LUMINANCE16 = 0x8042;
+        public const int GL_LUMINANCE4_ALPHA4 = 0x8043;
+        public const int GL_LUMINANCE6_ALPHA2 = 0x8044;
+        public const int GL_LUMINANCE8_ALPHA8 = 0x8045;
+        public const int GL_LUMINANCE12_ALPHA4 = 0x8046;
+        public const int GL_LUMINANCE12_ALPHA12 = 0x8047;
+        public const int GL_LUMINANCE16_ALPHA16 = 0x8048;
+        public const int GL_INTENSITY = 0x8049;
+        public const int GL_INTENSITY4 = 0x804A;
+        public const int GL_INTENSITY8 = 0x804B;
+        public const int GL_INTENSITY12 = 0x804C;
+        public const int GL_INTENSITY16 = 0x804D;
+        public const int GL_R3_G3_B2 = 0x2A10;
+        public const int GL_RGB4 = 0x804F;
+        public const int GL_RGB5 = 0x8050;
+        public const int GL_RGB8 = 0x8051;
+        public const int GL_RGB10 = 0x8052;
+        public const int GL_RGB12 = 0x8053;
+        public const int GL_RGB16 = 0x8054;
+        public const int GL_RGBA2 = 0x8055;
+        public const int GL_RGBA4 = 0x8056;
+        public const int GL_RGB5_A1 = 0x8057;
+        public const int GL_RGBA8 = 0x8058;
+        public const int GL_RGB10_A2 = 0x8059;
+        public const int GL_RGBA12 = 0x805A;
+        public const int GL_RGBA16 = 0x805B;
+        public const int GL_CLIENT_PIXEL_STORE_BIT = 0x00000001;
+        public const int GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002;
+        public const int GL_ALL_CLIENT_ATTRIB_BITS = -1;
+        public const int GL_CLIENT_ALL_ATTRIB_BITS = -1;
+        public const int GL_RESCALE_NORMAL = 0x803A;
+        public const int GL_CLAMP_TO_EDGE = 0x812F;
+        public const int GL_MAX_ELEMENTS_VERTICES = 0x80E8;
+        public const int GL_MAX_ELEMENTS_INDICES = 0x80E9;
+        public const int GL_BGR = 0x80E0;
+        public const int GL_BGRA = 0x80E1;
+        public const int GL_UNSIGNED_BYTE_3_3_2 = 0x8032;
+        public const int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362;
+        public const int GL_UNSIGNED_SHORT_5_6_5 = 0x8363;
+        public const int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364;
+        public const int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033;
+        public const int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365;
+        public const int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034;
+        public const int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366;
+        public const int GL_UNSIGNED_INT_8_8_8_8 = 0x8035;
+        public const int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367;
+        public const int GL_UNSIGNED_INT_10_10_10_2 = 0x8036;
+        public const int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368;
+        public const int GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8;
+        public const int GL_SINGLE_COLOR = 0x81F9;
+        public const int GL_SEPARATE_SPECULAR_COLOR = 0x81FA;
+        public const int GL_TEXTURE_MIN_LOD = 0x813A;
+        public const int GL_TEXTURE_MAX_LOD = 0x813B;
+        public const int GL_TEXTURE_BASE_LEVEL = 0x813C;
+        public const int GL_TEXTURE_MAX_LEVEL = 0x813D;
+        public const int GL_SMOOTH_POINT_SIZE_RANGE = 0x0B12;
+        public const int GL_SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13;
+        public const int GL_SMOOTH_LINE_WIDTH_RANGE = 0x0B22;
+        public const int GL_SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23;
+        public const int GL_ALIASED_POINT_SIZE_RANGE = 0x846D;
+        public const int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E;
+        public const int GL_PACK_SKIP_IMAGES = 0x806B;
+        public const int GL_PACK_IMAGE_HEIGHT = 0x806C;
+        public const int GL_UNPACK_SKIP_IMAGES = 0x806D;
+        public const int GL_UNPACK_IMAGE_HEIGHT = 0x806E;
+        public const int GL_TEXTURE_3D = 0x806F;
+        public const int GL_PROXY_TEXTURE_3D = 0x8070;
+        public const int GL_TEXTURE_DEPTH = 0x8071;
+        public const int GL_TEXTURE_WRAP_R = 0x8072;
+        public const int GL_MAX_3D_TEXTURE_SIZE = 0x8073;
+        public const int GL_TEXTURE_BINDING_3D = 0x806A;
+        public const int GL_CONSTANT_COLOR = 0x8001;
+        public const int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002;
+        public const int GL_CONSTANT_ALPHA = 0x8003;
+        public const int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004;
+        public const int GL_COLOR_TABLE = 0x80D0;
+        public const int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1;
+        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2;
+        public const int GL_PROXY_COLOR_TABLE = 0x80D3;
+        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4;
+        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5;
+        public const int GL_COLOR_TABLE_SCALE = 0x80D6;
+        public const int GL_COLOR_TABLE_BIAS = 0x80D7;
+        public const int GL_COLOR_TABLE_FORMAT = 0x80D8;
+        public const int GL_COLOR_TABLE_WIDTH = 0x80D9;
+        public const int GL_COLOR_TABLE_RED_SIZE = 0x80DA;
+        public const int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB;
+        public const int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC;
+        public const int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD;
+        public const int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE;
+        public const int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF;
+        public const int GL_CONVOLUTION_1D = 0x8010;
+        public const int GL_CONVOLUTION_2D = 0x8011;
+        public const int GL_SEPARABLE_2D = 0x8012;
+        public const int GL_CONVOLUTION_BORDER_MODE = 0x8013;
+        public const int GL_CONVOLUTION_FILTER_SCALE = 0x8014;
+        public const int GL_CONVOLUTION_FILTER_BIAS = 0x8015;
+        public const int GL_REDUCE = 0x8016;
+        public const int GL_CONVOLUTION_FORMAT = 0x8017;
+        public const int GL_CONVOLUTION_WIDTH = 0x8018;
+        public const int GL_CONVOLUTION_HEIGHT = 0x8019;
+        public const int GL_MAX_CONVOLUTION_WIDTH = 0x801A;
+        public const int GL_MAX_CONVOLUTION_HEIGHT = 0x801B;
+        public const int GL_POST_CONVOLUTION_RED_SCALE = 0x801C;
+        public const int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D;
+        public const int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E;
+        public const int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F;
+        public const int GL_POST_CONVOLUTION_RED_BIAS = 0x8020;
+        public const int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021;
+        public const int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022;
+        public const int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023;
+        public const int GL_CONSTANT_BORDER = 0x8151;
+        public const int GL_REPLICATE_BORDER = 0x8153;
+        public const int GL_CONVOLUTION_BORDER_COLOR = 0x8154;
+        public const int GL_COLOR_MATRIX = 0x80B1;
+        public const int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2;
+        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3;
+        public const int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4;
+        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5;
+        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6;
+        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7;
+        public const int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8;
+        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9;
+        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA;
+        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB;
+        public const int GL_HISTOGRAM = 0x8024;
+        public const int GL_PROXY_HISTOGRAM = 0x8025;
+        public const int GL_HISTOGRAM_WIDTH = 0x8026;
+        public const int GL_HISTOGRAM_FORMAT = 0x8027;
+        public const int GL_HISTOGRAM_RED_SIZE = 0x8028;
+        public const int GL_HISTOGRAM_GREEN_SIZE = 0x8029;
+        public const int GL_HISTOGRAM_BLUE_SIZE = 0x802A;
+        public const int GL_HISTOGRAM_ALPHA_SIZE = 0x802B;
+        public const int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C;
+        public const int GL_HISTOGRAM_SINK = 0x802D;
+        public const int GL_MINMAX = 0x802E;
+        public const int GL_MINMAX_FORMAT = 0x802F;
+        public const int GL_MINMAX_SINK = 0x8030;
+        public const int GL_TABLE_TOO_LARGE = 0x8031;
+        public const int GL_BLEND_EQUATION = 0x8009;
+        public const int GL_MIN = 0x8007;
+        public const int GL_MAX = 0x8008;
+        public const int GL_FUNC_ADD = 0x8006;
+        public const int GL_FUNC_SUBTRACT = 0x800A;
+        public const int GL_FUNC_REVERSE_SUBTRACT = 0x800B;
+        public const int GL_BLEND_COLOR = 0x8005;
+        public const int GL_TEXTURE0 = 0x84C0;
+        public const int GL_TEXTURE1 = 0x84C1;
+        public const int GL_TEXTURE2 = 0x84C2;
+        public const int GL_TEXTURE3 = 0x84C3;
+        public const int GL_TEXTURE4 = 0x84C4;
+        public const int GL_TEXTURE5 = 0x84C5;
+        public const int GL_TEXTURE6 = 0x84C6;
+        public const int GL_TEXTURE7 = 0x84C7;
+        public const int GL_TEXTURE8 = 0x84C8;
+        public const int GL_TEXTURE9 = 0x84C9;
+        public const int GL_TEXTURE10 = 0x84CA;
+        public const int GL_TEXTURE11 = 0x84CB;
+        public const int GL_TEXTURE12 = 0x84CC;
+        public const int GL_TEXTURE13 = 0x84CD;
+        public const int GL_TEXTURE14 = 0x84CE;
+        public const int GL_TEXTURE15 = 0x84CF;
+        public const int GL_TEXTURE16 = 0x84D0;
+        public const int GL_TEXTURE17 = 0x84D1;
+        public const int GL_TEXTURE18 = 0x84D2;
+        public const int GL_TEXTURE19 = 0x84D3;
+        public const int GL_TEXTURE20 = 0x84D4;
+        public const int GL_TEXTURE21 = 0x84D5;
+        public const int GL_TEXTURE22 = 0x84D6;
+        public const int GL_TEXTURE23 = 0x84D7;
+        public const int GL_TEXTURE24 = 0x84D8;
+        public const int GL_TEXTURE25 = 0x84D9;
+        public const int GL_TEXTURE26 = 0x84DA;
+        public const int GL_TEXTURE27 = 0x84DB;
+        public const int GL_TEXTURE28 = 0x84DC;
+        public const int GL_TEXTURE29 = 0x84DD;
+        public const int GL_TEXTURE30 = 0x84DE;
+        public const int GL_TEXTURE31 = 0x84DF;
+        public const int GL_ACTIVE_TEXTURE = 0x84E0;
+        public const int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1;
+        public const int GL_MAX_TEXTURE_UNITS = 0x84E2;
+        public const int GL_NORMAL_MAP = 0x8511;
+        public const int GL_REFLECTION_MAP = 0x8512;
+        public const int GL_TEXTURE_CUBE_MAP = 0x8513;
+        public const int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514;
+        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515;
+        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516;
+        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517;
+        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518;
+        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519;
+        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A;
+        public const int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B;
+        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C;
+        public const int GL_COMPRESSED_ALPHA = 0x84E9;
+        public const int GL_COMPRESSED_LUMINANCE = 0x84EA;
+        public const int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB;
+        public const int GL_COMPRESSED_INTENSITY = 0x84EC;
+        public const int GL_COMPRESSED_RGB = 0x84ED;
+        public const int GL_COMPRESSED_RGBA = 0x84EE;
+        public const int GL_TEXTURE_COMPRESSION_HINT = 0x84EF;
+        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0;
+        public const int GL_TEXTURE_COMPRESSED = 0x86A1;
+        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2;
+        public const int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3;
+        public const int GL_MULTISAMPLE = 0x809D;
+        public const int GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
+        public const int GL_SAMPLE_ALPHA_TO_ONE = 0x809F;
+        public const int GL_SAMPLE_COVERAGE = 0x80A0;
+        public const int GL_SAMPLE_BUFFERS = 0x80A8;
+        public const int GL_SAMPLES = 0x80A9;
+        public const int GL_SAMPLE_COVERAGE_VALUE = 0x80AA;
+        public const int GL_SAMPLE_COVERAGE_INVERT = 0x80AB;
+        public const int GL_MULTISAMPLE_BIT = 0x20000000;
+        public const int GL_TRANSPOSE_MODELVIEW_MATRIX = 0x84E3;
+        public const int GL_TRANSPOSE_PROJECTION_MATRIX = 0x84E4;
+        public const int GL_TRANSPOSE_TEXTURE_MATRIX = 0x84E5;
+        public const int GL_TRANSPOSE_COLOR_MATRIX = 0x84E6;
+        public const int GL_COMBINE = 0x8570;
+        public const int GL_COMBINE_RGB = 0x8571;
+        public const int GL_COMBINE_ALPHA = 0x8572;
+        public const int GL_SOURCE0_RGB = 0x8580;
+        public const int GL_SOURCE1_RGB = 0x8581;
+        public const int GL_SOURCE2_RGB = 0x8582;
+        public const int GL_SOURCE0_ALPHA = 0x8588;
+        public const int GL_SOURCE1_ALPHA = 0x8589;
+        public const int GL_SOURCE2_ALPHA = 0x858A;
+        public const int GL_OPERAND0_RGB = 0x8590;
+        public const int GL_OPERAND1_RGB = 0x8591;
+        public const int GL_OPERAND2_RGB = 0x8592;
+        public const int GL_OPERAND0_ALPHA = 0x8598;
+        public const int GL_OPERAND1_ALPHA = 0x8599;
+        public const int GL_OPERAND2_ALPHA = 0x859A;
+        public const int GL_RGB_SCALE = 0x8573;
+        public const int GL_ADD_SIGNED = 0x8574;
+        public const int GL_INTERPOLATE = 0x8575;
+        public const int GL_SUBTRACT = 0x84E7;
+        public const int GL_CONSTANT = 0x8576;
+        public const int GL_PRIMARY_COLOR = 0x8577;
+        public const int GL_PREVIOUS = 0x8578;
+        public const int GL_DOT3_RGB = 0x86AE;
+        public const int GL_DOT3_RGBA = 0x86AF;
+        public const int GL_CLAMP_TO_BORDER = 0x812D;
+        public const int GL_TEXTURE0_ARB = 0x84C0;
+        public const int GL_TEXTURE1_ARB = 0x84C1;
+        public const int GL_TEXTURE2_ARB = 0x84C2;
+        public const int GL_TEXTURE3_ARB = 0x84C3;
+        public const int GL_TEXTURE4_ARB = 0x84C4;
+        public const int GL_TEXTURE5_ARB = 0x84C5;
+        public const int GL_TEXTURE6_ARB = 0x84C6;
+        public const int GL_TEXTURE7_ARB = 0x84C7;
+        public const int GL_TEXTURE8_ARB = 0x84C8;
+        public const int GL_TEXTURE9_ARB = 0x84C9;
+        public const int GL_TEXTURE10_ARB = 0x84CA;
+        public const int GL_TEXTURE11_ARB = 0x84CB;
+        public const int GL_TEXTURE12_ARB = 0x84CC;
+        public const int GL_TEXTURE13_ARB = 0x84CD;
+        public const int GL_TEXTURE14_ARB = 0x84CE;
+        public const int GL_TEXTURE15_ARB = 0x84CF;
+        public const int GL_TEXTURE16_ARB = 0x84D0;
+        public const int GL_TEXTURE17_ARB = 0x84D1;
+        public const int GL_TEXTURE18_ARB = 0x84D2;
+        public const int GL_TEXTURE19_ARB = 0x84D3;
+        public const int GL_TEXTURE20_ARB = 0x84D4;
+        public const int GL_TEXTURE21_ARB = 0x84D5;
+        public const int GL_TEXTURE22_ARB = 0x84D6;
+        public const int GL_TEXTURE23_ARB = 0x84D7;
+        public const int GL_TEXTURE24_ARB = 0x84D8;
+        public const int GL_TEXTURE25_ARB = 0x84D9;
+        public const int GL_TEXTURE26_ARB = 0x84DA;
+        public const int GL_TEXTURE27_ARB = 0x84DB;
+        public const int GL_TEXTURE28_ARB = 0x84DC;
+        public const int GL_TEXTURE29_ARB = 0x84DD;
+        public const int GL_TEXTURE30_ARB = 0x84DE;
+        public const int GL_TEXTURE31_ARB = 0x84DF;
+        public const int GL_ACTIVE_TEXTURE_ARB = 0x84E0;
+        public const int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1;
+        public const int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2;
+        public const int GL_DEPTH_STENCIL_MESA = 0x8750;
+        public const int GL_UNSIGNED_INT_24_8_MESA = 0x8751;
+        public const int GL_UNSIGNED_INT_8_24_REV_MESA = 0x8752;
+        public const int GL_UNSIGNED_SHORT_15_1_MESA = 0x8753;
+        public const int GL_UNSIGNED_SHORT_1_15_REV_MESA = 0x8754;
+        public const int GL_ALPHA_BLEND_EQUATION_ATI = 0x883D;
+
+        
+        // glext.h
+
+        public const int GL_FRAMEBUFFER_BINDING = 0x8CA6;
+    }
+}
diff --git a/src/Avalonia.OpenGL/GlDisplayType.cs b/src/Avalonia.OpenGL/GlDisplayType.cs
new file mode 100644
index 0000000000..2e5178bc37
--- /dev/null
+++ b/src/Avalonia.OpenGL/GlDisplayType.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.OpenGL
+{
+    public enum GlDisplayType
+    {
+        OpenGL2,
+        OpenGLES2
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/GlInterface.cs b/src/Avalonia.OpenGL/GlInterface.cs
new file mode 100644
index 0000000000..60dc5381d4
--- /dev/null
+++ b/src/Avalonia.OpenGL/GlInterface.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.OpenGL
+{
+    public delegate IntPtr GlGetProcAddressDelegate(string procName);
+    
+    public class GlInterface : GlInterfaceBase
+    {
+        private readonly Func<string, bool, IntPtr> _getProcAddress;
+
+        public GlInterface(Func<string, bool, IntPtr> getProcAddress) : base(getProcAddress)
+        {
+            _getProcAddress = getProcAddress;
+        }
+
+        public IntPtr GetProcAddress(string proc) => _getProcAddress(proc, true);
+
+        public T GetProcAddress<T>(string proc) => Marshal.GetDelegateForFunctionPointer<T>(GetProcAddress(proc));
+
+        // ReSharper disable UnassignedGetOnlyAutoProperty
+        
+        public delegate void GlClearStencil(int s);
+        [EntryPoint("glClearStencil")]
+        public GlClearStencil ClearStencil { get; }
+
+        public delegate void GlClearColor(int r, int g, int b, int a);
+        [EntryPoint("glClearColor")]
+        public GlClearColor ClearColor { get; }
+
+        public delegate void GlClear(int bits);
+        [EntryPoint("glClear")]
+        public GlClear Clear { get; }
+
+        public delegate void GlViewport(int x, int y, int width, int height);
+        [EntryPoint("glViewport")]
+        public GlViewport Viewport { get; }
+        
+        [EntryPoint("glFlush")]
+        public Action Flush { get; }
+
+        public delegate void GlGetIntegerv(int name, out int rv);
+        [EntryPoint("glGetIntegerv")]
+        public GlGetIntegerv GetIntegerv { get; }
+
+        // ReSharper restore UnassignedGetOnlyAutoProperty
+    }
+}
diff --git a/src/Avalonia.OpenGL/GlInterfaceBase.cs b/src/Avalonia.OpenGL/GlInterfaceBase.cs
new file mode 100644
index 0000000000..33191a6567
--- /dev/null
+++ b/src/Avalonia.OpenGL/GlInterfaceBase.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.OpenGL
+{
+    public class GlInterfaceBase
+    {
+        public GlInterfaceBase(Func<string, bool, IntPtr> getProcAddress)
+        {
+            foreach (var prop in this.GetType().GetProperties())
+            {
+                var a = prop.GetCustomAttribute<EntryPointAttribute>();
+                if (a != null)
+                {
+                    var fieldName = $"<{prop.Name}>k__BackingField";
+                    var field = prop.DeclaringType.GetField(fieldName,
+                        BindingFlags.Instance | BindingFlags.NonPublic);
+                    if (field == null)
+                        throw new InvalidProgramException($"Expected property {prop.Name} to have {fieldName}");
+                    var proc = getProcAddress(a.EntryPoint, a.Optional);
+                    if (proc != IntPtr.Zero)
+                        field.SetValue(this, Marshal.GetDelegateForFunctionPointer(proc, prop.PropertyType));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/IGlContext.cs b/src/Avalonia.OpenGL/IGlContext.cs
new file mode 100644
index 0000000000..954567fe2e
--- /dev/null
+++ b/src/Avalonia.OpenGL/IGlContext.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.OpenGL
+{
+    public interface IGlContext
+    {
+        IGlDisplay Display { get; }
+        void MakeCurrent(IGlSurface surface);
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/IGlDisplay.cs b/src/Avalonia.OpenGL/IGlDisplay.cs
new file mode 100644
index 0000000000..e7568bd5e7
--- /dev/null
+++ b/src/Avalonia.OpenGL/IGlDisplay.cs
@@ -0,0 +1,11 @@
+namespace Avalonia.OpenGL
+{
+    public interface IGlDisplay
+    {
+        GlDisplayType Type { get; }
+        GlInterface GlInterface { get; }
+        void ClearContext();
+        int SampleCount { get; }
+        int StencilSize { get; }
+    }
+}
diff --git a/src/Avalonia.OpenGL/IGlPlatformSurface.cs b/src/Avalonia.OpenGL/IGlPlatformSurface.cs
new file mode 100644
index 0000000000..22d36b4472
--- /dev/null
+++ b/src/Avalonia.OpenGL/IGlPlatformSurface.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.OpenGL
+{
+    public interface IGlPlatformSurface
+    {
+        IGlPlatformSurfaceRenderTarget CreateGlRenderTarget();
+    }
+}
diff --git a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs
new file mode 100644
index 0000000000..53da93315c
--- /dev/null
+++ b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Avalonia.OpenGL
+{
+    public interface IGlPlatformSurfaceRenderTarget : IDisposable
+    {
+        IGlPlatformSurfaceRenderingSession BeginDraw();
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs
new file mode 100644
index 0000000000..22641d7b53
--- /dev/null
+++ b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.OpenGL
+{
+    public interface IGlPlatformSurfaceRenderingSession : IDisposable
+    {
+        IGlDisplay Display { get; }
+        // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged
+        System.Drawing.Size PixelSize { get; }
+        double Scaling { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/IGlSurface.cs b/src/Avalonia.OpenGL/IGlSurface.cs
new file mode 100644
index 0000000000..499d0a3c90
--- /dev/null
+++ b/src/Avalonia.OpenGL/IGlSurface.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Avalonia.OpenGL
+{
+    public interface IGlSurface : IDisposable
+    {
+        IGlDisplay Display { get; }
+        void SwapBuffers();
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/IWindowingPlatformGlFeature.cs b/src/Avalonia.OpenGL/IWindowingPlatformGlFeature.cs
new file mode 100644
index 0000000000..2c4a8b64b3
--- /dev/null
+++ b/src/Avalonia.OpenGL/IWindowingPlatformGlFeature.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.OpenGL
+{
+    public interface IWindowingPlatformGlFeature
+    {
+        IGlContext ImmediateContext { get; }
+    }
+}
diff --git a/src/Avalonia.OpenGL/OpenGlException.cs b/src/Avalonia.OpenGL/OpenGlException.cs
new file mode 100644
index 0000000000..7ba539a2b2
--- /dev/null
+++ b/src/Avalonia.OpenGL/OpenGlException.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.OpenGL
+{
+    public class OpenGlException : Exception
+    {
+        public OpenGlException(string message) : base(message)
+        {
+
+        }
+    }
+}
diff --git a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
index 3eab54115a..d763febdf3 100644
--- a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
+++ b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
@@ -4,6 +4,7 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 using ReactiveUI;
+using Splat;
 
 namespace Avalonia
 {
@@ -15,6 +16,9 @@ namespace Avalonia
             return builder.AfterSetup(_ =>
             {
                 RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
+                Locator.CurrentMutable.Register(
+                    () => new AvaloniaActivationForViewFetcher(), 
+                    typeof(IActivationForViewFetcher));
             });
         }
     }
diff --git a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
new file mode 100644
index 0000000000..828d8024e6
--- /dev/null
+++ b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
@@ -0,0 +1,38 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Reflection;
+using System.Reactive.Linq;
+using Avalonia;
+using Avalonia.VisualTree;
+using ReactiveUI;
+
+namespace Avalonia
+{
+    public class AvaloniaActivationForViewFetcher : IActivationForViewFetcher
+    {
+        public int GetAffinityForView(Type view)
+        {
+            return typeof(IVisual).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ? 10 : 0;
+        }
+
+        public IObservable<bool> GetActivationForView(IActivatable view)
+        {
+            if (!(view is IVisual visual)) return Observable.Return(false);
+             var viewLoaded = Observable
+                .FromEventPattern<VisualTreeAttachmentEventArgs>(
+                    x => visual.AttachedToVisualTree += x,
+                    x => visual.DetachedFromVisualTree -= x)
+                .Select(args => true);
+             var viewUnloaded = Observable
+                .FromEventPattern<VisualTreeAttachmentEventArgs>(
+                    x => visual.DetachedFromVisualTree += x,
+                    x => visual.DetachedFromVisualTree -= x)
+                .Select(args => false);
+             return viewLoaded
+                .Merge(viewUnloaded)
+                .DistinctUntilChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Styling/Styling/Style.cs b/src/Avalonia.Styling/Styling/Style.cs
index 0d079e97da..23c318a809 100644
--- a/src/Avalonia.Styling/Styling/Style.cs
+++ b/src/Avalonia.Styling/Styling/Style.cs
@@ -125,17 +125,20 @@ namespace Avalonia.Styling
                     
                     var subs = new CompositeDisposable(Setters.Count + Animations.Count);
 
-                    foreach (var animation in Animations)
+                    if (control is Animatable animatable)
                     {
-                        IObservable<bool> obsMatch = match.ObservableResult;
-
-                        if (match.ImmediateResult == true)
+                        foreach (var animation in Animations)
                         {
-                            obsMatch = Observable.Return(true);
-                        } 
+                            IObservable<bool> obsMatch = match.ObservableResult;
 
-                        var sub = animation.Apply((Animatable)control, obsMatch);
-                        subs.Add(sub);
+                            if (match.ImmediateResult == true)
+                            {
+                                obsMatch = Observable.Return(true);
+                            }
+
+                            var sub = animation.Apply(animatable, null, obsMatch);
+                            subs.Add(sub);
+                        } 
                     }
 
                     foreach (var setter in Setters)
diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/MenuItem.xaml
index 8a2ed2a802..07faf7a632 100644
--- a/src/Avalonia.Themes.Default/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/MenuItem.xaml
@@ -73,7 +73,17 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  
+
+  <Style Selector="MenuItem:separator">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Separator Background="{DynamicResource ThemeControlMidBrush}"
+                   Margin="29,1,0,1"
+                   Height="1"/>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
   <Style Selector="Menu > MenuItem">
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Visuals/Animation/RenderLoopClock.cs b/src/Avalonia.Visuals/Animation/RenderLoopClock.cs
new file mode 100644
index 0000000000..504caef461
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/RenderLoopClock.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Rendering;
+
+namespace Avalonia.Animation
+{
+    public class RenderLoopClock : ClockBase, IRenderLoopTask, IGlobalClock
+    {
+        protected override void Stop()
+        {
+            AvaloniaLocator.Current.GetService<IRenderLoop>().Remove(this);
+        }
+
+        bool IRenderLoopTask.NeedsUpdate => HasSubscriptions;
+
+        void IRenderLoopTask.Render()
+        {
+        }
+
+        void IRenderLoopTask.Update(TimeSpan time)
+        {
+            Pulse(time);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/TransformAnimator.cs b/src/Avalonia.Visuals/Animation/TransformAnimator.cs
index 2be1226abe..64b3ebd626 100644
--- a/src/Avalonia.Visuals/Animation/TransformAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/TransformAnimator.cs
@@ -9,10 +9,10 @@ namespace Avalonia.Animation
     /// </summary>
     public class TransformAnimator : Animator<double>
     {
-        DoubleAnimator childKeyFrames;
+        DoubleAnimator childAnimator;
 
         /// <inheritdoc/>
-        public override IDisposable Apply(Animation animation, Animatable control, IObservable<bool> obsMatch, Action onComplete)
+        public override IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> obsMatch, Action onComplete)
         {
             var ctrl = (Visual)control;
 
@@ -36,15 +36,15 @@ namespace Avalonia.Animation
 
                 var renderTransformType = ctrl.RenderTransform.GetType();
 
-                if (childKeyFrames == null)
+                if (childAnimator == null)
                 {
-                    InitializeChildKeyFrames();
+                    InitializeChildAnimator();
                 }
 
                 // It's a transform object so let's target that.
                 if (renderTransformType == Property.OwnerType)
                 {
-                    return childKeyFrames.Apply(animation, ctrl.RenderTransform, obsMatch, onComplete);
+                    return childAnimator.Apply(animation, ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
                 }
                 // It's a TransformGroup and try finding the target there.
                 else if (renderTransformType == typeof(TransformGroup))
@@ -53,7 +53,7 @@ namespace Avalonia.Animation
                     {
                         if (transform.GetType() == Property.OwnerType)
                         {
-                            return childKeyFrames.Apply(animation, transform, obsMatch, onComplete);
+                            return childAnimator.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
                         }
                     }
                 }
@@ -73,16 +73,16 @@ namespace Avalonia.Animation
             return null;
         }
 
-        void InitializeChildKeyFrames()
+        void InitializeChildAnimator()
         {
-            childKeyFrames = new DoubleAnimator();
+            childAnimator = new DoubleAnimator();
 
             foreach (AnimatorKeyFrame keyframe in this)
             {
-                childKeyFrames.Add(keyframe);
+                childAnimator.Add(keyframe);
             }
 
-            childKeyFrames.Property = Property;
+            childAnimator.Property = Property;
         }
 
         /// <inheritdocs/>
diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
index c34752a3ef..c88001cc0a 100644
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Avalonia</RootNamespace>
   </PropertyGroup>
   <ItemGroup> 
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
diff --git a/src/Avalonia.Visuals/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs
index 287ad1b3a2..cdaaa2b4b4 100644
--- a/src/Avalonia.Visuals/Matrix.cs
+++ b/src/Avalonia.Visuals/Matrix.cs
@@ -47,7 +47,7 @@ namespace Avalonia
         /// <summary>
         /// Returns the multiplicative identity matrix.
         /// </summary>
-        public static Matrix Identity => new Matrix(1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
+        public static Matrix Identity { get; } = new Matrix(1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
 
         /// <summary>
         /// Returns whether the matrix is the identity matrix.
diff --git a/src/Avalonia.Visuals/Media/Brush.cs b/src/Avalonia.Visuals/Media/Brush.cs
index eef6e1a43c..c2c041f073 100644
--- a/src/Avalonia.Visuals/Media/Brush.cs
+++ b/src/Avalonia.Visuals/Media/Brush.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Media
     /// Describes how an area is painted.
     /// </summary>
     [TypeConverter(typeof(BrushConverter))]
-    public abstract class Brush : AvaloniaObject, IBrush
+    public abstract class Brush : AvaloniaObject, IMutableBrush
     {
         /// <summary>
         /// Defines the <see cref="Opacity"/> property.
@@ -18,6 +18,9 @@ namespace Avalonia.Media
         public static readonly StyledProperty<double> OpacityProperty =
             AvaloniaProperty.Register<Brush, double>(nameof(Opacity), 1.0);
 
+        /// <inheritdoc/>
+        public event EventHandler Invalidated;
+
         /// <summary>
         /// Gets or sets the opacity of the brush.
         /// </summary>
@@ -50,5 +53,36 @@ namespace Avalonia.Media
 
             throw new FormatException($"Invalid brush string: '{s}'.");
         }
+
+        /// <inheritdoc/>
+        public abstract IBrush ToImmutable();
+
+        /// <summary>
+        /// Marks a property as affecting the brush's visual representation.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a brush's static constructor, any change to the
+        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
+        /// </remarks>
+        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
+            where T : Brush
+        {
+            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(Invalidate);
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
     }
 }
diff --git a/src/Avalonia.Visuals/Media/GradientBrush.cs b/src/Avalonia.Visuals/Media/GradientBrush.cs
index 41c3afc8c3..8fd2dcf27f 100644
--- a/src/Avalonia.Visuals/Media/GradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/GradientBrush.cs
@@ -1,7 +1,11 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Avalonia.Collections;
 using Avalonia.Metadata;
 
 namespace Avalonia.Media
@@ -20,35 +24,74 @@ namespace Avalonia.Media
         /// <summary>
         /// Defines the <see cref="GradientStops"/> property.
         /// </summary>
-        public static readonly StyledProperty<IList<GradientStop>> GradientStopsProperty =
-            AvaloniaProperty.Register<GradientBrush, IList<GradientStop>>(nameof(GradientStops));
+        public static readonly StyledProperty<GradientStops> GradientStopsProperty =
+            AvaloniaProperty.Register<GradientBrush, GradientStops>(nameof(GradientStops));
+
+        private IDisposable _gradientStopsSubscription;
+
+        static GradientBrush()
+        {
+            GradientStopsProperty.Changed.Subscribe(GradientStopsChanged);
+            AffectsRender<LinearGradientBrush>(SpreadMethodProperty);
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GradientBrush"/> class.
         /// </summary>
         public GradientBrush()
         {
-            this.GradientStops = new List<GradientStop>();
+            this.GradientStops = new GradientStops();
         }
 
-        /// <summary>
-        /// Gets or sets the brush's spread method that defines how to draw a gradient that
-        /// doesn't fill the bounds of the destination control.
-        /// </summary>
+        /// <inheritdoc/>
         public GradientSpreadMethod SpreadMethod
         {
             get { return GetValue(SpreadMethodProperty); }
             set { SetValue(SpreadMethodProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets the brush's gradient stops.
-        /// </summary>
+        /// <inheritdoc/>
         [Content]
-        public IList<GradientStop> GradientStops
+        public GradientStops GradientStops
         {
             get { return GetValue(GradientStopsProperty); }
             set { SetValue(GradientStopsProperty, value); }
         }
+
+        /// <inheritdoc/>
+        IReadOnlyList<IGradientStop> IGradientBrush.GradientStops => GradientStops;
+
+        private static void GradientStopsChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is GradientBrush brush)
+            {
+                var oldValue = (GradientStops)e.OldValue;
+                var newValue = (GradientStops)e.NewValue;
+
+                if (oldValue != null)
+                {
+                    oldValue.CollectionChanged -= brush.GradientStopsChanged;
+                    brush._gradientStopsSubscription.Dispose();
+                }
+
+                if (newValue != null)
+                {
+                    newValue.CollectionChanged += brush.GradientStopsChanged;
+                    brush._gradientStopsSubscription = newValue.TrackItemPropertyChanged(brush.GradientStopChanged);
+                }
+
+                brush.RaiseInvalidated(EventArgs.Empty);
+            }
+        }
+
+        private void GradientStopsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            RaiseInvalidated(EventArgs.Empty);
+        }
+
+        private void GradientStopChanged(Tuple<object, PropertyChangedEventArgs> e)
+        {
+            RaiseInvalidated(EventArgs.Empty);
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/GradientStop.cs b/src/Avalonia.Visuals/Media/GradientStop.cs
index 78dd32a18a..00d96a0b3c 100644
--- a/src/Avalonia.Visuals/Media/GradientStop.cs
+++ b/src/Avalonia.Visuals/Media/GradientStop.cs
@@ -4,10 +4,22 @@
 namespace Avalonia.Media
 {
     /// <summary>
-    /// GradientStop
+    /// Describes the location and color of a transition point in a gradient.
     /// </summary>
-    public sealed class GradientStop
+    public sealed class GradientStop : AvaloniaObject, IGradientStop
     {
+        /// <summary>
+        /// Describes the <see cref="Offset"/> property.
+        /// </summary>
+        public static StyledProperty<double> OffsetProperty =
+            AvaloniaProperty.Register<GradientStop, double>(nameof(Offset));
+
+        /// <summary>
+        /// Describes the <see cref="Color"/> property.
+        /// </summary>
+        public static StyledProperty<Color> ColorProperty =
+            AvaloniaProperty.Register<GradientStop, Color>(nameof(Color));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="GradientStop"/> class.
         /// </summary>
@@ -24,16 +36,18 @@ namespace Avalonia.Media
             Offset = offset;
         }
 
-        // TODO: Make these dependency properties.
-
-        /// <summary>
-        /// The offset
-        /// </summary>
-        public double Offset { get; set; }
+        /// <inheritdoc/>
+        public double Offset
+        {
+            get => GetValue(OffsetProperty);
+            set => SetValue(OffsetProperty, value);
+        }
 
-        /// <summary>
-        /// The color
-        /// </summary>
-        public Color Color { get; set; }
+        /// <inheritdoc/>
+        public Color Color
+        {
+            get => GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/GradientStops.cs b/src/Avalonia.Visuals/Media/GradientStops.cs
new file mode 100644
index 0000000000..efc11bacd6
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/GradientStops.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Collections;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A collection of <see cref="GradientStop"/>s.
+    /// </summary>
+    public class GradientStops : AvaloniaList<GradientStop>
+    {
+        public GradientStops()
+        {
+            ResetBehavior = ResetBehavior.Remove;
+        }
+
+        public IReadOnlyList<ImmutableGradientStop> ToImmutable()
+        {
+            return this.Select(x => new ImmutableGradientStop(x.Offset, x.Color)).ToList();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/IAffectsRender.cs b/src/Avalonia.Visuals/Media/IAffectsRender.cs
new file mode 100644
index 0000000000..0024195ce5
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/IAffectsRender.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Signals to a self-rendering control that changes to the resource should invoke
+    /// <see cref="Visual.InvalidateVisual"/>.
+    /// </summary>
+    public interface IAffectsRender
+    {
+        /// <summary>
+        /// Raised when the resource changes visually.
+        /// </summary>
+        event EventHandler Invalidated;
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/IGradientBrush.cs b/src/Avalonia.Visuals/Media/IGradientBrush.cs
index 390ce6ee5b..18db0af660 100644
--- a/src/Avalonia.Visuals/Media/IGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/IGradientBrush.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Media
         /// <summary>
         /// Gets the brush's gradient stops.
         /// </summary>
-        IList<GradientStop> GradientStops { get; }
+        IReadOnlyList<IGradientStop> GradientStops { get; }
 
         /// <summary>
         /// Gets the brush's spread method that defines how to draw a gradient that doesn't fill
@@ -18,4 +18,4 @@ namespace Avalonia.Media
         /// </summary>
         GradientSpreadMethod SpreadMethod { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/IGradientStop.cs b/src/Avalonia.Visuals/Media/IGradientStop.cs
new file mode 100644
index 0000000000..22eb9df60d
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/IGradientStop.cs
@@ -0,0 +1,18 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes the location and color of a transition point in a gradient.
+    /// </summary>
+    public interface IGradientStop
+    {
+        /// <summary>
+        /// Gets the gradient stop color.
+        /// </summary>
+        Color Color { get; }
+
+        /// <summary>
+        /// Gets the gradient stop offset.
+        /// </summary>
+        double Offset { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/IMutableBrush.cs b/src/Avalonia.Visuals/Media/IMutableBrush.cs
index 39dd8b80c4..415db61d68 100644
--- a/src/Avalonia.Visuals/Media/IMutableBrush.cs
+++ b/src/Avalonia.Visuals/Media/IMutableBrush.cs
@@ -1,9 +1,11 @@
-namespace Avalonia.Media
+using System;
+
+namespace Avalonia.Media
 {
     /// <summary>
     /// Represents a mutable brush which can return an immutable clone of itself.
     /// </summary>
-    public interface IMutableBrush : IBrush
+    public interface IMutableBrush : IBrush, IAffectsRender
     {
         /// <summary>
         /// Creates an immutable clone of the brush.
diff --git a/src/Avalonia.Visuals/Media/ImageBrush.cs b/src/Avalonia.Visuals/Media/ImageBrush.cs
index fa491ed3e1..8b42a51d9f 100644
--- a/src/Avalonia.Visuals/Media/ImageBrush.cs
+++ b/src/Avalonia.Visuals/Media/ImageBrush.cs
@@ -2,13 +2,14 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Media.Imaging;
+using Avalonia.Media.Immutable;
 
 namespace Avalonia.Media
 {
     /// <summary>
     /// Paints an area with an <see cref="IBitmap"/>.
     /// </summary>
-    public class ImageBrush : TileBrush, IImageBrush, IMutableBrush
+    public class ImageBrush : TileBrush, IImageBrush
     {
         /// <summary>
         /// Defines the <see cref="Visual"/> property.
@@ -16,6 +17,11 @@ namespace Avalonia.Media
         public static readonly StyledProperty<IBitmap> SourceProperty =
             AvaloniaProperty.Register<ImageBrush, IBitmap>(nameof(Source));
 
+        static ImageBrush()
+        {
+            AffectsRender<ImageBrush>(SourceProperty);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageBrush"/> class.
         /// </summary>
@@ -42,9 +48,9 @@ namespace Avalonia.Media
         }
 
         /// <inheritdoc/>
-        IBrush IMutableBrush.ToImmutable()
+        public override IBrush ToImmutable()
         {
-            return new Immutable.ImmutableImageBrush(this);
+            return new ImmutableImageBrush(this);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs
index 6664a2b30e..1f6e3bbcfd 100644
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Avalonia.Media.Immutable
 {
@@ -15,7 +14,7 @@ namespace Avalonia.Media.Immutable
         /// <param name="opacity">The opacity of the brush.</param>
         /// <param name="spreadMethod">The spread method.</param>
         protected ImmutableGradientBrush(
-            IList<GradientStop> gradientStops,
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
             double opacity,
             GradientSpreadMethod spreadMethod)
         {
@@ -28,14 +27,14 @@ namespace Avalonia.Media.Immutable
         /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
         /// </summary>
         /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        protected ImmutableGradientBrush(IGradientBrush source)
-            : this(source.GradientStops.ToList(), source.Opacity, source.SpreadMethod)
+        protected ImmutableGradientBrush(GradientBrush source)
+            : this(source.GradientStops.ToImmutable(), source.Opacity, source.SpreadMethod)
         {
 
         }
 
         /// <inheritdoc/>
-        public IList<GradientStop> GradientStops { get; }
+        public IReadOnlyList<IGradientStop> GradientStops { get; }
 
         /// <inheritdoc/>
         public double Opacity { get; }
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientStop.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientStop.cs
new file mode 100644
index 0000000000..f3e2e52fd0
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientStop.cs
@@ -0,0 +1,20 @@
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Describes the location and color of a transition point in a gradient.
+    /// </summary>
+    public class ImmutableGradientStop : IGradientStop
+    {
+        public ImmutableGradientStop(double offset, Color color)
+        {
+            Offset = offset;
+            Color = color;
+        }
+
+        /// <inheritdoc/>
+        public double Offset { get; }
+
+        /// <inheritdoc/>
+        public Color Color { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs
index 142eb34625..912d77d763 100644
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Media.Immutable
         /// <param name="startPoint">The start point for the gradient.</param>
         /// <param name="endPoint">The end point for the gradient.</param>
         public ImmutableLinearGradientBrush(
-            IList<GradientStop> gradientStops,
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
             double opacity = 1,
             GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
             RelativePoint? startPoint = null,
@@ -31,7 +31,7 @@ namespace Avalonia.Media.Immutable
         /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
         /// </summary>
         /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableLinearGradientBrush(ILinearGradientBrush source)
+        public ImmutableLinearGradientBrush(LinearGradientBrush source)
             : base(source)
         {
             StartPoint = source.StartPoint;
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs
index f36a1cd2de..e26fbab5f5 100644
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Media.Immutable
         /// The horizontal and vertical radius of the outermost circle of the radial gradient.
         /// </param>
         public ImmutableRadialGradientBrush(
-            IList<GradientStop> gradientStops,
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
             double opacity = 1,
             GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
             RelativePoint? center = null,
@@ -38,7 +38,7 @@ namespace Avalonia.Media.Immutable
         /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
         /// </summary>
         /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableRadialGradientBrush(IRadialGradientBrush source)
+        public ImmutableRadialGradientBrush(RadialGradientBrush source)
             : base(source)
         {
             Center = source.Center;
diff --git a/src/Avalonia.Visuals/Media/LinearGradientBrush.cs b/src/Avalonia.Visuals/Media/LinearGradientBrush.cs
index d092bebf0f..14adc0e0cd 100644
--- a/src/Avalonia.Visuals/Media/LinearGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/LinearGradientBrush.cs
@@ -1,12 +1,14 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Media.Immutable;
+
 namespace Avalonia.Media
 {
     /// <summary>
     /// A brush that draws with a linear gradient.
     /// </summary>
-    public sealed class LinearGradientBrush : GradientBrush, ILinearGradientBrush, IMutableBrush
+    public sealed class LinearGradientBrush : GradientBrush, ILinearGradientBrush
     {
         /// <summary>
         /// Defines the <see cref="StartPoint"/> property.
@@ -24,6 +26,11 @@ namespace Avalonia.Media
                 nameof(EndPoint), 
                 RelativePoint.BottomRight);
 
+        static LinearGradientBrush()
+        {
+            AffectsRender<LinearGradientBrush>(StartPointProperty, EndPointProperty);
+        }
+
         /// <summary>
         /// Gets or sets the start point for the gradient.
         /// </summary>
@@ -43,9 +50,9 @@ namespace Avalonia.Media
         }
 
         /// <inheritdoc/>
-        IBrush IMutableBrush.ToImmutable()
+        public override IBrush ToImmutable()
         {
-            return new Immutable.ImmutableLinearGradientBrush(this);
+            return new ImmutableLinearGradientBrush(this);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
index 656526890a..8852883dcc 100644
--- a/src/Avalonia.Visuals/Media/PathMarkupParser.cs
+++ b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
@@ -107,7 +107,7 @@ namespace Avalonia.Media
             {
                 if(!ReadCommand(ref span, out var command, out var relative))
                 {
-                    return;
+                    break;
                 }
 
                 bool initialCommand = true;
@@ -565,4 +565,4 @@ namespace Avalonia.Media
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs b/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
index 003e2e05f9..589cd83ca1 100644
--- a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
@@ -1,12 +1,14 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Media.Immutable;
+
 namespace Avalonia.Media
 {
     /// <summary>
     /// Paints an area with a radial gradient.
     /// </summary>
-    public sealed class RadialGradientBrush : GradientBrush, IRadialGradientBrush, IMutableBrush
+    public sealed class RadialGradientBrush : GradientBrush, IRadialGradientBrush
     {
         /// <summary>
         /// Defines the <see cref="Center"/> property.
@@ -63,9 +65,9 @@ namespace Avalonia.Media
         }
 
         /// <inheritdoc/>
-        IBrush IMutableBrush.ToImmutable()
+        public override IBrush ToImmutable()
         {
-            return new Immutable.ImmutableRadialGradientBrush(this);
+            return new ImmutableRadialGradientBrush(this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/SolidColorBrush.cs b/src/Avalonia.Visuals/Media/SolidColorBrush.cs
index d84e407cb4..32b87df56b 100644
--- a/src/Avalonia.Visuals/Media/SolidColorBrush.cs
+++ b/src/Avalonia.Visuals/Media/SolidColorBrush.cs
@@ -1,12 +1,14 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Media.Immutable;
+
 namespace Avalonia.Media
 {
     /// <summary>
     /// Fills an area with a solid color.
     /// </summary>
-    public class SolidColorBrush : Brush, ISolidColorBrush, IMutableBrush
+    public class SolidColorBrush : Brush, ISolidColorBrush
     {
         /// <summary>
         /// Defines the <see cref="Color"/> property.
@@ -14,6 +16,11 @@ namespace Avalonia.Media
         public static readonly StyledProperty<Color> ColorProperty =
             AvaloniaProperty.Register<SolidColorBrush, Color>(nameof(Color));
 
+        static SolidColorBrush()
+        {
+            AffectsRender<SolidColorBrush>(ColorProperty);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SolidColorBrush"/> class.
         /// </summary>
@@ -75,9 +82,9 @@ namespace Avalonia.Media
         }
 
         /// <inheritdoc/>
-        IBrush IMutableBrush.ToImmutable()
+        public override IBrush ToImmutable()
         {
-            return new Immutable.ImmutableSolidColorBrush(this);
+            return new ImmutableSolidColorBrush(this);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/TileBrush.cs b/src/Avalonia.Visuals/Media/TileBrush.cs
index 2033754137..47f20fa285 100644
--- a/src/Avalonia.Visuals/Media/TileBrush.cs
+++ b/src/Avalonia.Visuals/Media/TileBrush.cs
@@ -79,6 +79,13 @@ namespace Avalonia.Media
 
         static TileBrush()
         {
+            AffectsRender<TileBrush>(
+                AlignmentXProperty,
+                AlignmentYProperty,
+                DestinationRectProperty,
+                SourceRectProperty,
+                StretchProperty,
+                TileModeProperty);
             RenderOptions.BitmapInterpolationModeProperty.OverrideDefaultValue<TileBrush>(BitmapInterpolationMode.Default);
         }
 
diff --git a/src/Avalonia.Visuals/Media/VisualBrush.cs b/src/Avalonia.Visuals/Media/VisualBrush.cs
index 435f4ba1b1..963ba8f4a1 100644
--- a/src/Avalonia.Visuals/Media/VisualBrush.cs
+++ b/src/Avalonia.Visuals/Media/VisualBrush.cs
@@ -1,6 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Media.Immutable;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Media
@@ -8,7 +9,7 @@ namespace Avalonia.Media
     /// <summary>
     /// Paints an area with an <see cref="IVisual"/>.
     /// </summary>
-    public class VisualBrush : TileBrush, IVisualBrush, IMutableBrush
+    public class VisualBrush : TileBrush, IVisualBrush
     {
         /// <summary>
         /// Defines the <see cref="Visual"/> property.
@@ -16,6 +17,11 @@ namespace Avalonia.Media
         public static readonly StyledProperty<IVisual> VisualProperty =
             AvaloniaProperty.Register<VisualBrush, IVisual>(nameof(Visual));
 
+        static VisualBrush()
+        {
+            AffectsRender<VisualBrush>(VisualProperty);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="VisualBrush"/> class.
         /// </summary>
@@ -42,9 +48,9 @@ namespace Avalonia.Media
         }
 
         /// <inheritdoc/>
-        IBrush IMutableBrush.ToImmutable()
+        public override IBrush ToImmutable()
         {
-            return new Immutable.ImmutableVisualBrush(this);
+            return new ImmutableVisualBrush(this);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/DefaultRenderLoop.cs b/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
similarity index 77%
rename from src/Avalonia.Visuals/Rendering/DefaultRenderLoop.cs
rename to src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
index 9cf849f59b..d0eb181c65 100644
--- a/src/Avalonia.Visuals/Rendering/DefaultRenderLoop.cs
+++ b/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
@@ -2,31 +2,33 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
 using Avalonia.Platform;
 
 namespace Avalonia.Rendering
 {
     /// <summary>
-    /// Defines a default render loop that uses a standard timer.
+    /// Defines a default render timer that uses a standard timer.
     /// </summary>
     /// <remarks>
     /// This class may be overridden by platform implementations to use a specialized timer
     /// implementation.
     /// </remarks>
-    public class DefaultRenderLoop : IRenderLoop
+    public class DefaultRenderTimer : IRenderTimer
     {
         private IRuntimePlatform _runtime;
         private int _subscriberCount;
-        private EventHandler<EventArgs> _tick;
+        private Action<TimeSpan> _tick;
         private IDisposable _subscription;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultRenderLoop"/> class.
+        /// Initializes a new instance of the <see cref="DefaultRenderTimer"/> class.
         /// </summary>
         /// <param name="framesPerSecond">
         /// The number of frames per second at which the loop should run.
         /// </param>
-        public DefaultRenderLoop(int framesPerSecond)
+        public DefaultRenderTimer(int framesPerSecond)
         {
             FramesPerSecond = framesPerSecond;
         }
@@ -37,7 +39,7 @@ namespace Avalonia.Rendering
         public int FramesPerSecond { get; }
 
         /// <inheritdoc/>
-        public event EventHandler<EventArgs> Tick
+        public event Action<TimeSpan> Tick
         {
             add
             {
@@ -76,14 +78,16 @@ namespace Avalonia.Rendering
         /// This can be overridden by platform implementations to use a specialized timer
         /// implementation.
         /// </remarks>
-        protected virtual IDisposable StartCore(Action tick)
+        protected virtual IDisposable StartCore(Action<TimeSpan> tick)
         {
             if (_runtime == null)
             {
                 _runtime = AvaloniaLocator.Current.GetService<IRuntimePlatform>();
             }
 
-            return _runtime.StartSystemTimer(TimeSpan.FromSeconds(1.0 / FramesPerSecond), tick);
+            return _runtime.StartSystemTimer(
+                TimeSpan.FromSeconds(1.0 / FramesPerSecond),
+                () => tick(TimeSpan.FromMilliseconds(Environment.TickCount)));
         }
 
         /// <summary>
@@ -95,9 +99,9 @@ namespace Avalonia.Rendering
             _subscription = null;
         }
 
-        private void InternalTick()
+        private void InternalTick(TimeSpan tickCount)
         {
-            _tick(this, EventArgs.Empty);
+            _tick(tickCount);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index dc1d2933d0..fc67b5c461 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -13,6 +13,7 @@ using Avalonia.Rendering.SceneGraph;
 using Avalonia.Threading;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
+using System.Threading.Tasks;
 
 namespace Avalonia.Rendering
 {
@@ -20,7 +21,7 @@ namespace Avalonia.Rendering
     /// A renderer which renders the state of the visual tree to an intermediate scene graph
     /// representation which is then rendered on a rendering thread.
     /// </summary>
-    public class DeferredRenderer : RendererBase, IRenderer, IVisualBrushRenderer
+    public class DeferredRenderer : RendererBase, IRenderer, IRenderLoopTask, IVisualBrushRenderer
     {
         private readonly IDispatcher _dispatcher;
         private readonly IRenderLoop _renderLoop;
@@ -31,7 +32,6 @@ namespace Avalonia.Rendering
         private volatile IRef<Scene> _scene;
         private DirtyVisuals _dirty;
         private IRef<IRenderTargetBitmapImpl> _overlay;
-        private bool _updateQueued;
         private object _rendering = new object();
         private int _lastSceneId = -1;
         private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects();
@@ -149,7 +149,7 @@ namespace Avalonia.Rendering
         {
             if (!_running && _renderLoop != null)
             {
-                _renderLoop.Tick += OnRenderLoopTick;
+                _renderLoop.Add(this);
                 _running = true;
             }
         }
@@ -159,11 +159,23 @@ namespace Avalonia.Rendering
         {
             if (_running && _renderLoop != null)
             {
-                _renderLoop.Tick -= OnRenderLoopTick;
+                _renderLoop.Remove(this);
                 _running = false;
             }
         }
 
+        bool IRenderLoopTask.NeedsUpdate => _dirty == null || _dirty.Count > 0;
+
+        void IRenderLoopTask.Update(TimeSpan time) => UpdateScene();
+
+        void IRenderLoopTask.Render()
+        {
+            using (var scene = _scene?.Clone())
+            {
+                Render(scene?.Item);
+            }
+        }
+
         /// <inheritdoc/>
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
         {
@@ -381,67 +393,34 @@ namespace Avalonia.Rendering
         private void UpdateScene()
         {
             Dispatcher.UIThread.VerifyAccess();
-
-            try
+            if (_root.IsVisible)
             {
-                if (_root.IsVisible)
-                {
-                    var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root));
-                    var scene = sceneRef.Item;
-
-                    if (_dirty == null)
-                    {
-                        _dirty = new DirtyVisuals();
-                        _sceneBuilder.UpdateAll(scene);
-                    }
-                    else if (_dirty.Count > 0)
-                    {
-                        foreach (var visual in _dirty)
-                        {
-                            _sceneBuilder.Update(scene, visual);
-                        }
-                    }
-
-                    var oldScene = Interlocked.Exchange(ref _scene, sceneRef);
-                    oldScene?.Dispose();
+                var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root));
+                var scene = sceneRef.Item;
 
-                    _dirty.Clear();
-                    (_root as IRenderRoot)?.Invalidate(new Rect(scene.Size));
-                }
-                else
+                if (_dirty == null)
                 {
-                    var oldScene = Interlocked.Exchange(ref _scene, null);
-                    oldScene?.Dispose();
+                    _dirty = new DirtyVisuals();
+                    _sceneBuilder.UpdateAll(scene);
                 }
-            }
-            finally
-            {
-                _updateQueued = false;
-            }
-        }
-
-        private void OnRenderLoopTick(object sender, EventArgs e)
-        {
-            if (Monitor.TryEnter(_rendering))
-            {
-                try
+                else if (_dirty.Count > 0)
                 {
-                    if (!_updateQueued && (_dirty == null || _dirty.Count > 0))
+                    foreach (var visual in _dirty)
                     {
-                        _updateQueued = true;
-                        _dispatcher.Post(UpdateScene, DispatcherPriority.Render);
-                    }
-                    
-                    using (var scene = _scene?.Clone())
-                    {
-                        Render(scene?.Item);
+                        _sceneBuilder.Update(scene, visual);
                     }
                 }
-                catch { }
-                finally
-                {
-                    Monitor.Exit(_rendering);
-                }
+
+                var oldScene = Interlocked.Exchange(ref _scene, sceneRef);
+                oldScene?.Dispose();
+
+                _dirty.Clear();
+                (_root as IRenderRoot)?.Invalidate(new Rect(scene.Size));
+            }
+            else
+            {
+                var oldScene = Interlocked.Exchange(ref _scene, null);
+                oldScene?.Dispose();
             }
         }
 
diff --git a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
new file mode 100644
index 0000000000..7199053b08
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
@@ -0,0 +1,12 @@
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// An interface to allow non-templated controls to customize their hit-testing
+    /// when using a renderer with a simple hit-testing algorithm without a scene graph,
+    /// such as <see cref="ImmediateRenderer" />
+    /// </summary>
+    public interface ICustomSimpleHitTest
+    {
+        bool HitTest(Point point);
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderLoop.cs b/src/Avalonia.Visuals/Rendering/IRenderLoop.cs
index 36d915ddbd..dd7442e7f8 100644
--- a/src/Avalonia.Visuals/Rendering/IRenderLoop.cs
+++ b/src/Avalonia.Visuals/Rendering/IRenderLoop.cs
@@ -1,19 +1,28 @@
-using System;
-
-namespace Avalonia.Rendering
+namespace Avalonia.Rendering
 {
     /// <summary>
-    /// Defines the interface implemented by an application render loop.
+    /// The application render loop.
     /// </summary>
+    /// <remarks>
+    /// The render loop is responsible for advancing the animation timer and updating the scene
+    /// graph for visible windows.
+    /// </remarks>
     public interface IRenderLoop
     {
         /// <summary>
-        /// Raised when the render loop ticks to signal a new frame should be drawn.
+        /// Adds an update task.
         /// </summary>
+        /// <param name="i">The update task.</param>
         /// <remarks>
-        /// This event can be raised on any thread; it is the responsibility of the subscriber to
-        /// switch execution to the right thread.
+        /// Registered update tasks will be polled on each tick of the render loop after the
+        /// animation timer has been pulsed.
         /// </remarks>
-        event EventHandler<EventArgs> Tick;
+        void Add(IRenderLoopTask i);
+
+        /// <summary>
+        /// Removes an update task.
+        /// </summary>
+        /// <param name="i">The update task.</param>
+        void Remove(IRenderLoopTask i);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderLoopTask.cs b/src/Avalonia.Visuals/Rendering/IRenderLoopTask.cs
new file mode 100644
index 0000000000..15f0afc797
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/IRenderLoopTask.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Avalonia.Rendering
+{
+    public interface IRenderLoopTask
+    {
+        bool NeedsUpdate { get; }
+        void Update(TimeSpan time);
+        void Render();
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderTimer.cs b/src/Avalonia.Visuals/Rendering/IRenderTimer.cs
new file mode 100644
index 0000000000..d333e928a0
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/IRenderTimer.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Defines the interface implemented by an application render timer.
+    /// </summary>
+    public interface IRenderTimer
+    {
+        /// <summary>
+        /// Raised when the render timer ticks to signal a new frame should be drawn.
+        /// </summary>
+        /// <remarks>
+        /// This event can be raised on any thread; it is the responsibility of the subscriber to
+        /// switch execution to the right thread.
+        /// </remarks>
+        event Action<TimeSpan> Tick;
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
index fd62c8a59f..d373e7ef2a 100644
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
@@ -200,7 +200,16 @@ namespace Avalonia.Rendering
 
             if (filter?.Invoke(visual) != false)
             {
-                bool containsPoint = visual.TransformedBounds?.Contains(p) == true;
+                bool containsPoint = false;
+
+                if (visual is ICustomSimpleHitTest custom)
+                {
+                    containsPoint = custom.HitTest(p);
+                }
+                else
+                {
+                    containsPoint = visual.TransformedBounds?.Contains(p) == true;
+                }
 
                 if ((containsPoint || !visual.ClipToBounds) && visual.VisualChildren.Count > 0)
                 {
diff --git a/src/Avalonia.Visuals/Rendering/RenderLoop.cs b/src/Avalonia.Visuals/Rendering/RenderLoop.cs
new file mode 100644
index 0000000000..df32d9eec1
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/RenderLoop.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Avalonia.Logging;
+using Avalonia.Threading;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// The application render loop.
+    /// </summary>
+    /// <remarks>
+    /// The render loop is responsible for advancing the animation timer and updating the scene
+    /// graph for visible windows.
+    /// </remarks>
+    public class RenderLoop : IRenderLoop
+    {
+        private readonly IDispatcher _dispatcher;
+        private List<IRenderLoopTask> _items = new List<IRenderLoopTask>();
+        private IRenderTimer _timer;
+        private int _inTick;
+        private int _inUpdate;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RenderLoop"/> class.
+        /// </summary>
+        public RenderLoop()
+        {
+            _dispatcher = Dispatcher.UIThread;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RenderLoop"/> class.
+        /// </summary>
+        /// <param name="timer">The render timer.</param>
+        /// <param name="dispatcher">The UI thread dispatcher.</param>
+        public RenderLoop(IRenderTimer timer, IDispatcher dispatcher)
+        {
+            _timer = timer;
+            _dispatcher = dispatcher;
+        }
+
+        /// <summary>
+        /// Gets the render timer.
+        /// </summary>
+        protected IRenderTimer Timer
+        {
+            get
+            {
+                if (_timer == null)
+                {
+                    _timer = AvaloniaLocator.Current.GetService<IRenderTimer>();
+                }
+
+                return _timer;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Add(IRenderLoopTask i)
+        {
+            Contract.Requires<ArgumentNullException>(i != null);
+            Dispatcher.UIThread.VerifyAccess();
+
+            _items.Add(i);
+
+            if (_items.Count == 1)
+            {
+                Timer.Tick += TimerTick;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Remove(IRenderLoopTask i)
+        {
+            Contract.Requires<ArgumentNullException>(i != null);
+            Dispatcher.UIThread.VerifyAccess();
+
+            _items.Remove(i);
+
+            if (_items.Count == 0)
+            {
+                Timer.Tick -= TimerTick;
+            }
+        }
+
+        private void TimerTick(TimeSpan time)
+        {
+            if (Interlocked.CompareExchange(ref _inTick, 1, 0) == 0)
+            {
+                try
+                {
+                    if (_items.Any(item => item.NeedsUpdate) &&
+                        Interlocked.CompareExchange(ref _inUpdate, 1, 0) == 0)
+                    {
+                        _dispatcher.Post(() =>
+                        {
+                            for (var i = 0; i < _items.Count; ++i)
+                            {
+                                var item = _items[i];
+
+                                if (item.NeedsUpdate)
+                                {
+                                    try
+                                    {
+                                        item.Update(time);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        Logger.Error(LogArea.Visual, this, "Exception in render update: {Error}", ex);
+                                    }
+                                }
+                            }
+
+                            Interlocked.Exchange(ref _inUpdate, 0);
+                        }, DispatcherPriority.Render);
+                    }
+
+                    foreach (var i in _items)
+                    {
+                        i.Render();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(LogArea.Visual, this, "Exception in render loop: {Error}", ex);
+                }
+                finally
+                {
+                    Interlocked.Exchange(ref _inTick, 0);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
index 1ac83e41a5..e5fcf1ba1d 100644
--- a/src/Avalonia.Visuals/Visual.cs
+++ b/src/Avalonia.Visuals/Visual.cs
@@ -338,11 +338,24 @@ namespace Avalonia
         /// FrameworkPropertyMetadata.AffectsRender flag.
         /// </remarks>
         protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : class, IVisual
+            where T : Visual
         {
             void Invalidate(AvaloniaPropertyChangedEventArgs e)
             {
-                (e.Sender as T)?.InvalidateVisual();
+                if (e.Sender is T sender)
+                {
+                    if (e.OldValue is IAffectsRender oldValue)
+                    {
+                        oldValue.Invalidated -= sender.AffectsRenderInvalidated;
+                    }
+
+                    if (e.NewValue is IAffectsRender newValue)
+                    {
+                        newValue.Invalidated += sender.AffectsRenderInvalidated;
+                    }
+
+                    sender.InvalidateVisual();
+                }
             }
 
             foreach (var property in properties)
@@ -544,6 +557,8 @@ namespace Avalonia
             OnVisualParentChanged(old, value);
         }
 
+        private void AffectsRenderInvalidated(object sender, EventArgs e) => InvalidateVisual();
+
         /// <summary>
         /// Called when the <see cref="VisualChildren"/> collection changes.
         /// </summary>
diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
index ef043959ad..aa569a5e6a 100644
--- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
+++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
@@ -9,6 +9,7 @@
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\Avalonia.OpenGL\Avalonia.OpenGL.csproj" />
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Gtk/Avalonia.Gtk3/ClipboardImpl.cs b/src/Gtk/Avalonia.Gtk3/ClipboardImpl.cs
index a3e7590cf5..a860673732 100644
--- a/src/Gtk/Avalonia.Gtk3/ClipboardImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/ClipboardImpl.cs
@@ -3,6 +3,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Gtk3.Interop;
 using Avalonia.Input.Platform;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Gtk3
 {
diff --git a/src/Gtk/Avalonia.Gtk3/CursorFactory.cs b/src/Gtk/Avalonia.Gtk3/CursorFactory.cs
index d6a3c1f260..a28b1cbb1a 100644
--- a/src/Gtk/Avalonia.Gtk3/CursorFactory.cs
+++ b/src/Gtk/Avalonia.Gtk3/CursorFactory.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Gtk3.Interop;
 using Avalonia.Input;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 using CursorType = Avalonia.Gtk3.GdkCursorType;
 namespace Avalonia.Gtk3
 {
diff --git a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
index ca8a1ad3a4..e2e8a34676 100644
--- a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
+++ b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
@@ -7,7 +7,9 @@ using Avalonia.Gtk3;
 using Avalonia.Gtk3.Interop;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.OpenGL;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 using Avalonia.Rendering;
 using Avalonia.Threading;
 
@@ -22,8 +24,33 @@ namespace Avalonia.Gtk3
         internal static string DisplayClassName;
         public static bool UseDeferredRendering = true;
         private static bool s_gtkInitialized;
-        public static void Initialize()
+
+        static bool EnvOption(string option, bool def, bool? specified)
+        {
+            bool? Parse(string env)
+            {
+                var v = Environment.GetEnvironmentVariable("AVALONIA_GTK3_" + env);
+                if (v == null)
+                    return null;
+                if (v.ToLowerInvariant() == "false" || v == "0")
+                    return false;
+                return true;
+            }
+
+            var overridden = Parse(option + "_OVERRIDE");
+            if (overridden.HasValue)
+                return overridden.Value;
+            if (specified.HasValue)
+                return specified.Value;
+            var envValue = Parse(option);
+            return envValue ?? def;
+        }
+        
+        public static void Initialize(Gtk3PlatformOptions options)
         {
+            Resolver.Custom = options.CustomResolver;
+            UseDeferredRendering = EnvOption("USE_DEFERRED_RENDERING", true, options.UseDeferredRendering);
+            var useGpu = EnvOption("USE_GPU", false, options.UseGpuAcceleration);
             if (!s_gtkInitialized)
             {
                 try
@@ -52,9 +79,11 @@ namespace Avalonia.Gtk3
                 .Bind<IPlatformSettings>().ToConstant(Instance)
                 .Bind<IPlatformThreadingInterface>().ToConstant(Instance)
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialog>()
-                .Bind<IRenderLoop>().ToConstant(new DefaultRenderLoop(60))
+                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
+                .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
                 .Bind<IPlatformIconLoader>().ToConstant(new PlatformIconLoader());
-
+            if (useGpu)
+                EglGlPlatformFeature.TryInitialize();
         }
 
         public IWindowImpl CreateWindow() => new WindowImpl();
@@ -115,18 +144,24 @@ namespace Avalonia.Gtk3
 
         public bool CurrentThreadIsLoopThread => s_tlsMarker;
     }
+
+    public class Gtk3PlatformOptions
+    {
+        public bool? UseDeferredRendering { get; set; }
+        public bool? UseGpuAcceleration { get; set; }
+        public ICustomGtk3NativeLibraryResolver CustomResolver { get; set; }
+    }
 }
 
 namespace Avalonia
 {
     public static class Gtk3AppBuilderExtensions
     {
-        public static T UseGtk3<T>(this AppBuilderBase<T> builder, bool deferredRendering = true, ICustomGtk3NativeLibraryResolver resolver = null) 
+        public static T UseGtk3<T>(this AppBuilderBase<T> builder, Gtk3PlatformOptions options = null) 
             where T : AppBuilderBase<T>, new()
         {
-            Resolver.Custom = resolver;
-            Gtk3Platform.UseDeferredRendering = deferredRendering;
-            return builder.UseWindowingSubsystem(Gtk3Platform.Initialize, "GTK3");
+            return builder.UseWindowingSubsystem(() => Gtk3Platform.Initialize(options ?? new Gtk3PlatformOptions()),
+                "GTK3");
         }
     }
 }
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/GException.cs b/src/Gtk/Avalonia.Gtk3/Interop/GException.cs
index b0c171089e..5ff6cbe8ed 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/GException.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/GException.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Gtk3.Interop
 {
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index 914d0feafc..98a73a98a9 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
+using Avalonia.Platform.Interop;
 using gdouble = System.Double;
 using gint = System.Int32;
 using gint16 = System.Int16;
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Pixbuf.cs b/src/Gtk/Avalonia.Gtk3/Interop/Pixbuf.cs
index 989a96a4f0..322b9bdfae 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Pixbuf.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Pixbuf.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Gtk3.Interop
 {
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Resolver.cs b/src/Gtk/Avalonia.Gtk3/Interop/Resolver.cs
index 57c8ac7c3a..c39cb9e394 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Resolver.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Resolver.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Gtk3.Interop
 {
@@ -82,7 +83,7 @@ namespace Avalonia.Gtk3.Interop
             }
         }
 
-        static IntPtr LoadDll(IDynLoader  loader, GtkDll dll)
+        static IntPtr LoadDll(IDynamicLibraryLoader  loader, GtkDll dll)
         {
             
             var exceptions = new List<Exception>();
@@ -118,7 +119,7 @@ namespace Avalonia.Gtk3.Interop
 
         public static void Resolve(string basePath = null)
         {
-            var loader = Platform.Value == OperatingSystemType.WinNT ? (IDynLoader)new Win32Loader() : new UnixLoader();
+            var loader = AvaloniaLocator.Current.GetService<IDynamicLibraryLoader>();
 
             var dlls = Enum.GetValues(typeof(GtkDll)).Cast<GtkDll>().ToDictionary(x => x, x => LoadDll(loader, x));
             
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Signal.cs b/src/Gtk/Avalonia.Gtk3/Interop/Signal.cs
index bc55558551..8eaca93152 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Signal.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Signal.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Gtk3.Interop
 {
diff --git a/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs b/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs
index d4bd878d53..5e6615f92d 100644
--- a/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs
+++ b/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs
@@ -7,6 +7,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Gtk3.Interop;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Gtk3
 {
diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index 67ddcf1e5f..0ec4047086 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -7,18 +7,21 @@ using Avalonia.Controls;
 using Avalonia.Gtk3.Interop;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.OpenGL;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 using Avalonia.Rendering;
 using Avalonia.Threading;
 
 namespace Avalonia.Gtk3
 {
-    abstract class WindowBaseImpl : IWindowBaseImpl, IPlatformHandle
+    abstract class WindowBaseImpl : IWindowBaseImpl, IPlatformHandle, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
     {
         public readonly GtkWindow GtkWidget;
         private IInputRoot _inputRoot;
         private readonly GtkImContext _imContext;
         private readonly FramebufferManager _framebuffer;
+        private readonly EglGlPlatformSurface _egl;
         protected readonly List<IDisposable> Disposables = new List<IDisposable>();
         private Size _lastSize;
         private Point _lastPosition;
@@ -36,7 +39,13 @@ namespace Avalonia.Gtk3
         {
             
             GtkWidget = gtkWidget;
-            _framebuffer = new FramebufferManager(this);
+            
+            var glf = AvaloniaLocator.Current.GetService<IWindowingPlatformGlFeature>() as EglGlPlatformFeature;
+            if (glf != null)
+                _egl = new EglGlPlatformSurface((EglDisplay)glf.Display, glf.DeferredContext, this);
+            else
+                _framebuffer = new FramebufferManager(this);
+            
             _imContext = Native.GtkImMulticontextNew();
             Disposables.Add(_imContext);
             Native.GtkWidgetSetEvents(gtkWidget, 0xFFFFFE);
@@ -57,12 +66,15 @@ namespace Avalonia.Gtk3
             Native.GtkWidgetRealize(gtkWidget);
             GdkWindowHandle = this.Handle.Handle;
             _lastSize = ClientSize;
-            if (Gtk3Platform.UseDeferredRendering)
+
+            if (_egl != null)
+                Native.GtkWidgetSetDoubleBuffered(gtkWidget, false);
+            else if (Gtk3Platform.UseDeferredRendering)
             {
                 Native.GtkWidgetSetDoubleBuffered(gtkWidget, false);
                 _gcHandle = GCHandle.Alloc(this);
-                _tickCallback = Native.GtkWidgetAddTickCallback(GtkWidget, PinnedStaticCallback, GCHandle.ToIntPtr(_gcHandle), IntPtr.Zero);
-                
+                _tickCallback = Native.GtkWidgetAddTickCallback(GtkWidget, PinnedStaticCallback,
+                    GCHandle.ToIntPtr(_gcHandle), IntPtr.Zero);
             }
         }
 
@@ -488,7 +500,7 @@ namespace Avalonia.Gtk3
         }
 
         IntPtr IPlatformHandle.Handle => Native.GetNativeGdkWindowHandle(Native.GtkWidgetGetWindow(GtkWidget));
-        public IEnumerable<object> Surfaces => new object[] {Handle, _framebuffer};
+        public IEnumerable<object> Surfaces => new object[] {Handle, _egl, _framebuffer};
 
         public IRenderer CreateRenderer(IRenderRoot root)
         {
@@ -497,5 +509,17 @@ namespace Avalonia.Gtk3
                 ? (IRenderer) new DeferredRenderer(root, loop)
                 : new ImmediateRenderer(root);
         }
+
+        System.Drawing.Size EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.PixelSize
+        {
+            get
+            {
+                var cs = ClientSize;
+                return new System.Drawing.Size((int)Math.Max(1, LastKnownScaleFactor * cs.Width),
+                    (int)Math.Max(1, LastKnownScaleFactor * ClientSize.Height));
+            }
+        }
+        double EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Scaling => LastKnownScaleFactor;
+        IntPtr EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Handle => Handle.Handle;
     }
 }
diff --git a/src/Gtk/Avalonia.Gtk3/WindowImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowImpl.cs
index a0b754c229..34950ca8b8 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowImpl.cs
@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Gtk3.Interop;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Gtk3
 {
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index 810be77b2b..9046c26cee 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -35,7 +35,8 @@ namespace Avalonia.LinuxFramebuffer
                 .Bind<IKeyboardDevice>().ToConstant(KeyboardDevice)
                 .Bind<IPlatformSettings>().ToSingleton<PlatformSettings>()
                 .Bind<IPlatformThreadingInterface>().ToConstant(Threading)
-                .Bind<IRenderLoop>().ToConstant(Threading);
+                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
+                .Bind<IRenderTimer>().ToConstant(Threading);
         }
 
         internal static TopLevel Initialize<T>(T builder, string fbdev = null) where T : AppBuilderBase<T>, new()
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
index 8abbe09592..8e4700d4b2 160000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@@ -1 +1 @@
-Subproject commit 8abbe09592668efb573ac4d5548ba2d7e464ba78
+Subproject commit 8e4700d4b24935ed5400e5e0d6fce96b5b4a317a
diff --git a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
index ba45ad8403..5757413b7a 100644
--- a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
+++ b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
@@ -21,6 +21,7 @@ namespace Avalonia.MonoMac
         private static bool s_monoMacInitialized;
         private static bool s_showInDock = true;
         private static IRenderLoop s_renderLoop;
+        private static IRenderTimer s_renderTimer;
 
         void DoInitialize()
         {
@@ -35,6 +36,7 @@ namespace Avalonia.MonoMac
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsImpl>()
                 .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<IRenderLoop>().ToConstant(s_renderLoop)
+                .Bind<IRenderTimer>().ToConstant(s_renderTimer)
                 .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance)
                 /*.Bind<IPlatformDragSource>().ToTransient<DragSource>()*/;
         }
@@ -83,7 +85,8 @@ namespace Avalonia.MonoMac
             ThreadHelper.InitializeCocoaThreadingLocks();
             App = NSApplication.SharedApplication;
             UpdateActivationPolicy();
-            s_renderLoop = new RenderLoop(); //TODO: use CVDisplayLink
+            s_renderLoop = new RenderLoop();
+            s_renderTimer = new RenderTimer(60); //TODO: use CVDisplayLink
             s_monoMacInitialized = true;
         }
 
@@ -133,4 +136,4 @@ namespace Avalonia
             return builder.UseWindowingSubsystem(MonoMac.MonoMacPlatform.Initialize, "MonoMac");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/OSX/Avalonia.MonoMac/RenderLoop.cs b/src/OSX/Avalonia.MonoMac/RenderLoop.cs
deleted file mode 100644
index 4d1f9b4201..0000000000
--- a/src/OSX/Avalonia.MonoMac/RenderLoop.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using MonoMac.Foundation;
-
-namespace Avalonia.MonoMac
-{
-    //TODO: Switch to using CVDisplayLink
-    public class RenderLoop : IRenderLoop
-    {
-        private readonly object _lock = new object();
-        private readonly IDisposable _timer;
-
-        public RenderLoop()
-        {
-            _timer = AvaloniaLocator.Current.GetService<IRuntimePlatform>().StartSystemTimer(new TimeSpan(0, 0, 0, 0, 1000 / 60),
-                () =>
-                {
-                    lock (_lock)
-                    {
-                        using (new NSAutoreleasePool())
-                        {
-                            Tick?.Invoke(this, EventArgs.Empty);
-                        }
-                    }
-                });
-        }
-
-        public event EventHandler<EventArgs> Tick;
-    }
-}
diff --git a/src/OSX/Avalonia.MonoMac/RenderTimer.cs b/src/OSX/Avalonia.MonoMac/RenderTimer.cs
new file mode 100644
index 0000000000..f3c49828d6
--- /dev/null
+++ b/src/OSX/Avalonia.MonoMac/RenderTimer.cs
@@ -0,0 +1,28 @@
+using System;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using MonoMac.Foundation;
+
+namespace Avalonia.MonoMac
+{
+    //TODO: Switch to using CVDisplayLink
+    public class RenderTimer : DefaultRenderTimer
+    {
+        public RenderTimer(int framesPerSecond) : base(framesPerSecond)
+        {
+        }
+
+        protected override IDisposable StartCore(Action<TimeSpan> tick)
+        {
+            return AvaloniaLocator.Current.GetService<IRuntimePlatform>().StartSystemTimer(
+                TimeSpan.FromSeconds(1.0 / FramesPerSecond),
+                () =>
+                {
+                    using (new NSAutoreleasePool())
+                    {
+                        tick?.Invoke(TimeSpan.FromMilliseconds(Environment.TickCount));
+                    }
+                });
+        }
+    }
+}
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/DynLoader.cs b/src/Shared/PlatformSupport/DynLoader.cs
similarity index 73%
rename from src/Gtk/Avalonia.Gtk3/Interop/DynLoader.cs
rename to src/Shared/PlatformSupport/DynLoader.cs
index 112e00c879..5884558baa 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/DynLoader.cs
+++ b/src/Shared/PlatformSupport/DynLoader.cs
@@ -1,22 +1,12 @@
-using System;
+using System;
 using System.Runtime.InteropServices;
+using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 
-/*
- * Source code imported from https://github.com/kekekeks/evhttp-sharp
- * Source is provided under MIT license for Avalonia project and derived works
- */
-
-
-namespace Avalonia.Gtk3.Interop
+namespace Avalonia.Shared.PlatformSupport
 {
-    internal interface IDynLoader
-    {
-        IntPtr LoadLibrary(string dll);
-        IntPtr GetProcAddress(IntPtr dll, string proc, bool optional);
-
-    }
-
-    class UnixLoader : IDynLoader
+#if !__IOS__
+    class UnixLoader : IDynamicLibraryLoader
     {
         // ReSharper disable InconsistentNaming
         static class LinuxImports
@@ -37,6 +27,7 @@ namespace Avalonia.Gtk3.Interop
                 DlError = dlerror;
             }
         }
+        
         static class OsXImports
         {
             
@@ -86,7 +77,7 @@ namespace Avalonia.Gtk3.Interop
         {
             var handle = DlOpen(dll, 1);
             if (handle == IntPtr.Zero)
-                throw new NativeException(DlErrorString());
+                throw new DynamicLibraryLoaderException(DlErrorString());
             return handle;
         }
 
@@ -94,12 +85,12 @@ namespace Avalonia.Gtk3.Interop
         {
             var ptr = DlSym(dll, proc);
             if (ptr == IntPtr.Zero && !optional)
-                throw new NativeException(DlErrorString());
+                throw new DynamicLibraryLoaderException(DlErrorString());
             return ptr;
         }
     }
 
-    internal class Win32Loader : IDynLoader
+    internal class Win32Loader : IDynamicLibraryLoader
     {
         [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
         private static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
@@ -107,22 +98,37 @@ namespace Avalonia.Gtk3.Interop
         [DllImport("kernel32", EntryPoint = "LoadLibraryW", SetLastError = true, CharSet = CharSet.Unicode)]
         private static extern IntPtr LoadLibrary(string lpszLib);
 
-        IntPtr IDynLoader.LoadLibrary(string dll)
+        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
         {
             var handle = LoadLibrary(dll);
             if (handle != IntPtr.Zero)
                 return handle;
             var err = Marshal.GetLastWin32Error();
 
-            throw new NativeException("Error loading " + dll + " error " + err);
+            throw new DynamicLibraryLoaderException("Error loading " + dll + " error " + err);
         }
 
-        IntPtr IDynLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
+        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
         {
             var ptr = GetProcAddress(dll, proc);
             if (ptr == IntPtr.Zero && !optional)
-                throw new NativeException("Error " + Marshal.GetLastWin32Error());
+                throw new DynamicLibraryLoaderException("Error " + Marshal.GetLastWin32Error());
             return ptr;
         }
     }
+    
+#else
+    internal class IOSLoader : IDynamicLibraryLoader
+    {
+        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
+        {
+            throw new PlatformNotSupportedException();
+        }
+
+        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            throw new PlatformNotSupportedException();
+        }
+    }
+#endif
 }
diff --git a/src/Shared/PlatformSupport/PlatformSupport.projitems b/src/Shared/PlatformSupport/PlatformSupport.projitems
index a9b6a8fa2a..34515a0912 100644
--- a/src/Shared/PlatformSupport/PlatformSupport.projitems
+++ b/src/Shared/PlatformSupport/PlatformSupport.projitems
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)AssetLoader.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DynLoader.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)StandardRuntimePlatform.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)StandardRuntimePlatformServices.cs" />
   </ItemGroup>
diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatformServices.cs b/src/Shared/PlatformSupport/StandardRuntimePlatformServices.cs
index 9ccf097ffd..b34b8f7f5f 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatformServices.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatformServices.cs
@@ -1,5 +1,7 @@
 using System.Reflection;
+using System.Runtime.InteropServices;
 using Avalonia.Platform;
+using Avalonia.Platform.Interop;
 
 namespace Avalonia.Shared.PlatformSupport
 {
@@ -7,9 +9,19 @@ namespace Avalonia.Shared.PlatformSupport
     {
         public static void Register(Assembly assembly = null)
         {
+            var standardPlatform = new StandardRuntimePlatform();
             AvaloniaLocator.CurrentMutable
-                .Bind<IRuntimePlatform>().ToSingleton<StandardRuntimePlatform>()
-                .Bind<IAssetLoader>().ToConstant(new AssetLoader(assembly));
+                .Bind<IRuntimePlatform>().ToConstant(standardPlatform)
+                .Bind<IAssetLoader>().ToConstant(new AssetLoader(assembly))
+                .Bind<IDynamicLibraryLoader>().ToConstant(
+#if __IOS__
+                    new IOSLoader()
+#else
+                    RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                        ? (IDynamicLibraryLoader)new Win32Loader()
+                        : new UnixLoader()
+#endif
+                );
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index 03618e00f5..d125ca0be4 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -12,6 +12,7 @@
     <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\Avalonia.OpenGL\Avalonia.OpenGL.csproj" />
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 685987ae80..f43bddd4d5 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -29,6 +29,7 @@ namespace Avalonia.Skia
         private double _currentOpacity = 1.0f;
         private readonly bool _canTextUseLcdRendering;
         private Matrix _currentTransform;
+        private GRContext _grContext;
 
         /// <summary>
         /// Context create info.
@@ -54,6 +55,11 @@ namespace Avalonia.Skia
             /// Render text without Lcd rendering.
             /// </summary>
             public bool DisableTextLcdRendering;
+
+            /// <summary>
+            /// GPU-accelerated context (optional)
+            /// </summary>
+            public GRContext GrContext;
         }
 
         /// <summary>
@@ -67,7 +73,8 @@ namespace Avalonia.Skia
             _visualBrushRenderer = createInfo.VisualBrushRenderer;
             _disposables = disposables;
             _canTextUseLcdRendering = !createInfo.DisableTextLcdRendering;
-
+            _grContext = createInfo.GrContext;
+            
             Canvas = createInfo.Canvas;
 
             if (Canvas == null)
@@ -615,7 +622,8 @@ namespace Avalonia.Skia
                 Height = height,
                 Dpi = dpi,
                 Format = format,
-                DisableTextLcdRendering = !_canTextUseLcdRendering
+                DisableTextLcdRendering = !_canTextUseLcdRendering,
+                GrContext = _grContext
             };
 
             return new SurfaceRenderTarget(createInfo);
diff --git a/src/Skia/Avalonia.Skia/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/GlRenderTarget.cs
new file mode 100644
index 0000000000..0435e1060a
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/GlRenderTarget.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.OpenGL;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using SkiaSharp;
+using static Avalonia.OpenGL.GlConsts;
+
+namespace Avalonia.Skia
+{
+    public class GlRenderTarget : IRenderTarget
+    {
+        private readonly GRContext _grContext;
+        private IGlPlatformSurfaceRenderTarget _surface;
+
+        public GlRenderTarget(GRContext grContext, IGlPlatformSurface glSurface)
+        {
+            _grContext = grContext;
+            _surface = glSurface.CreateGlRenderTarget();
+        }
+
+        public void Dispose() => _surface.Dispose();
+
+        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+        {
+            var session = _surface.BeginDraw();
+            var disp = session.Display;
+            var gl = disp.GlInterface;
+            gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var fb);
+
+            var size = session.PixelSize;
+            var scaling = session.Scaling;
+
+            GRBackendRenderTargetDesc desc = new GRBackendRenderTargetDesc
+            {
+                Width = size.Width,
+                Height = size.Height,
+                SampleCount = disp.SampleCount,
+                StencilBits = disp.StencilSize,
+                Config = GRPixelConfig.Rgba8888,
+                Origin=GRSurfaceOrigin.BottomLeft,
+                RenderTargetHandle = new IntPtr(fb)
+            };
+
+            gl.Viewport(0, 0, desc.Width, desc.Height);
+            gl.ClearStencil(0);
+            gl.ClearColor(0, 0, 0, 0);
+            gl.Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+            var surface = SKSurface.Create(_grContext, desc);
+
+            var nfo = new DrawingContextImpl.CreateInfo
+            {
+                GrContext = _grContext,
+                Canvas = surface.Canvas,
+                Dpi = SkiaPlatform.DefaultDpi * scaling,
+                VisualBrushRenderer = visualBrushRenderer,
+                DisableTextLcdRendering = true
+            };
+
+            return new DrawingContextImpl(nfo, Disposable.Create(() =>
+            {
+                surface.Canvas.Flush();
+                surface.Dispose();
+                session.Dispose();
+            }));
+        }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index d4e6403dc9..80e2608dbe 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -6,7 +6,9 @@ using System.Collections.Generic;
 using System.IO;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Media;
+using Avalonia.OpenGL;
 using Avalonia.Platform;
+using SkiaSharp;
 
 namespace Avalonia.Skia
 {
@@ -15,6 +17,22 @@ namespace Avalonia.Skia
     /// </summary>
     public class PlatformRenderInterface : IPlatformRenderInterface
     {
+        private GRContext GrContext { get; }
+
+        public PlatformRenderInterface()
+        {
+            var gl = AvaloniaLocator.Current.GetService<IWindowingPlatformGlFeature>();
+            if (gl != null)
+            {
+                var display = gl.ImmediateContext.Display;
+                var iface = display.Type == GlDisplayType.OpenGL2
+                    ? GRGlInterface.AssembleGlInterface((_, proc) => display.GlInterface.GetProcAddress(proc))
+                    : GRGlInterface.AssembleGlesInterface((_, proc) => display.GlInterface.GetProcAddress(proc));
+                gl.ImmediateContext.MakeCurrent(null);
+                GrContext = GRContext.Create(GRBackend.OpenGL, iface);
+            }
+        }
+        
         /// <inheritdoc />
         public IFormattedTextImpl CreateFormattedText(
             string text,
@@ -78,7 +96,8 @@ namespace Avalonia.Skia
                 Width = width,
                 Height = height,
                 Dpi = dpi,
-                DisableTextLcdRendering = false
+                DisableTextLcdRendering = false,
+                GrContext = GrContext
             };
             
             return new SurfaceRenderTarget(createInfo);
@@ -89,6 +108,10 @@ namespace Avalonia.Skia
         {
             foreach (var surface in surfaces)
             {
+                if (surface is IGlPlatformSurface glSurface && GrContext != null)
+                {
+                    return new GlRenderTarget(GrContext, glSurface);
+                }
                 if (surface is IFramebufferPlatformSurface framebufferSurface)
                 {
                     return new FramebufferRenderTarget(framebufferSurface);
@@ -105,4 +128,4 @@ namespace Avalonia.Skia
             return new WriteableBitmapImpl(width, height, format);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
index 88200dcfbe..914dc7d05a 100644
--- a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
@@ -19,6 +19,7 @@ namespace Avalonia.Skia
         private readonly SKSurface _surface;
         private readonly SKCanvas _canvas;
         private readonly bool _disableLcdRendering;
+        private readonly GRContext _grContext;
         
         /// <summary>
         /// Create new surface render target.
@@ -30,8 +31,8 @@ namespace Avalonia.Skia
             PixelHeight = createInfo.Height;
             _dpi = createInfo.Dpi;
             _disableLcdRendering = createInfo.DisableTextLcdRendering;
-
-            _surface = CreateSurface(PixelWidth, PixelHeight, createInfo.Format);
+            _grContext = createInfo.GrContext;
+            _surface = CreateSurface(createInfo.GrContext, PixelWidth, PixelHeight, createInfo.Format);
 
             _canvas = _surface?.Canvas;
 
@@ -48,10 +49,11 @@ namespace Avalonia.Skia
         /// <param name="height">Height.</param>
         /// <param name="format">Format.</param>
         /// <returns></returns>
-        private static SKSurface CreateSurface(int width, int height, PixelFormat? format)
+        private static SKSurface CreateSurface(GRContext gpu, int width, int height, PixelFormat? format)
         {
             var imageInfo = MakeImageInfo(width, height, format);
-
+            if (gpu != null)
+                return SKSurface.Create(gpu, false, imageInfo);
             return SKSurface.Create(imageInfo);
         }
 
@@ -73,7 +75,8 @@ namespace Avalonia.Skia
                 Canvas = _canvas,
                 Dpi = _dpi,
                 VisualBrushRenderer = visualBrushRenderer,
-                DisableTextLcdRendering = _disableLcdRendering
+                DisableTextLcdRendering = _disableLcdRendering,
+                GrContext = _grContext
             };
 
             return new DrawingContextImpl(createInfo);
@@ -164,6 +167,11 @@ namespace Avalonia.Skia
             /// Render text without Lcd rendering.
             /// </summary>
             public bool DisableTextLcdRendering;
+
+            /// <summary>
+            /// GPU-accelerated context (optional)
+            /// </summary>
+            public GRContext GrContext;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
index ab6c399ff4..915aa77b52 100644
--- a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
@@ -126,6 +126,7 @@ namespace Avalonia.Skia
             /// <inheritdoc />
             public void Dispose()
             {
+                _bitmap.NotifyPixelsChanged();
                 _bitmap = null;
             }
             
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 81a70f8311..c330377e20 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -29,15 +29,18 @@ namespace Avalonia.Direct2D1
     {
         private static readonly Direct2D1Platform s_instance = new Direct2D1Platform();
 
-        private static SharpDX.Direct2D1.Factory s_d2D1Factory;
+        public static SharpDX.Direct3D11.Device Direct3D11Device { get; private set; }
 
-        private static SharpDX.DirectWrite.Factory s_dwfactory;
+        public static SharpDX.Direct2D1.Factory1 Direct2D1Factory { get; private set; }
 
-        private static SharpDX.WIC.ImagingFactory s_imagingFactory;
+        public static SharpDX.Direct2D1.Device Direct2D1Device { get; private set; }
 
-        private static SharpDX.DXGI.Device s_dxgiDevice;
+        public static SharpDX.DirectWrite.Factory1 DirectWriteFactory { get; private set; }
+
+        public static SharpDX.WIC.ImagingFactory ImagingFactory { get; private set; }
+
+        public static SharpDX.DXGI.Device1 DxgiDevice { get; private set; }
 
-        private static SharpDX.Direct2D1.Device s_d2D1Device;
 
         private static readonly object s_initLock = new object();
         private static bool s_initialized = false;
@@ -47,13 +50,14 @@ namespace Avalonia.Direct2D1
             lock (s_initLock)
             {
                 if (s_initialized)
+                {
                     return;
+                }
 #if DEBUG
                 try
                 {
-                    s_d2D1Factory =
-
-                        new SharpDX.Direct2D1.Factory1(SharpDX.Direct2D1.FactoryType.MultiThreaded,
+                    Direct2D1Factory = new SharpDX.Direct2D1.Factory1(
+                        SharpDX.Direct2D1.FactoryType.MultiThreaded,
                             SharpDX.Direct2D1.DebugLevel.Error);
                 }
                 catch
@@ -61,12 +65,19 @@ namespace Avalonia.Direct2D1
                     //
                 }
 #endif
-                s_dwfactory = new SharpDX.DirectWrite.Factory();
-                s_imagingFactory = new SharpDX.WIC.ImagingFactory();
-                if (s_d2D1Factory == null)
-                    s_d2D1Factory = new SharpDX.Direct2D1.Factory1(SharpDX.Direct2D1.FactoryType.MultiThreaded,
+                if (Direct2D1Factory == null)
+                {
+                    Direct2D1Factory = new SharpDX.Direct2D1.Factory1(
+                        SharpDX.Direct2D1.FactoryType.MultiThreaded,
                         SharpDX.Direct2D1.DebugLevel.None);
+                }
 
+                using (var factory = new SharpDX.DirectWrite.Factory())
+                {
+                    DirectWriteFactory = factory.QueryInterface<SharpDX.DirectWrite.Factory1>();
+                }
+
+                ImagingFactory = new SharpDX.WIC.ImagingFactory();
 
                 var featureLevels = new[]
                 {
@@ -79,19 +90,15 @@ namespace Avalonia.Direct2D1
                     SharpDX.Direct3D.FeatureLevel.Level_9_1,
                 };
 
-                using (var d3dDevice = new SharpDX.Direct3D11.Device(
+                Direct3D11Device = new SharpDX.Direct3D11.Device(
                     SharpDX.Direct3D.DriverType.Hardware,
-                    SharpDX.Direct3D11.DeviceCreationFlags.BgraSupport |
-                    SharpDX.Direct3D11.DeviceCreationFlags.VideoSupport,
-                    featureLevels))
-                {
-                    s_dxgiDevice = d3dDevice.QueryInterface<SharpDX.DXGI.Device>();
-                }
+                    SharpDX.Direct3D11.DeviceCreationFlags.BgraSupport | SharpDX.Direct3D11.DeviceCreationFlags.VideoSupport,
+                    featureLevels);
+
+                DxgiDevice = Direct3D11Device.QueryInterface<SharpDX.DXGI.Device1>();
+
+                Direct2D1Device = new SharpDX.Direct2D1.Device(Direct2D1Factory, DxgiDevice);
 
-                using (var factory1 = s_d2D1Factory.QueryInterface<SharpDX.Direct2D1.Factory1>())
-                {
-                    s_d2D1Device = new SharpDX.Direct2D1.Device(factory1, s_dxgiDevice);
-                }
                 s_initialized = true;
             }
         }
@@ -99,19 +106,13 @@ namespace Avalonia.Direct2D1
         public static void Initialize()
         {
             InitializeDirect2D();
-            AvaloniaLocator.CurrentMutable
-                        .Bind<IPlatformRenderInterface>().ToConstant(s_instance)
-                        .BindToSelf(s_d2D1Factory)
-                        .BindToSelf(s_dwfactory)
-                        .BindToSelf(s_imagingFactory)
-                        .BindToSelf(s_dxgiDevice)
-                        .BindToSelf(s_d2D1Device);
+            AvaloniaLocator.CurrentMutable.Bind<IPlatformRenderInterface>().ToConstant(s_instance);
             SharpDX.Configuration.EnableReleaseOnFinalizer = true;
         }
 
         public IBitmapImpl CreateBitmap(int width, int height)
         {
-            return new WicBitmapImpl(s_imagingFactory, width, height);
+            return new WicBitmapImpl(width, height);
         }
 
         public IFormattedTextImpl CreateFormattedText(
@@ -138,14 +139,22 @@ namespace Avalonia.Direct2D1
                 if (s is IPlatformHandle nativeWindow)
                 {
                     if (nativeWindow.HandleDescriptor != "HWND")
+                    {
                         throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from " +
                                                         nativeWindow.HandleDescriptor);
+                    }
+
                     return new HwndRenderTarget(nativeWindow);
                 }
                 if (s is IExternalDirect2DRenderTargetSurface external)
-                    return new ExternalRenderTarget(external, s_dwfactory, s_imagingFactory);
+                {
+                    return new ExternalRenderTarget(external);
+                }
+
                 if (s is IFramebufferPlatformSurface fb)
-                    return new FramebufferShimRenderTarget(fb, s_imagingFactory, s_d2D1Factory, s_dwfactory);
+                {
+                    return new FramebufferShimRenderTarget(fb);
+                }
             }
             throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from any of provided surfaces");
         }
@@ -156,19 +165,12 @@ namespace Avalonia.Direct2D1
             double dpiX,
             double dpiY)
         {
-            return new WicRenderTargetBitmapImpl(
-                s_imagingFactory,
-                s_d2D1Factory,
-                s_dwfactory,
-                width,
-                height,
-                dpiX,
-                dpiY);
+            return new WicRenderTargetBitmapImpl(width, height, dpiX, dpiY);
         }
 
         public IWriteableBitmapImpl CreateWriteableBitmap(int width, int height, PixelFormat? format = null)
         {
-            return new WriteableWicBitmapImpl(s_imagingFactory, width, height, format);
+            return new WriteableWicBitmapImpl(width, height, format);
         }
 
         public IStreamGeometryImpl CreateStreamGeometry()
@@ -178,17 +180,17 @@ namespace Avalonia.Direct2D1
 
         public IBitmapImpl LoadBitmap(string fileName)
         {
-            return new WicBitmapImpl(s_imagingFactory, fileName);
+            return new WicBitmapImpl(fileName);
         }
 
         public IBitmapImpl LoadBitmap(Stream stream)
         {
-            return new WicBitmapImpl(s_imagingFactory, stream);
+            return new WicBitmapImpl(stream);
         }
 
         public IBitmapImpl LoadBitmap(PixelFormat format, IntPtr data, int width, int height, int stride)
         {
-            return new WicBitmapImpl(s_imagingFactory, format, data, width, height, stride);
+            return new WicBitmapImpl(format, data, width, height, stride);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
index ac18d0943b..aad50331d2 100644
--- a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
@@ -3,24 +3,17 @@ using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX;
-using DirectWriteFactory = SharpDX.DirectWrite.Factory;
 
 namespace Avalonia.Direct2D1
 {
     class ExternalRenderTarget : IRenderTarget, ILayerFactory
     {
         private readonly IExternalDirect2DRenderTargetSurface _externalRenderTargetProvider;
-        private readonly DirectWriteFactory _dwFactory;
-        private readonly SharpDX.WIC.ImagingFactory _wicFactory;
 
         public ExternalRenderTarget(
-            IExternalDirect2DRenderTargetSurface externalRenderTargetProvider,
-            DirectWriteFactory dwFactory,
-            SharpDX.WIC.ImagingFactory wicFactory)
+            IExternalDirect2DRenderTargetSurface externalRenderTargetProvider)
         {
             _externalRenderTargetProvider = externalRenderTargetProvider;
-            _dwFactory = dwFactory;
-            _wicFactory = wicFactory;
         }
 
         public void Dispose()
@@ -32,7 +25,7 @@ namespace Avalonia.Direct2D1
         {
             var target =  _externalRenderTargetProvider.GetOrCreateRenderTarget();
             _externalRenderTargetProvider.BeforeDrawing();
-            return new DrawingContextImpl(visualBrushRenderer, null, target, _dwFactory, _wicFactory, null, () =>
+            return new DrawingContextImpl(visualBrushRenderer, null, target, null, () =>
             {
                 try
                 {
@@ -47,12 +40,8 @@ namespace Avalonia.Direct2D1
 
         public IRenderTargetBitmapImpl CreateLayer(Size size)
         {
-            var target = _externalRenderTargetProvider.GetOrCreateRenderTarget();
-            return D2DRenderTargetBitmapImpl.CreateCompatible(
-                _wicFactory,
-                _dwFactory,
-                target,
-                size);
+            var renderTarget = _externalRenderTargetProvider.GetOrCreateRenderTarget();
+            return D2DRenderTargetBitmapImpl.CreateCompatible(renderTarget, size);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
index 83ce571152..5ae174083c 100644
--- a/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
@@ -4,7 +4,6 @@ using Avalonia.Direct2D1.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Win32.Interop;
-using SharpDX.Direct2D1;
 using SharpDX.WIC;
 using PixelFormat = Avalonia.Platform.PixelFormat;
 
@@ -13,22 +12,14 @@ namespace Avalonia.Direct2D1
     class FramebufferShimRenderTarget : IRenderTarget
     {
         private readonly IFramebufferPlatformSurface _surface;
-        private readonly ImagingFactory _imagingFactory;
-        private readonly Factory _d2DFactory;
-        private readonly SharpDX.DirectWrite.Factory _dwriteFactory;
 
-        public FramebufferShimRenderTarget(IFramebufferPlatformSurface surface,
-            ImagingFactory imagingFactory, Factory d2dFactory, SharpDX.DirectWrite.Factory dwriteFactory)
+        public FramebufferShimRenderTarget(IFramebufferPlatformSurface surface)
         {
             _surface = surface;
-            _imagingFactory = imagingFactory;
-            _d2DFactory = d2dFactory;
-            _dwriteFactory = dwriteFactory;
         }
 
         public void Dispose()
-        {
-            
+        {            
         }
 
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
@@ -40,7 +31,7 @@ namespace Avalonia.Direct2D1
                 throw new ArgumentException("Unsupported pixel format: " + locked.Format);
             }
 
-            return new FramebufferShim(locked, _imagingFactory, _d2DFactory, _dwriteFactory)
+            return new FramebufferShim(locked)
                 .CreateDrawingContext(visualBrushRenderer);
         }
 
@@ -48,10 +39,8 @@ namespace Avalonia.Direct2D1
         {
             private readonly ILockedFramebuffer _target;
 
-            public FramebufferShim(ILockedFramebuffer target,
-                ImagingFactory imagingFactory, Factory d2dFactory, SharpDX.DirectWrite.Factory dwriteFactory
-                ) : base(imagingFactory, d2dFactory, dwriteFactory,
-                    target.Width, target.Height, target.Dpi.X, target.Dpi.Y, target.Format)
+            public FramebufferShim(ILockedFramebuffer target) : 
+                base(target.Width, target.Height, target.Dpi.X, target.Dpi.Y, target.Format)
             {
                 _target = target;
             }
@@ -72,10 +61,8 @@ namespace Avalonia.Direct2D1
                     }
                     Dispose();
                     _target.Dispose();
-
                 });
             }
         }
-
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
index dc6d8ea016..589f85f208 100644
--- a/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Direct2D1
 
         protected override SwapChain1 CreateSwapChain(Factory2 dxgiFactory, SwapChainDescription1 swapChainDesc)
         {
-            return new SwapChain1(dxgiFactory, DxgiDevice, _window.Handle, ref swapChainDesc);
+            return new SwapChain1(dxgiFactory, Direct2D1Platform.DxgiDevice, _window.Handle, ref swapChainDesc);
         }
 
         protected override Size2F GetWindowDpi()
diff --git a/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs b/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs
index 51b4eef62d..6e6cf47254 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.DirectWrite;
@@ -9,7 +8,7 @@ using SharpDX.Mathematics.Interop;
 
 namespace Avalonia.Direct2D1.Media
 {
-    internal class AvaloniaTextRenderer : TextRenderer
+    internal class AvaloniaTextRenderer : TextRendererBase
     {
         private readonly DrawingContextImpl _context;
 
@@ -27,18 +26,7 @@ namespace Avalonia.Direct2D1.Media
             _foreground = foreground;
         }
 
-        public IDisposable Shadow
-        {
-            get;
-            set;
-        }
-
-        public void Dispose()
-        {
-            Shadow?.Dispose();
-        }
-
-        public Result DrawGlyphRun(
+        public override Result DrawGlyphRun(
             object clientDrawingContext,
             float baselineOriginX,
             float baselineOriginY,
@@ -68,34 +56,14 @@ namespace Avalonia.Direct2D1.Media
             return Result.Ok;
         }
 
-        public Result DrawInlineObject(object clientDrawingContext, float originX, float originY, InlineObject inlineObject, bool isSideways, bool isRightToLeft, ComObject clientDrawingEffect)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Result DrawStrikethrough(object clientDrawingContext, float baselineOriginX, float baselineOriginY, ref Strikethrough strikethrough, ComObject clientDrawingEffect)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Result DrawUnderline(object clientDrawingContext, float baselineOriginX, float baselineOriginY, ref Underline underline, ComObject clientDrawingEffect)
-        {
-            throw new NotImplementedException();
-        }
-
-        public RawMatrix3x2 GetCurrentTransform(object clientDrawingContext)
+        public override RawMatrix3x2 GetCurrentTransform(object clientDrawingContext)
         {
             return _renderTarget.Transform;
         }
 
-        public float GetPixelsPerDip(object clientDrawingContext)
+        public override float GetPixelsPerDip(object clientDrawingContext)
         {
             return _renderTarget.DotsPerInch.Width / 96;
         }
-
-        public bool IsPixelSnappingDisabled(object clientDrawingContext)
-        {
-            return false;
-        }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs b/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
index 4199c73c54..d60aa15a5e 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
@@ -7,16 +7,13 @@ namespace Avalonia.Direct2D1.Media
     internal static class Direct2D1FontCollectionCache
     {
         private static readonly ConcurrentDictionary<FontFamilyKey, SharpDX.DirectWrite.FontCollection> s_cachedCollections;
-        private static readonly SharpDX.DirectWrite.Factory s_factory;
         private static readonly SharpDX.DirectWrite.FontCollection s_installedFontCollection;
 
         static Direct2D1FontCollectionCache()
         {
             s_cachedCollections = new ConcurrentDictionary<FontFamilyKey, SharpDX.DirectWrite.FontCollection>();
 
-            s_factory = AvaloniaLocator.Current.GetService<SharpDX.DirectWrite.Factory>();
-
-            s_installedFontCollection = s_factory.GetSystemFontCollection(false);
+            s_installedFontCollection = Direct2D1Platform.DirectWriteFactory.GetSystemFontCollection(false);
         }
 
         public static SharpDX.DirectWrite.TextFormat GetTextFormat(Typeface typeface)
@@ -39,7 +36,7 @@ namespace Avalonia.Direct2D1.Media
             }
 
             return new SharpDX.DirectWrite.TextFormat(
-                s_factory, 
+                Direct2D1Platform.DirectWriteFactory, 
                 fontFamilyName, 
                 fontCollection, 
                 (SharpDX.DirectWrite.FontWeight)typeface.Weight,
@@ -57,9 +54,9 @@ namespace Avalonia.Direct2D1.Media
         {
             var assets = FontFamilyLoader.LoadFontAssets(key);
 
-            var fontLoader = new DWriteResourceFontLoader(s_factory, assets);
+            var fontLoader = new DWriteResourceFontLoader(Direct2D1Platform.DirectWriteFactory, assets);
 
-            return new SharpDX.DirectWrite.FontCollection(s_factory, fontLoader, fontLoader.Key);
+            return new SharpDX.DirectWrite.FontCollection(Direct2D1Platform.DirectWriteFactory, fontLoader, fontLoader.Key);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index ae5dd3ae13..b842f26edb 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -22,10 +22,9 @@ namespace Avalonia.Direct2D1.Media
         private readonly IVisualBrushRenderer _visualBrushRenderer;
         private readonly ILayerFactory _layerFactory;
         private readonly SharpDX.Direct2D1.RenderTarget _renderTarget;
+        private readonly DeviceContext _deviceContext;
         private readonly SharpDX.DXGI.SwapChain1 _swapChain;
         private readonly Action _finishedCallback;
-        private readonly SharpDX.WIC.ImagingFactory _imagingFactory;
-        private SharpDX.DirectWrite.Factory _directWriteFactory;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DrawingContextImpl"/> class.
@@ -36,16 +35,12 @@ namespace Avalonia.Direct2D1.Media
         /// An object to use to create layers. May be null, in which case a
         /// <see cref="WicRenderTargetBitmapImpl"/> will created when a new layer is requested.
         /// </param>
-        /// <param name="directWriteFactory">The DirectWrite factory.</param>
-        /// <param name="imagingFactory">The WIC imaging factory.</param>
         /// <param name="swapChain">An optional swap chain associated with this drawing context.</param>
         /// <param name="finishedCallback">An optional delegate to be called when context is disposed.</param>
         public DrawingContextImpl(
             IVisualBrushRenderer visualBrushRenderer,
             ILayerFactory layerFactory,
             SharpDX.Direct2D1.RenderTarget renderTarget,
-            SharpDX.DirectWrite.Factory directWriteFactory,
-            SharpDX.WIC.ImagingFactory imagingFactory,
             SharpDX.DXGI.SwapChain1 swapChain = null,
             Action finishedCallback = null)
         {
@@ -54,9 +49,17 @@ namespace Avalonia.Direct2D1.Media
             _renderTarget = renderTarget;
             _swapChain = swapChain;
             _finishedCallback = finishedCallback;
-            _directWriteFactory = directWriteFactory;
-            _imagingFactory = imagingFactory;
-            _renderTarget.BeginDraw();
+
+            if (_renderTarget is DeviceContext deviceContext)
+            {
+                _deviceContext = deviceContext;
+            }
+            else
+            {
+                _deviceContext = _renderTarget.QueryInterface<DeviceContext>();
+            }
+
+            _deviceContext.BeginDraw();
         }
 
         /// <summary>
@@ -64,14 +67,14 @@ namespace Avalonia.Direct2D1.Media
         /// </summary>
         public Matrix Transform
         {
-            get { return _renderTarget.Transform.ToAvalonia(); }
-            set { _renderTarget.Transform = value.ToDirect2D(); }
+            get { return _deviceContext.Transform.ToAvalonia(); }
+            set { _deviceContext.Transform = value.ToDirect2D(); }
         }
 
         /// <inheritdoc/>
         public void Clear(Color color)
         {
-            _renderTarget.Clear(color.ToDirect2D());
+            _deviceContext.Clear(color.ToDirect2D());
         }
 
         /// <summary>
@@ -80,10 +83,13 @@ namespace Avalonia.Direct2D1.Media
         public void Dispose()
         {
             foreach (var layer in _layerPool)
+            {
                 layer.Dispose();
+            }
+
             try
             {
-                _renderTarget.EndDraw();
+                _deviceContext.EndDraw();
 
                 _swapChain?.Present(1, SharpDX.DXGI.PresentFlags.None);
                 _finishedCallback?.Invoke();
@@ -104,29 +110,32 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
         public void DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
         {
-            using (var d2d = ((BitmapImpl)source.Item).GetDirect2DBitmap(_renderTarget))
+            using (var d2d = ((BitmapImpl)source.Item).GetDirect2DBitmap(_deviceContext))
             {
                 var interpolationMode = GetInterpolationMode(bitmapInterpolationMode);
 
-                _renderTarget.DrawBitmap(
+                _deviceContext.DrawBitmap(
                     d2d.Value,
                     destRect.ToSharpDX(),
                     (float)opacity,
                     interpolationMode,
-                    sourceRect.ToSharpDX());
+                    sourceRect.ToSharpDX(),
+                    null);
             }
         }
 
-        private static SharpDX.Direct2D1.BitmapInterpolationMode GetInterpolationMode(BitmapInterpolationMode interpolationMode)
+        private static InterpolationMode GetInterpolationMode(BitmapInterpolationMode interpolationMode)
         {
             switch (interpolationMode)
             {
                 case BitmapInterpolationMode.LowQuality:
-                    return SharpDX.Direct2D1.BitmapInterpolationMode.NearestNeighbor;
+                    return InterpolationMode.NearestNeighbor;
                 case BitmapInterpolationMode.MediumQuality:
+                    return InterpolationMode.Linear;
                 case BitmapInterpolationMode.HighQuality:
+                    return InterpolationMode.HighQualityCubic;
                 case BitmapInterpolationMode.Default:
-                    return SharpDX.Direct2D1.BitmapInterpolationMode.Linear;
+                    return InterpolationMode.Linear;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(interpolationMode), interpolationMode, null);
             }
@@ -141,17 +150,17 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="destRect">The rect in the output to draw to.</param>
         public void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
-            using (var d2dSource = ((BitmapImpl)source.Item).GetDirect2DBitmap(_renderTarget))
-            using (var sourceBrush = new BitmapBrush(_renderTarget, d2dSource.Value))
+            using (var d2dSource = ((BitmapImpl)source.Item).GetDirect2DBitmap(_deviceContext))
+            using (var sourceBrush = new BitmapBrush(_deviceContext, d2dSource.Value))
             using (var d2dOpacityMask = CreateBrush(opacityMask, opacityMaskRect.Size))
-            using (var geometry = new SharpDX.Direct2D1.RectangleGeometry(_renderTarget.Factory, destRect.ToDirect2D()))
+            using (var geometry = new SharpDX.Direct2D1.RectangleGeometry(_deviceContext.Factory, destRect.ToDirect2D()))
             {
                 if (d2dOpacityMask.PlatformBrush != null)
                 {
                     d2dOpacityMask.PlatformBrush.Transform = Matrix.CreateTranslation(opacityMaskRect.Position).ToDirect2D();
                 }
 
-                _renderTarget.FillGeometry(
+                _deviceContext.FillGeometry(
                     geometry,
                     sourceBrush,
                     d2dOpacityMask.PlatformBrush);
@@ -171,11 +180,11 @@ namespace Avalonia.Direct2D1.Media
                 var size = new Rect(p1, p2).Size;
 
                 using (var d2dBrush = CreateBrush(pen.Brush, size))
-                using (var d2dStroke = pen.ToDirect2DStrokeStyle(_renderTarget))
+                using (var d2dStroke = pen.ToDirect2DStrokeStyle(_deviceContext))
                 {
                     if (d2dBrush.PlatformBrush != null)
                     {
-                        _renderTarget.DrawLine(
+                        _deviceContext.DrawLine(
                             p1.ToSharpDX(),
                             p2.ToSharpDX(),
                             d2dBrush.PlatformBrush,
@@ -201,7 +210,7 @@ namespace Avalonia.Direct2D1.Media
                     if (d2dBrush.PlatformBrush != null)
                     {
                         var impl = (GeometryImpl)geometry;
-                        _renderTarget.FillGeometry(impl.Geometry, d2dBrush.PlatformBrush);
+                        _deviceContext.FillGeometry(impl.Geometry, d2dBrush.PlatformBrush);
                     }
                 }
             }
@@ -209,12 +218,12 @@ namespace Avalonia.Direct2D1.Media
             if (pen != null)
             {
                 using (var d2dBrush = CreateBrush(pen.Brush, geometry.GetRenderBounds(pen).Size))
-                using (var d2dStroke = pen.ToDirect2DStrokeStyle(_renderTarget))
+                using (var d2dStroke = pen.ToDirect2DStrokeStyle(_deviceContext))
                 {
                     if (d2dBrush.PlatformBrush != null)
                     {
                         var impl = (GeometryImpl)geometry;
-                        _renderTarget.DrawGeometry(impl.Geometry, d2dBrush.PlatformBrush, (float)pen.Thickness, d2dStroke);
+                        _deviceContext.DrawGeometry(impl.Geometry, d2dBrush.PlatformBrush, (float)pen.Thickness, d2dStroke);
                     }
                 }
             }
@@ -229,13 +238,13 @@ namespace Avalonia.Direct2D1.Media
         public void DrawRectangle(Pen pen, Rect rect, float cornerRadius)
         {
             using (var brush = CreateBrush(pen.Brush, rect.Size))
-            using (var d2dStroke = pen.ToDirect2DStrokeStyle(_renderTarget))
+            using (var d2dStroke = pen.ToDirect2DStrokeStyle(_deviceContext))
             {
                 if (brush.PlatformBrush != null)
                 {
                     if (cornerRadius == 0)
                     {
-                        _renderTarget.DrawRectangle(
+                        _deviceContext.DrawRectangle(
                             rect.ToDirect2D(),
                             brush.PlatformBrush,
                             (float)pen.Thickness,
@@ -243,7 +252,7 @@ namespace Avalonia.Direct2D1.Media
                     }
                     else
                     {
-                        _renderTarget.DrawRoundedRectangle(
+                        _deviceContext.DrawRoundedRectangle(
                             new RoundedRectangle { Rect = rect.ToDirect2D(), RadiusX = cornerRadius, RadiusY = cornerRadius },
                             brush.PlatformBrush,
                             (float)pen.Thickness,
@@ -266,7 +275,7 @@ namespace Avalonia.Direct2D1.Media
                 var impl = (FormattedTextImpl)text;
 
                 using (var brush = CreateBrush(foreground, impl.Size))
-                using (var renderer = new AvaloniaTextRenderer(this, _renderTarget, brush.PlatformBrush))
+                using (var renderer = new AvaloniaTextRenderer(this, _deviceContext, brush.PlatformBrush))
                 {
                     if (brush.PlatformBrush != null)
                     {
@@ -290,11 +299,11 @@ namespace Avalonia.Direct2D1.Media
                 {
                     if (cornerRadius == 0)
                     {
-                        _renderTarget.FillRectangle(rect.ToDirect2D(), b.PlatformBrush);
+                        _deviceContext.FillRectangle(rect.ToDirect2D(), b.PlatformBrush);
                     }
                     else
                     {
-                        _renderTarget.FillRoundedRectangle(
+                        _deviceContext.FillRoundedRectangle(
                             new RoundedRectangle
                             {
                                 Rect = new RawRectangleF(
@@ -320,7 +329,7 @@ namespace Avalonia.Direct2D1.Media
             else
             {
                 var platform = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-                var dpi = new Vector(_renderTarget.DotsPerInch.Width, _renderTarget.DotsPerInch.Height);
+                var dpi = new Vector(_deviceContext.DotsPerInch.Width, _deviceContext.DotsPerInch.Height);
                 var pixelSize = size * (dpi / 96);
                 return platform.CreateRenderTargetBitmap(
                     (int)pixelSize.Width,
@@ -337,12 +346,12 @@ namespace Avalonia.Direct2D1.Media
         /// <returns>A disposable used to undo the clip rectangle.</returns>
         public void PushClip(Rect clip)
         {
-            _renderTarget.PushAxisAlignedClip(clip.ToSharpDX(), AntialiasMode.PerPrimitive);
+            _deviceContext.PushAxisAlignedClip(clip.ToSharpDX(), AntialiasMode.PerPrimitive);
         }
 
         public void PopClip()
         {
-            _renderTarget.PopAxisAlignedClip();
+            _deviceContext.PopAxisAlignedClip();
         }
 
         readonly Stack<Layer> _layers = new Stack<Layer>();
@@ -363,8 +372,8 @@ namespace Avalonia.Direct2D1.Media
                     Opacity = (float)opacity,
                 };
 
-                var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_renderTarget);
-                _renderTarget.PushLayer(ref parameters, layer);
+                var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_deviceContext);
+                _deviceContext.PushLayer(ref parameters, layer);
 
                 _layers.Push(layer);
             }
@@ -382,7 +391,7 @@ namespace Avalonia.Direct2D1.Media
             var layer = _layers.Pop();
             if (layer != null)
             {
-                _renderTarget.PopLayer();
+                _deviceContext.PopLayer();
                 _layerPool.Push(layer);
             }
         }
@@ -403,21 +412,21 @@ namespace Avalonia.Direct2D1.Media
 
             if (solidColorBrush != null)
             {
-                return new SolidColorBrushImpl(solidColorBrush, _renderTarget);
+                return new SolidColorBrushImpl(solidColorBrush, _deviceContext);
             }
             else if (linearGradientBrush != null)
             {
-                return new LinearGradientBrushImpl(linearGradientBrush, _renderTarget, destinationSize);
+                return new LinearGradientBrushImpl(linearGradientBrush, _deviceContext, destinationSize);
             }
             else if (radialGradientBrush != null)
             {
-                return new RadialGradientBrushImpl(radialGradientBrush, _renderTarget, destinationSize);
+                return new RadialGradientBrushImpl(radialGradientBrush, _deviceContext, destinationSize);
             }
             else if (imageBrush?.Source != null)
             {
                 return new ImageBrushImpl(
                     imageBrush,
-                    _renderTarget,
+                    _deviceContext,
                     (BitmapImpl)imageBrush.Source.PlatformImpl.Item,
                     destinationSize);
             }
@@ -430,7 +439,7 @@ namespace Avalonia.Direct2D1.Media
                     if (intermediateSize.Width >= 1 && intermediateSize.Height >= 1)
                     {
                         using (var intermediate = new BitmapRenderTarget(
-                            _renderTarget,
+                            _deviceContext,
                             CompatibleRenderTargetOptions.None,
                             intermediateSize.ToSharpDX()))
                         {
@@ -442,8 +451,8 @@ namespace Avalonia.Direct2D1.Media
 
                             return new ImageBrushImpl(
                                 visualBrush,
-                                _renderTarget,
-                                new D2DBitmapImpl(_imagingFactory, intermediate.Bitmap),
+                                _deviceContext,
+                                new D2DBitmapImpl(intermediate.Bitmap),
                                 destinationSize);
                         }
                     }
@@ -454,7 +463,7 @@ namespace Avalonia.Direct2D1.Media
                 }
             }
 
-            return new SolidColorBrushImpl(null, _renderTarget);
+            return new SolidColorBrushImpl(null, _deviceContext);
         }
 
         public void PushGeometryClip(IGeometryImpl clip)
@@ -466,8 +475,8 @@ namespace Avalonia.Direct2D1.Media
                 Opacity = 1,
                 GeometricMask = ((GeometryImpl)clip).Geometry
             };
-            var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_renderTarget);
-            _renderTarget.PushLayer(ref parameters, layer);
+            var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_deviceContext);
+            _deviceContext.PushLayer(ref parameters, layer);
 
             _layers.Push(layer);
 
@@ -487,8 +496,8 @@ namespace Avalonia.Direct2D1.Media
                 Opacity = 1,
                 OpacityBrush = CreateBrush(mask, bounds.Size).PlatformBrush
             };
-            var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_renderTarget);
-            _renderTarget.PushLayer(ref parameters, layer);
+            var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_deviceContext);
+            _deviceContext.PushLayer(ref parameters, layer);
 
             _layers.Push(layer);
         }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
index c3fe60e790..7164ec7c0d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
@@ -21,24 +21,21 @@ namespace Avalonia.Direct2D1.Media
         {
             Text = text;
 
-            var factory = AvaloniaLocator.Current.GetService<DWrite.Factory>();
-
-            var textFormat = Direct2D1FontCollectionCache.GetTextFormat(typeface);
-
-            textFormat.WordWrapping =
-                wrapping == TextWrapping.Wrap ? DWrite.WordWrapping.Wrap : DWrite.WordWrapping.NoWrap;
-
-            TextLayout = new DWrite.TextLayout(
-                             factory,
-                             Text ?? string.Empty,
-                             textFormat,
-                             (float)constraint.Width,
-                             (float)constraint.Height)
+            using (var textFormat = Direct2D1FontCollectionCache.GetTextFormat(typeface))
             {
-                TextAlignment = textAlignment.ToDirect2D()
-            };
-
-            textFormat.Dispose();
+                textFormat.WordWrapping =
+                    wrapping == TextWrapping.Wrap ? DWrite.WordWrapping.Wrap : DWrite.WordWrapping.NoWrap;
+
+                TextLayout = new DWrite.TextLayout(
+                                 Direct2D1Platform.DirectWriteFactory,
+                                 Text ?? string.Empty,
+                                 textFormat,
+                                 (float)constraint.Width,
+                                 (float)constraint.Height)
+                             {
+                                 TextAlignment = textAlignment.ToDirect2D()
+                             };
+            }
 
             if (spans != null)
             {
@@ -110,6 +107,7 @@ namespace Avalonia.Direct2D1.Media
         private Size Measure()
         {
             var metrics = TextLayout.Metrics;
+
             var width = metrics.WidthIncludingTrailingWhitespace;
 
             if (float.IsNaN(width))
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 120ab71ead..7c8ddaca3f 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -53,10 +53,9 @@ namespace Avalonia.Direct2D1.Media
 
         public ITransformedGeometryImpl WithTransform(Matrix transform)
         {
-            var factory = AvaloniaLocator.Current.GetService<Factory>();
             return new TransformedGeometryImpl(
                 new TransformedGeometry(
-                    factory,
+                    Direct2D1Platform.Direct2D1Factory,
                     GetSourceGeometry(),
                     transform.ToDirect2D()),
                 this);
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
index d58f023391..30af01283a 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -1,19 +1,12 @@
 using System;
 using System.IO;
 using Avalonia.Platform;
-using SharpDX.WIC;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
     public abstract class BitmapImpl : IBitmapImpl, IDisposable
     {
-        public BitmapImpl(ImagingFactory imagingFactory)
-        {
-            WicImagingFactory = imagingFactory;
-        }
-
-        public ImagingFactory WicImagingFactory { get; }
         public abstract int PixelWidth { get; }
         public abstract int PixelHeight { get; }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
index 3835cd16da..b0edb9c3bf 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
@@ -1,10 +1,10 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 using System.IO;
-using SharpDX.Direct2D1;
-using ImageParameters = SharpDX.WIC.ImageParameters;
-using ImagingFactory2 = SharpDX.WIC.ImagingFactory2;
-using PngBitmapEncoder = SharpDX.WIC.PngBitmapEncoder;
-using WICFactory = SharpDX.WIC.ImagingFactory;
+using SharpDX.WIC;
+using Bitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
@@ -13,53 +13,46 @@ namespace Avalonia.Direct2D1.Media
     /// </summary>
     public class D2DBitmapImpl : BitmapImpl
     {
-        private Bitmap _direct2D;
+        private readonly Bitmap _direct2DBitmap;
 
         /// <summary>
         /// Initialize a new instance of the <see cref="BitmapImpl"/> class
         /// with a bitmap backed by GPU memory.
         /// </summary>
-        /// <param name="imagingFactory">The image factory to use when saving out this bitmap.</param>
         /// <param name="d2DBitmap">The GPU bitmap.</param>
         /// <remarks>
         /// This bitmap must be either from the same render target,
         /// or if the render target is a <see cref="SharpDX.Direct2D1.DeviceContext"/>,
         /// the device associated with this context, to be renderable.
         /// </remarks>
-        public D2DBitmapImpl(WICFactory imagingFactory, Bitmap d2DBitmap)
-            : base(imagingFactory)
+        public D2DBitmapImpl(Bitmap d2DBitmap)
         {
-            _direct2D = d2DBitmap ?? throw new ArgumentNullException(nameof(d2DBitmap));
+            _direct2DBitmap = d2DBitmap ?? throw new ArgumentNullException(nameof(d2DBitmap));
         }
-              
-        public override int PixelWidth => _direct2D.PixelSize.Width;
-        public override int PixelHeight => _direct2D.PixelSize.Height;
+
+        public override int PixelWidth => _direct2DBitmap.PixelSize.Width;
+        public override int PixelHeight => _direct2DBitmap.PixelSize.Height;
 
         public override void Dispose()
         {
             base.Dispose();
-            _direct2D.Dispose();
+            _direct2DBitmap.Dispose();
         }
 
         public override OptionalDispose<Bitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target)
         {
-            return new OptionalDispose<Bitmap>(_direct2D, false);
+            return new OptionalDispose<Bitmap>(_direct2DBitmap, false);
         }
 
         public override void Save(Stream stream)
         {
-            using (var encoder = new PngBitmapEncoder(WicImagingFactory, stream))
-            using (var frameEncode = new SharpDX.WIC.BitmapFrameEncode(encoder))
-            using (var imageEncoder = new SharpDX.WIC.ImageEncoder((ImagingFactory2)WicImagingFactory, null))
+            using (var encoder = new PngBitmapEncoder(Direct2D1Platform.ImagingFactory, stream))
+            using (var frame = new BitmapFrameEncode(encoder))
+            using (var bitmapSource = _direct2DBitmap.QueryInterface<BitmapSource>())
             {
-                var parameters = new ImageParameters(
-                    new PixelFormat(SharpDX.DXGI.Format.R8G8B8A8_UNorm, AlphaMode.Premultiplied),
-                    _direct2D.DotsPerInch.Width,
-                    _direct2D.DotsPerInch.Height,
-                    0, 0, PixelWidth, PixelHeight);
-
-                imageEncoder.WriteFrame(_direct2D, frameEncode, parameters);
-                frameEncode.Commit();
+                frame.Initialize();
+                frame.WriteSource(bitmapSource);
+                frame.Commit();
                 encoder.Commit();
             }
         }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
index 18a746436c..3646d9e9e1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
@@ -1,34 +1,28 @@
-using Avalonia.Platform;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX;
 using SharpDX.Direct2D1;
-using SharpDX.WIC;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
-using DirectWriteFactory = SharpDX.DirectWrite.Factory;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
     public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ILayerFactory
     {
-        private readonly DirectWriteFactory _dwriteFactory;
-        private readonly BitmapRenderTarget _target;
+        private readonly BitmapRenderTarget _renderTarget;
 
-        public D2DRenderTargetBitmapImpl(
-            ImagingFactory imagingFactory,
-            DirectWriteFactory dwriteFactory,
-            BitmapRenderTarget target)
-            : base(imagingFactory, target.Bitmap)
+        public D2DRenderTargetBitmapImpl(BitmapRenderTarget renderTarget)
+            : base(renderTarget.Bitmap)
         {
-            _dwriteFactory = dwriteFactory;
-            _target = target;
+            _renderTarget = renderTarget;
         }
 
-        public override int PixelWidth => _target.PixelSize.Width;
-        public override int PixelHeight => _target.PixelSize.Height;
+        public override int PixelWidth => _renderTarget.PixelSize.Width;
+        public override int PixelHeight => _renderTarget.PixelSize.Height;
 
         public static D2DRenderTargetBitmapImpl CreateCompatible(
-            ImagingFactory imagingFactory,
-            DirectWriteFactory dwriteFactory,
             SharpDX.Direct2D1.RenderTarget renderTarget,
             Size size)
         {
@@ -36,32 +30,27 @@ namespace Avalonia.Direct2D1.Media.Imaging
                 renderTarget,
                 CompatibleRenderTargetOptions.None,
                 new Size2F((float)size.Width, (float)size.Height));
-            return new D2DRenderTargetBitmapImpl(imagingFactory, dwriteFactory, bitmapRenderTarget);
+            return new D2DRenderTargetBitmapImpl(bitmapRenderTarget);
         }
 
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
         {
-            return new DrawingContextImpl(
-                visualBrushRenderer,
-                this,
-                _target,
-                _dwriteFactory,
-                WicImagingFactory);
+            return new DrawingContextImpl(visualBrushRenderer, this, _renderTarget);
         }
 
         public IRenderTargetBitmapImpl CreateLayer(Size size)
         {
-            return CreateCompatible(WicImagingFactory, _dwriteFactory, _target, size);
+            return CreateCompatible(_renderTarget, size);
         }
 
         public override void Dispose()
         {
-            _target.Dispose();
+            _renderTarget.Dispose();
         }
 
         public override OptionalDispose<D2DBitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target)
         {
-            return new OptionalDispose<D2DBitmap>(_target.Bitmap, false);
+            return new OptionalDispose<D2DBitmap>(_renderTarget.Bitmap, false);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index ef2177b167..d9fb00fa5b 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -15,60 +15,57 @@ namespace Avalonia.Direct2D1.Media
     /// </summary>
     public class WicBitmapImpl : BitmapImpl
     {
+        private BitmapDecoder _decoder;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="WicBitmapImpl"/> class.
         /// </summary>
-        /// <param name="factory">The WIC imaging factory to use.</param>
         /// <param name="fileName">The filename of the bitmap to load.</param>
-        public WicBitmapImpl(ImagingFactory factory, string fileName)
-            : base(factory)
+        public WicBitmapImpl(string fileName)
         {
-            using (BitmapDecoder decoder = new BitmapDecoder(factory, fileName, DecodeOptions.CacheOnDemand))
+            using (BitmapDecoder decoder = new BitmapDecoder(Direct2D1Platform.ImagingFactory, fileName, DecodeOptions.CacheOnDemand))
             {
-                WicImpl = new Bitmap(factory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnDemand);
+                WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnDemand);
             }
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WicBitmapImpl"/> class.
         /// </summary>
-        /// <param name="factory">The WIC imaging factory to use.</param>
         /// <param name="stream">The stream to read the bitmap from.</param>
-        public WicBitmapImpl(ImagingFactory factory, Stream stream)
-            : base(factory)
+        public WicBitmapImpl(Stream stream)
         {
-            using (BitmapDecoder decoder = new BitmapDecoder(factory, stream, DecodeOptions.CacheOnLoad))
-            {
-                WicImpl = new Bitmap(factory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnLoad);
-            }
+            // https://stackoverflow.com/questions/48982749/decoding-image-from-stream-using-wic/48982889#48982889
+            _decoder = new BitmapDecoder(Direct2D1Platform.ImagingFactory, stream, DecodeOptions.CacheOnLoad);
+
+            WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, _decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnLoad);
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WicBitmapImpl"/> class.
         /// </summary>
-        /// <param name="factory">The WIC imaging factory to use.</param>
         /// <param name="width">The width of the bitmap.</param>
         /// <param name="height">The height of the bitmap.</param>
         /// <param name="pixelFormat">Pixel format</param>
-        public WicBitmapImpl(ImagingFactory factory, int width, int height, APixelFormat? pixelFormat = null)
-            : base(factory)
+        public WicBitmapImpl(int width, int height, APixelFormat? pixelFormat = null)
         {
             if (!pixelFormat.HasValue)
+            {
                 pixelFormat = APixelFormat.Bgra8888;
+            }
 
             PixelFormat = pixelFormat;
             WicImpl = new Bitmap(
-                factory,
+                Direct2D1Platform.ImagingFactory,
                 width,
                 height,
                 pixelFormat.Value.ToWic(),
                 BitmapCreateCacheOption.CacheOnLoad);
         }
 
-        public WicBitmapImpl(ImagingFactory factory, APixelFormat format, IntPtr data, int width, int height, int stride)
-            : base(factory)
+        public WicBitmapImpl(APixelFormat format, IntPtr data, int width, int height, int stride)
         {
-            WicImpl = new Bitmap(factory, width, height, format.ToWic(), BitmapCreateCacheOption.CacheOnDemand);
+            WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, width, height, format.ToWic(), BitmapCreateCacheOption.CacheOnDemand);
             PixelFormat = format;
             using (var l = WicImpl.Lock(BitmapLockFlags.Write))
             {
@@ -77,7 +74,7 @@ namespace Avalonia.Direct2D1.Media
                     UnmanagedMethods.CopyMemory(
                         (l.Data.DataPointer + row * l.Stride),
                         (data + row * stride),
-                        (UIntPtr) l.Data.Pitch);
+                        (UIntPtr)l.Data.Pitch);
                 }
             }
         }
@@ -97,6 +94,7 @@ namespace Avalonia.Direct2D1.Media
         public override void Dispose()
         {
             WicImpl.Dispose();
+            _decoder?.Dispose();
         }
 
         /// <summary>
@@ -111,14 +109,14 @@ namespace Avalonia.Direct2D1.Media
         /// <returns>The Direct2D bitmap.</returns>
         public override OptionalDispose<D2DBitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget renderTarget)
         {
-            FormatConverter converter = new FormatConverter(WicImagingFactory);
+            FormatConverter converter = new FormatConverter(Direct2D1Platform.ImagingFactory);
             converter.Initialize(WicImpl, SharpDX.WIC.PixelFormat.Format32bppPBGRA);
             return new OptionalDispose<D2DBitmap>(D2DBitmap.FromWicBitmap(renderTarget, converter), true);
         }
 
         public override void Save(Stream stream)
         {
-            using (var encoder = new PngBitmapEncoder(WicImagingFactory, stream))
+            using (var encoder = new PngBitmapEncoder(Direct2D1Platform.ImagingFactory, stream))
             using (var frame = new BitmapFrameEncode(encoder))
             {
                 frame.Initialize();
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
index 0eb2608047..aa8b3ead42 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
@@ -5,26 +5,20 @@ using System;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX.Direct2D1;
-using SharpDX.WIC;
-using DirectWriteFactory = SharpDX.DirectWrite.Factory;
 
 namespace Avalonia.Direct2D1.Media
 {
     public class WicRenderTargetBitmapImpl : WicBitmapImpl, IRenderTargetBitmapImpl
     {
-        private readonly DirectWriteFactory _dwriteFactory;
-        private readonly WicRenderTarget _target;
+        private readonly WicRenderTarget _renderTarget;
 
         public WicRenderTargetBitmapImpl(
-            ImagingFactory imagingFactory,
-            Factory d2dFactory,
-            DirectWriteFactory dwriteFactory,
             int width,
             int height,
             double dpiX,
             double dpiY,
             Platform.PixelFormat? pixelFormat = null)
-            : base(imagingFactory, width, height, pixelFormat)
+            : base(width, height, pixelFormat)
         {
             var props = new RenderTargetProperties
             {
@@ -32,17 +26,16 @@ namespace Avalonia.Direct2D1.Media
                 DpiY = (float)dpiY,
             };
 
-            _target = new WicRenderTarget(
-                d2dFactory,
+            _renderTarget = new WicRenderTarget(
+                Direct2D1Platform.Direct2D1Factory,
                 WicImpl,
                 props);
-
-            _dwriteFactory = dwriteFactory;
         }
 
         public override void Dispose()
         {
-            _target.Dispose();
+            _renderTarget.Dispose();
+
             base.Dispose();
         }
 
@@ -51,8 +44,7 @@ namespace Avalonia.Direct2D1.Media
 
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer, Action finishedCallback)
         {
-            return new DrawingContextImpl(visualBrushRenderer, null, _target, _dwriteFactory, WicImagingFactory,
-                finishedCallback: finishedCallback);
+            return new DrawingContextImpl(visualBrushRenderer, null, _renderTarget, finishedCallback: finishedCallback);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
index cf7759af28..5ca78ef278 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 using Avalonia.Platform;
 using SharpDX.WIC;
 using PixelFormat = Avalonia.Platform.PixelFormat;
@@ -7,8 +10,8 @@ namespace Avalonia.Direct2D1.Media.Imaging
 {
     class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
     {
-        public WriteableWicBitmapImpl(ImagingFactory factory, int width, int height, PixelFormat? pixelFormat) 
-            : base(factory, width, height, pixelFormat)
+        public WriteableWicBitmapImpl(int width, int height, PixelFormat? pixelFormat) 
+            : base(width, height, pixelFormat)
         {
         }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
index 4c1bc3d6f7..a07d5c1c72 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
@@ -31,8 +31,7 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public IStreamGeometryImpl Clone()
         {
-            Factory factory = AvaloniaLocator.Current.GetService<Factory>();
-            var result = new PathGeometry(factory);
+            var result = new PathGeometry(Direct2D1Platform.Direct2D1Factory);
             var sink = result.Open();
             ((PathGeometry)Geometry).Stream(sink);
             sink.Close();
@@ -47,8 +46,7 @@ namespace Avalonia.Direct2D1.Media
 
         private static Geometry CreateGeometry()
         {
-            Factory factory = AvaloniaLocator.Current.GetService<Factory>();
-            return new PathGeometry(factory);
+            return new PathGeometry(Direct2D1Platform.Direct2D1Factory);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
index f2a83d78e8..a21b5571c6 100644
--- a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
@@ -5,9 +5,6 @@ using Avalonia.Direct2D1.Media;
 using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Rendering;
-using SharpDX.Direct2D1;
-using DwFactory = SharpDX.DirectWrite.Factory;
-using WicFactory = SharpDX.WIC.ImagingFactory;
 
 namespace Avalonia.Direct2D1
 {
@@ -24,32 +21,21 @@ namespace Avalonia.Direct2D1
         /// <param name="renderTarget">The render target.</param>
         public RenderTarget(SharpDX.Direct2D1.RenderTarget renderTarget)
         {
-            Direct2DFactory = AvaloniaLocator.Current.GetService<Factory>();
-            DirectWriteFactory = AvaloniaLocator.Current.GetService<DwFactory>();
-            WicFactory = AvaloniaLocator.Current.GetService<WicFactory>();
             _renderTarget = renderTarget;
         }
 
-        public Factory Direct2DFactory { get; }
-        public DwFactory DirectWriteFactory { get; }
-        public WicFactory WicFactory { get; }
-
         /// <summary>
         /// Creates a drawing context for a rendering session.
         /// </summary>
         /// <returns>An <see cref="Avalonia.Platform.IDrawingContextImpl"/>.</returns>
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
         {
-            return new DrawingContextImpl(visualBrushRenderer, this, _renderTarget, DirectWriteFactory, WicFactory);
+            return new DrawingContextImpl(visualBrushRenderer, this, _renderTarget);
         }
 
         public IRenderTargetBitmapImpl CreateLayer(Size size)
         {
-            return D2DRenderTargetBitmapImpl.CreateCompatible(
-                WicFactory,
-                DirectWriteFactory,
-                _renderTarget,
-                size);
+            return D2DRenderTargetBitmapImpl.CreateCompatible(_renderTarget, size);
         }
 
         public void Dispose()
diff --git a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
index 102e166433..ffa0f5c8bc 100644
--- a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
@@ -1,18 +1,16 @@
-using Avalonia.Direct2D1.Media;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Direct2D1.Media;
 using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.DXGI;
-using AlphaMode = SharpDX.Direct2D1.AlphaMode;
-using Device = SharpDX.Direct2D1.Device;
-using Factory = SharpDX.Direct2D1.Factory;
-using Factory2 = SharpDX.DXGI.Factory2;
-using PixelFormat = SharpDX.Direct2D1.PixelFormat;
 
 namespace Avalonia.Direct2D1
-{
+{   
     public abstract class SwapChainRenderTarget : IRenderTarget, ILayerFactory
     {
         private Size2 _savedSize;
@@ -20,23 +18,6 @@ namespace Avalonia.Direct2D1
         private DeviceContext _deviceContext;
         private SwapChain1 _swapChain;
 
-        protected SwapChainRenderTarget()
-        {
-            DxgiDevice = AvaloniaLocator.Current.GetService<SharpDX.DXGI.Device>();
-            D2DDevice = AvaloniaLocator.Current.GetService<Device>();
-            Direct2DFactory = AvaloniaLocator.Current.GetService<Factory>();
-            DirectWriteFactory = AvaloniaLocator.Current.GetService<SharpDX.DirectWrite.Factory>();
-            WicImagingFactory = AvaloniaLocator.Current.GetService<SharpDX.WIC.ImagingFactory>();
-        }
-
-        public Factory Direct2DFactory { get; }
-        public SharpDX.DirectWrite.Factory DirectWriteFactory { get; }
-        public SharpDX.WIC.ImagingFactory WicImagingFactory { get; }
-
-        protected SharpDX.DXGI.Device DxgiDevice { get; }
-        
-        public Device D2DDevice { get; }
-
         /// <summary>
         /// Creates a drawing context for a rendering session.
         /// </summary>
@@ -50,87 +31,92 @@ namespace Avalonia.Direct2D1
             {
                 _savedSize = size;
                 _savedDpi = dpi;
-                CreateSwapChain();
+
+                Resize();
             }
 
-            return new DrawingContextImpl(
-                visualBrushRenderer,
-                this,
-                _deviceContext,
-                DirectWriteFactory,
-                WicImagingFactory,
-                _swapChain);
+            return new DrawingContextImpl(visualBrushRenderer, this, _deviceContext, _swapChain);
         }
 
         public IRenderTargetBitmapImpl CreateLayer(Size size)
         {
             if (_deviceContext == null)
             {
-                CreateSwapChain();
+                CreateDeviceContext();
             }
 
-            return D2DRenderTargetBitmapImpl.CreateCompatible(
-                WicImagingFactory,
-                DirectWriteFactory,
-                _deviceContext,
-                size);
+            return D2DRenderTargetBitmapImpl.CreateCompatible(_deviceContext, size);
         }
 
         public void Dispose()
         {
             _deviceContext?.Dispose();
+
             _swapChain?.Dispose();
         }
 
+        private void Resize()
+        {
+            _deviceContext?.Dispose();
+            _deviceContext = null;
+
+            _swapChain?.ResizeBuffers(0, 0, 0, Format.Unknown, SwapChainFlags.None);
+
+            CreateDeviceContext();
+        }
+
         private void CreateSwapChain()
         {
-            using (var dxgiAdaptor = DxgiDevice.Adapter)
-            using (var dxgiFactory = dxgiAdaptor.GetParent<Factory2>())
+            var swapChainDescription = new SwapChainDescription1
             {
-                _deviceContext?.Dispose();
-                _deviceContext = new DeviceContext(D2DDevice, DeviceContextOptions.None) {DotsPerInch = _savedDpi};
-
-                var swapChainDesc = new SwapChainDescription1
+                Width = _savedSize.Width,
+                Height = _savedSize.Height,
+                Format = Format.B8G8R8A8_UNorm,
+                SampleDescription = new SampleDescription
                 {
-                    Width = _savedSize.Width,
-                    Height = _savedSize.Height,
-                    Format = Format.B8G8R8A8_UNorm,
-                    Stereo = false,
-                    SampleDescription = new SampleDescription
+                    Count = 1,
+                    Quality = 0,
+                },
+                Usage = Usage.RenderTargetOutput,
+                BufferCount = 1,
+                SwapEffect = SwapEffect.Discard,
+            };
+
+            using (var dxgiAdapter = Direct2D1Platform.DxgiDevice.Adapter)
+            using (var dxgiFactory = dxgiAdapter.GetParent<SharpDX.DXGI.Factory2>())
+            {
+                _swapChain = CreateSwapChain(dxgiFactory, swapChainDescription);
+            }
+        }
+
+        private void CreateDeviceContext()
+        {
+            _deviceContext = new DeviceContext(Direct2D1Platform.Direct2D1Device, DeviceContextOptions.None) { DotsPerInch = _savedDpi };
+
+            if (_swapChain == null)
+            {
+                CreateSwapChain();
+            }
+
+            using (var dxgiBackBuffer = _swapChain.GetBackBuffer<Surface>(0))
+            using (var d2dBackBuffer = new Bitmap1(
+                _deviceContext,
+                dxgiBackBuffer,
+                new BitmapProperties1(
+                    new SharpDX.Direct2D1.PixelFormat
                     {
-                        Count = 1,
-                        Quality = 0,
+                        AlphaMode = SharpDX.Direct2D1.AlphaMode.Premultiplied,
+                        Format = Format.B8G8R8A8_UNorm
                     },
-                    Usage = Usage.RenderTargetOutput,
-                    BufferCount = 1,
-                    Scaling = Scaling.Stretch,
-                    SwapEffect = SwapEffect.Discard,
-                    Flags = 0,
-                };
-
-                _swapChain?.Dispose();
-                _swapChain = CreateSwapChain(dxgiFactory, swapChainDesc);
-
-                using (var dxgiBackBuffer = _swapChain.GetBackBuffer<Surface>(0))
-                using (var d2dBackBuffer = new Bitmap1(
-                    _deviceContext,
-                    dxgiBackBuffer,
-                    new BitmapProperties1(
-                        new PixelFormat
-                        {
-                            AlphaMode = AlphaMode.Premultiplied,
-                            Format = Format.B8G8R8A8_UNorm
-                        },
-                        _savedDpi.Width,
-                        _savedDpi.Height,
-                        BitmapOptions.Target | BitmapOptions.CannotDraw)))
-                {
-                    _deviceContext.Target = d2dBackBuffer;
-                }
+                    _savedSize.Width,
+                    _savedSize.Height,
+                    BitmapOptions.Target | BitmapOptions.CannotDraw)))
+            {
+                _deviceContext.Target = d2dBackBuffer;
             }
         }
 
-        protected abstract SwapChain1 CreateSwapChain(Factory2 dxgiFactory, SwapChainDescription1 swapChainDesc);
+        protected abstract SwapChain1 CreateSwapChain(SharpDX.DXGI.Factory2 dxgiFactory, SwapChainDescription1 swapChainDesc);
 
         protected abstract Size2F GetWindowDpi();
 
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 5f26e4ad3e..1fb566dad0 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\Avalonia.OpenGL\Avalonia.OpenGL.csproj" />
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index f89086ccb7..c3c867d3fb 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -26,6 +26,9 @@ namespace Avalonia.Win32.Interop
 
         public delegate void TimeCallback(uint uTimerID, uint uMsg, UIntPtr dwUser, UIntPtr dw1, UIntPtr dw2);
 
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        public delegate void WaitOrTimerCallback(IntPtr lpParameter, bool timerOrWaitFired);
+
         public delegate IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
 
         public enum Cursor
@@ -848,11 +851,25 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         public static extern bool ShowWindow(IntPtr hWnd, ShowWindowCommand nCmdShow);
 
-        [DllImport("Winmm.dll")]
-        public static extern uint timeKillEvent(uint uTimerID);
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern IntPtr CreateTimerQueue();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool DeleteTimerQueueEx(IntPtr TimerQueue, IntPtr CompletionEvent);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool CreateTimerQueueTimer(
+            out IntPtr phNewTimer,
+            IntPtr TimerQueue,
+            WaitOrTimerCallback Callback,
+            IntPtr Parameter,
+            uint DueTime,
+            uint Period,
+            uint Flags);
 
-        [DllImport("Winmm.dll")]
-        public static extern uint timeSetEvent(uint uDelay, uint uResolution, TimeCallback lpTimeProc, UIntPtr dwUser, uint fuEvent);
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool DeleteTimerQueueTimer(IntPtr TimerQueue, IntPtr Timer, IntPtr CompletionEvent);
 
         [DllImport("user32.dll")]
         public static extern int ToUnicode(
@@ -959,6 +976,9 @@ namespace Avalonia.Win32.Interop
         [DllImport("shcore.dll")]
         public static extern void GetScaleFactorForMonitor(IntPtr hMon, out uint pScale);
 
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool SetProcessDPIAware();
+
         [DllImport("user32.dll")]
         public static extern IntPtr MonitorFromPoint(POINT pt, MONITOR dwFlags);
 
@@ -970,7 +990,7 @@ namespace Avalonia.Win32.Interop
         
         [DllImport("user32", EntryPoint = "GetMonitorInfoW", ExactSpelling = true, CharSet = CharSet.Unicode)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool GetMonitorInfo([In] IntPtr hMonitor, [Out] MONITORINFO lpmi);
+        public static extern bool GetMonitorInfo([In] IntPtr hMonitor, ref MONITORINFO lpmi);
 
         [return: MarshalAs(UnmanagedType.Bool)]
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "PostMessageW")]
@@ -1038,12 +1058,17 @@ namespace Avalonia.Win32.Interop
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        internal class MONITORINFO
+        internal struct MONITORINFO
         {
-            public int cbSize = Marshal.SizeOf<MONITORINFO>();
-            public RECT rcMonitor = new RECT();
-            public RECT rcWork = new RECT();
-            public int dwFlags = 0;
+            public int cbSize;
+            public RECT rcMonitor;
+            public RECT rcWork;
+            public int dwFlags;
+
+            public static MONITORINFO Create()
+            {
+                return new MONITORINFO() { cbSize = Marshal.SizeOf<MONITORINFO>() };
+            }
 
             public enum MonitorOptions : uint
             {
diff --git a/src/Windows/Avalonia.Win32/RenderLoop.cs b/src/Windows/Avalonia.Win32/RenderLoop.cs
deleted file mode 100644
index 7d7befcc33..0000000000
--- a/src/Windows/Avalonia.Win32/RenderLoop.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-using Avalonia.Rendering;
-using Avalonia.Win32.Interop;
-
-namespace Avalonia.Win32
-{
-    internal class RenderLoop : DefaultRenderLoop
-    {
-        private UnmanagedMethods.TimeCallback timerDelegate;
-
-        public RenderLoop(int framesPerSecond)
-            : base(framesPerSecond)
-        {
-        }
-
-        protected override IDisposable StartCore(Action tick)
-        {
-            timerDelegate = (id, uMsg, user, dw1, dw2) => tick();
-
-            var handle = UnmanagedMethods.timeSetEvent(
-                (uint)(1000 / FramesPerSecond),
-                0,
-                timerDelegate,
-                UIntPtr.Zero,
-                1);
-
-            return Disposable.Create(() =>
-            {
-                timerDelegate = null;
-                UnmanagedMethods.timeKillEvent(handle);
-            });
-        }
-    }
-}
diff --git a/src/Windows/Avalonia.Win32/RenderTimer.cs b/src/Windows/Avalonia.Win32/RenderTimer.cs
new file mode 100644
index 0000000000..7dbb745a23
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/RenderTimer.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using Avalonia.Rendering;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    internal class RenderTimer : DefaultRenderTimer
+    {
+        private UnmanagedMethods.WaitOrTimerCallback timerDelegate;
+
+        private static IntPtr _timerQueue;
+
+        private static void EnsureTimerQueueCreated()
+        {
+            if (Volatile.Read(ref _timerQueue) == null)
+            {
+                var queue = UnmanagedMethods.CreateTimerQueue();
+                if (Interlocked.CompareExchange(ref _timerQueue, queue, IntPtr.Zero) != IntPtr.Zero)
+                {
+                    UnmanagedMethods.DeleteTimerQueueEx(queue, IntPtr.Zero);
+                }
+            }
+        }
+
+        public RenderTimer(int framesPerSecond)
+            : base(framesPerSecond)
+        {
+        }
+
+        protected override IDisposable StartCore(Action<TimeSpan> tick)
+        {
+            EnsureTimerQueueCreated();
+            var msPerFrame = 1000 / FramesPerSecond;
+
+            timerDelegate = (_, __) => tick(TimeSpan.FromMilliseconds(Environment.TickCount));
+
+            UnmanagedMethods.CreateTimerQueueTimer(
+                out var timer,
+                _timerQueue,
+                timerDelegate,
+                IntPtr.Zero,
+                (uint)msPerFrame,
+                (uint)msPerFrame,
+                0
+                );
+
+            return Disposable.Create(() =>
+            {
+                timerDelegate = null;
+                UnmanagedMethods.DeleteTimerQueueTimer(_timerQueue, timer, IntPtr.Zero);
+            });
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/ScreenImpl.cs b/src/Windows/Avalonia.Win32/ScreenImpl.cs
index e1df24151d..5cfceb68b7 100644
--- a/src/Windows/Avalonia.Win32/ScreenImpl.cs
+++ b/src/Windows/Avalonia.Win32/ScreenImpl.cs
@@ -26,8 +26,8 @@ namespace Avalonia.Win32
                     EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero,
                         (IntPtr monitor, IntPtr hdcMonitor, ref Rect lprcMonitor, IntPtr data) =>
                         {
-                            MONITORINFO monitorInfo = new MONITORINFO();
-                            if (GetMonitorInfo(monitor, monitorInfo))
+                            MONITORINFO monitorInfo = MONITORINFO.Create();
+                            if (GetMonitorInfo(monitor,ref monitorInfo))
                             {
                                 RECT bounds = monitorInfo.rcMonitor;
                                 RECT workingArea = monitorInfo.rcWork;
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
new file mode 100644
index 0000000000..585e68056b
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -0,0 +1,26 @@
+using Avalonia.OpenGL;
+
+namespace Avalonia.Win32
+{
+    static class Win32GlManager
+    {
+        /// <summary>This property is initialized if drawing platform requests OpenGL support</summary>
+        public static EglGlPlatformFeature EglFeature { get; private set; }
+
+        private static bool s_attemptedToInitialize;
+
+        public static void Initialize()
+        {
+            AvaloniaLocator.CurrentMutable.Bind<IWindowingPlatformGlFeature>().ToFunc(() =>
+            {
+                if (!s_attemptedToInitialize)
+                {
+                    EglFeature = EglGlPlatformFeature.TryCreate();
+                    s_attemptedToInitialize = true;
+                }
+
+                return EglFeature;
+            });
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 9afb1218af..5041942c63 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -9,6 +9,7 @@ using System.IO;
 using System.Reactive.Disposables;
 using System.Runtime.InteropServices;
 using System.Threading;
+using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
@@ -76,17 +77,20 @@ namespace Avalonia.Win32
 
         public static void Initialize(bool deferredRendering = true)
         {
+            UnmanagedMethods.SetProcessDPIAware();
+
             AvaloniaLocator.CurrentMutable
                 .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<IStandardCursorFactory>().ToConstant(CursorFactory.Instance)
                 .Bind<IKeyboardDevice>().ToConstant(WindowsKeyboardDevice.Instance)
                 .Bind<IPlatformSettings>().ToConstant(s_instance)
                 .Bind<IPlatformThreadingInterface>().ToConstant(s_instance)
-                .Bind<IRenderLoop>().ToConstant(new RenderLoop(60))
+                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
+                .Bind<IRenderTimer>().ToConstant(new RenderTimer(60))
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogImpl>()
                 .Bind<IWindowingPlatform>().ToConstant(s_instance)
                 .Bind<IPlatformIconLoader>().ToConstant(s_instance);
-
+            Win32GlManager.Initialize();
             UseDeferredRendering = deferredRendering;
             _uiThread = UnmanagedMethods.GetCurrentThreadId();
 
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 292d8a8138..45120fa21b 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -10,6 +10,7 @@ using System.Runtime.InteropServices;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Win32.Input;
@@ -18,7 +19,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    public class WindowImpl : IWindowImpl
+    public class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
     {
         private static readonly List<WindowImpl> s_instances = new List<WindowImpl>();
 
@@ -37,6 +38,7 @@ namespace Avalonia.Win32
         private WindowState _showWindowState;
         private WindowState _lastWindowState;
         private FramebufferManager _framebuffer;
+        private IGlPlatformSurface _gl;
         private OleDropTarget _dropTarget;
         private Size _minSize;
         private Size _maxSize;
@@ -58,6 +60,10 @@ namespace Avalonia.Win32
 #endif
             CreateWindow();
             _framebuffer = new FramebufferManager(_hwnd);
+            if (Win32GlManager.EglFeature != null)
+                _gl = new EglGlPlatformSurface((EglDisplay)Win32GlManager.EglFeature.Display,
+                    Win32GlManager.EglFeature.DeferredContext, this);
+
             s_instances.Add(this);
         }
 
@@ -211,7 +217,7 @@ namespace Avalonia.Win32
 
         public IEnumerable<object> Surfaces => new object[]
         {
-            Handle, _framebuffer
+            Handle, _gl, _framebuffer
         };
 
         public void Activate()
@@ -831,9 +837,9 @@ namespace Avalonia.Win32
 
             if (monitor != IntPtr.Zero)
             {
-                MONITORINFO monitorInfo = new MONITORINFO();
+                MONITORINFO monitorInfo = MONITORINFO.Create();
 
-                if (GetMonitorInfo(monitor, monitorInfo))
+                if (GetMonitorInfo(monitor,ref monitorInfo))
                 {
                     RECT rcMonitorArea = monitorInfo.rcMonitor;
 
@@ -921,5 +927,18 @@ namespace Avalonia.Win32
 
             _topmost = value;
         }
+        
+        System.Drawing.Size EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.PixelSize
+        {
+            get
+            {
+                RECT rect;
+                GetClientRect(_hwnd, out rect);
+                return new System.Drawing.Size(
+                    Math.Max(1, rect.right - rect.left),
+                    Math.Max(1, rect.bottom - rect.top));
+            }
+        }
+        IntPtr EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Handle => Handle.Handle;
     }
 }
diff --git a/src/iOS/Avalonia.iOS/DisplayLinkRenderLoop.cs b/src/iOS/Avalonia.iOS/DisplayLinkRenderTimer.cs
similarity index 69%
rename from src/iOS/Avalonia.iOS/DisplayLinkRenderLoop.cs
rename to src/iOS/Avalonia.iOS/DisplayLinkRenderTimer.cs
index 4f275dd8ea..0cefba7f19 100644
--- a/src/iOS/Avalonia.iOS/DisplayLinkRenderLoop.cs
+++ b/src/iOS/Avalonia.iOS/DisplayLinkRenderTimer.cs
@@ -5,11 +5,12 @@ using Foundation;
 
 namespace Avalonia.iOS
 {
-    class DisplayLinkRenderLoop : IRenderLoop
+    class DisplayLinkRenderTimer : IRenderTimer
     {
-        public event EventHandler<EventArgs> Tick;
+        public event Action<TimeSpan> Tick;
         private CADisplayLink _link;
-        public DisplayLinkRenderLoop()
+
+        public DisplayLinkRenderTimer()
         {
 
             _link = CADisplayLink.Create(OnFrame);
@@ -20,7 +21,7 @@ namespace Avalonia.iOS
         {
             try
             {
-                Tick?.Invoke(this, new EventArgs());
+                Tick?.Invoke(TimeSpan.FromMilliseconds(Environment.TickCount));
             }
             catch (Exception)
             {
diff --git a/src/iOS/Avalonia.iOS/iOSPlatform.cs b/src/iOS/Avalonia.iOS/iOSPlatform.cs
index abaebca489..7b50040bf2 100644
--- a/src/iOS/Avalonia.iOS/iOSPlatform.cs
+++ b/src/iOS/Avalonia.iOS/iOSPlatform.cs
@@ -41,7 +41,8 @@ namespace Avalonia.iOS
                 .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance)
                 .Bind<IPlatformIconLoader>().ToSingleton<PlatformIconLoader>()
                 .Bind<IWindowingPlatform>().ToSingleton<WindowingPlatformImpl>()
-                .Bind<IRenderLoop>().ToSingleton<DisplayLinkRenderLoop>();
+                .Bind<IRenderTimer>().ToSingleton<DisplayLinkRenderTimer>()
+                .Bind<IRenderLoop>().ToSingleton<RenderLoop>();
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 4638aa84a5..23984a7c8d 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -479,6 +479,18 @@ namespace Avalonia.Base.UnitTests
             Assert.False(source.SetterCalled);
         }
 
+        [Fact]
+        public void Disposing_Completed_Binding_Does_Not_Throw()
+        {
+            var target = new Class1();
+            var source = new Subject<string>();
+            var subscription = target.Bind(Class1.FooProperty, source);
+
+            source.OnCompleted();
+
+            subscription.Dispose();
+        }
+
         /// <summary>
         /// Returns an observable that returns a single value but does not complete.
         /// </summary>
@@ -595,4 +607,4 @@ namespace Avalonia.Base.UnitTests
             public bool SetterCalled { get; private set; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 9a6a041ec7..0ac9392bc6 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -1,6 +1,10 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -42,5 +46,22 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Rect(6, 6, 0, 0), content.Bounds);
         }
+
+        [Fact]
+        public void Changing_Background_Brush_Color_Should_Invalidate_Visual()
+        {
+            var target = new Border()
+            {
+                Background = new SolidColorBrush(Colors.Red),
+            };
+
+            var root = new TestRoot(target);
+            var renderer = Mock.Get(root.Renderer);
+            renderer.ResetCalls();
+
+            ((SolidColorBrush)target.Background).Color = Colors.Green;
+
+            renderer.Verify(x => x.AddDirty(target), Times.Once);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index a5f5f8d328..1debccd3c5 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -1,16 +1,18 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
+using System.Collections.ObjectModel;
 using System.Linq;
+using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
-using Avalonia.Input;
+using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
-using Avalonia.Collections;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -170,9 +172,33 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Size(100, 10), target.Scroll.Viewport);
         }
 
+        [Fact]
+        public void Containers_Correct_After_Clear_Add_Remove()
+        {
+            // Issue #1936
+            var items = new AvaloniaList<string>(Enumerable.Range(0, 11).Select(x => $"Item {x}"));
+            var target = new ListBox
+            {
+                Template = ListBoxTemplate(),
+                Items = items,
+                ItemTemplate = new FuncDataTemplate<string>(x => new TextBlock { Width = 20, Height = 10 }),
+                SelectedIndex = 0,
+            };
+
+            Prepare(target);
+
+            items.Clear();
+            items.AddRange(Enumerable.Range(0, 11).Select(x => $"Item {x}"));
+            items.Remove("Item 2");
+
+            Assert.Equal(
+                items,
+                target.Presenter.Panel.Children.Cast<ListBoxItem>().Select(x => (string)x.Content));
+        }
+
         private FuncControlTemplate ListBoxTemplate()
         {
-            return new FuncControlTemplate<ListBox>(parent => 
+            return new FuncControlTemplate<ListBox>(parent =>
                 new ScrollViewer
                 {
                     Name = "PART_ScrollViewer",
@@ -189,7 +215,7 @@ namespace Avalonia.Controls.UnitTests
 
         private FuncControlTemplate ListBoxItemTemplate()
         {
-            return new FuncControlTemplate<ListBoxItem>(parent => 
+            return new FuncControlTemplate<ListBoxItem>(parent =>
                 new ContentPresenter
                 {
                     Name = "PART_ContentPresenter",
diff --git a/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs
new file mode 100644
index 0000000000..e7352af23e
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class MenuItemTests
+    {
+        [Fact]
+        public void Header_Of_Minus_Should_Apply_Separator_Pseudoclass()
+        {
+            var target = new MenuItem { Header = "-" };
+
+            Assert.True(target.Classes.Contains(":separator"));
+        }
+
+        [Fact]
+        public void Separator_Item_Should_Set_Focusable_False()
+        {
+            var target = new MenuItem { Header = "-" };
+
+            Assert.False(target.Focusable);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/PanelTests.cs b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
index ed239120d6..4a404ea97e 100644
--- a/tests/Avalonia.Controls.UnitTests/PanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
@@ -3,7 +3,11 @@
 
 using System.Linq;
 using Avalonia.LogicalTree;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
 using Avalonia.VisualTree;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -115,5 +119,22 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new[] { child2, child1 }, panel.GetLogicalChildren());
             Assert.Equal(new[] { child2, child1 }, panel.GetVisualChildren());
         }
+
+        [Fact]
+        public void Changing_Background_Brush_Color_Should_Invalidate_Visual()
+        {
+            var target = new Panel()
+            {
+                Background = new SolidColorBrush(Colors.Red),
+            };
+
+            var root = new TestRoot(target);
+            var renderer = Mock.Get(root.Renderer);
+            renderer.ResetCalls();
+
+            ((SolidColorBrush)target.Background).Color = Colors.Green;
+
+            renderer.Verify(x => x.AddDirty(target), Times.Once);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index 6716456c78..9d65f2cba7 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@@ -13,6 +13,7 @@ using System;
 using System.Linq;
 using Xunit;
 using Avalonia.Rendering;
+using Avalonia.Media;
 
 namespace Avalonia.Controls.UnitTests.Presenters
 {
@@ -203,5 +204,22 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.NotEqual(foo, logicalChildren.First());
         }
 
+
+        [Fact]
+        public void Changing_Background_Brush_Color_Should_Invalidate_Visual()
+        {
+            var target = new ContentPresenter()
+            {
+                Background = new SolidColorBrush(Colors.Red),
+            };
+
+            var root = new TestRoot(target);
+            var renderer = Mock.Get(root.Renderer);
+            renderer.ResetCalls();
+
+            ((SolidColorBrush)target.Background).Color = Colors.Green;
+
+            renderer.Verify(x => x.AddDirty(target), Times.Once);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 14e1b15ebc..bbe1d85acb 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -707,6 +707,26 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.True(target.SelectedIndex == 1);
         }
 
+        [Fact]
+        public void Binding_With_DelayedBinding_And_Initialization_Where_DataContext_Is_Root_Works()
+        {
+            // Test for #1932.
+            var root = new RootWithItems();
+
+            root.BeginInit();
+            root.DataContext = root;
+
+            var target = new ListBox();
+            target.BeginInit();
+            root.Child = target;
+
+            DelayedBinding.Add(target, ItemsControl.ItemsProperty, new Binding(nameof(RootWithItems.Items)));
+            DelayedBinding.Add(target, ListBox.SelectedItemProperty, new Binding(nameof(RootWithItems.Selected)));
+            target.EndInit();
+            root.EndInit();
+
+            Assert.Equal("b", target.SelectedItem);
+        }
 
         private FuncControlTemplate Template()
         {
@@ -745,5 +765,11 @@ namespace Avalonia.Controls.UnitTests.Primitives
             public IList<Item> Items { get; set; }
             public Item SelectedItem { get; set; }
         }
+
+        private class RootWithItems : TestRoot
+        {
+            public List<string> Items { get; set; } = new List<string>() { "a", "b", "c", "d", "e" };
+            public string Selected { get; set; } = "b";
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index 3c6b278e07..9ef7d567c8 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -541,6 +541,35 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.True(called);
         }
 
+        [Fact]
+        public void Replacing_SelectedItems_Should_Raise_SelectionChanged_With_CorrectItems()
+        {
+            var items = new[] { "foo", "bar", "baz" };
+
+            var target = new TestSelector
+            {
+                Items = items,
+                Template = Template(),
+                SelectedItem = "bar",
+            };
+
+            var called = false;
+
+            target.SelectionChanged += (s, e) =>
+            {
+                Assert.Equal(new[] { "foo",}, e.AddedItems.Cast<object>());
+                Assert.Equal(new[] { "bar" }, e.RemovedItems.Cast<object>());
+                called = true;
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+            target.SelectedItems[0] = "foo";
+
+            Assert.True(called);
+        }
+
+
         private FuncControlTemplate Template()
         {
             return new FuncControlTemplate<SelectingItemsControl>(control =>
diff --git a/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs b/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
new file mode 100644
index 0000000000..0ec73edec0
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Shapes
+{
+    public class RectangleTests
+    {
+        [Fact]
+        public void Changing_Fill_Brush_Color_Should_Invalidate_Visual()
+        {
+            var target = new Rectangle()
+            {
+                Fill = new SolidColorBrush(Colors.Red),
+            };
+
+            var root = new TestRoot(target);
+            var renderer = Mock.Get(root.Renderer);
+            renderer.ResetCalls();
+
+            ((SolidColorBrush)target.Fill).Color = Colors.Green;
+
+            renderer.Verify(x => x.AddDirty(target), Times.Once);
+        }
+
+        [Fact]
+        public void Changing_Stroke_Brush_Color_Should_Invalidate_Visual()
+        {
+            var target = new Rectangle()
+            {
+                Stroke = new SolidColorBrush(Colors.Red),
+            };
+
+            var root = new TestRoot(target);
+            var renderer = Mock.Get(root.Renderer);
+            renderer.ResetCalls();
+
+            ((SolidColorBrush)target.Stroke).Color = Colors.Green;
+
+            renderer.Verify(x => x.AddDirty(target), Times.Once);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
index 9a1140fc05..45e683455b 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
@@ -2,6 +2,10 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -25,5 +29,39 @@ namespace Avalonia.Controls.UnitTests
                 "",
                 textBlock.Text);
         }
+
+        [Fact]
+        public void Changing_Background_Brush_Color_Should_Invalidate_Visual()
+        {
+            var target = new TextBlock()
+            {
+                Background = new SolidColorBrush(Colors.Red),
+            };
+
+            var root = new TestRoot(target);
+            var renderer = Mock.Get(root.Renderer);
+            renderer.ResetCalls();
+
+            ((SolidColorBrush)target.Background).Color = Colors.Green;
+
+            renderer.Verify(x => x.AddDirty(target), Times.Once);
+        }
+
+        [Fact]
+        public void Changing_Foreground_Brush_Color_Should_Invalidate_Visual()
+        {
+            var target = new TextBlock()
+            {
+                Foreground = new SolidColorBrush(Colors.Red),
+            };
+
+            var root = new TestRoot(target);
+            var renderer = Mock.Get(root.Renderer);
+            renderer.ResetCalls();
+
+            ((SolidColorBrush)target.Foreground).Color = Colors.Green;
+
+            renderer.Verify(x => x.AddDirty(target), Times.Once);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 4a8c171ecf..0d87f6d0fe 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -8,7 +8,6 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
-using Avalonia.Markup.Data;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
@@ -322,6 +321,71 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void SelectionEnd_Doesnt_Cause_Exception()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123456789"
+                };
+
+                target.SelectionStart = 0;
+                target.SelectionEnd = 9;
+
+                target.Text = "123";
+
+                RaiseTextEvent(target, "456");
+
+                Assert.True(true);
+            }
+        }
+
+        [Fact]
+        public void SelectionStart_Doesnt_Cause_Exception()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123456789"
+                };
+
+                target.SelectionStart = 8;
+                target.SelectionEnd = 9;
+
+                target.Text = "123";
+
+                RaiseTextEvent(target, "456");
+
+                Assert.True(true);
+            }
+        }
+
+        [Fact]
+        public void SelectionStartEnd_Are_Valid_AterTextChange()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123456789"
+                };
+
+                target.SelectionStart = 8;
+                target.SelectionEnd = 9;
+
+                target.Text = "123";
+
+                Assert.True(target.SelectionStart <= "123".Length);
+                Assert.True(target.SelectionEnd <= "123".Length);
+            }
+        }
+
         private static TestServices Services => TestServices.MockThreadingInterface.With(
             standardCursorFactory: Mock.Of<IStandardCursorFactory>());
 
@@ -351,6 +415,15 @@ namespace Avalonia.Controls.UnitTests
             });
         }
 
+        private void RaiseTextEvent(TextBox textBox, string text)
+        {
+            textBox.RaiseEvent(new TextInputEventArgs
+            {
+                RoutedEvent = InputElement.TextInputEvent,
+                Text = text
+            });
+        }
+
         private class Class1 : NotifyingBase
         {
             private int _foo;
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj b/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj
new file mode 100644
index 0000000000..7c0ff79183
--- /dev/null
+++ b/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <Import Project="..\..\build\UnitTests.NetCore.targets" />
+  <Import Project="..\..\build\Moq.props" />
+  <Import Project="..\..\build\XUnit.props" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj"/>
+  </ItemGroup>
+</Project>
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
new file mode 100644
index 0000000000..97701f8437
--- /dev/null
+++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Reactive.Concurrency;
+using System.Reactive.Disposables;
+using Avalonia.Controls;
+using Avalonia.Rendering;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Avalonia;
+using ReactiveUI;
+using DynamicData;
+using Xunit;
+using Splat;
+
+namespace Avalonia 
+{
+    public class AvaloniaActivationForViewFetcherTest
+    {
+        public class TestUserControl : UserControl, IActivatable { }
+
+        public class TestUserControlWithWhenActivated : UserControl, IActivatable
+        {
+            public bool Active { get; private set; }
+
+            public TestUserControlWithWhenActivated()
+            {
+                this.WhenActivated(disposables => {
+                    Active = true;
+                    Disposable
+                        .Create(() => Active = false)
+                        .DisposeWith(disposables);
+                });
+            }
+        }
+
+        [Fact]
+        public void Visual_Element_Is_Activated_And_Deactivated()
+        {
+            var userControl = new TestUserControl();
+            var activationForViewFetcher = new AvaloniaActivationForViewFetcher();
+
+            activationForViewFetcher
+                .GetActivationForView(userControl)
+                .ToObservableChangeSet(scheduler: ImmediateScheduler.Instance)
+                .Bind(out var activated)
+                .Subscribe();
+
+            var fakeRenderedDecorator = new TestRoot();
+            fakeRenderedDecorator.Child = userControl;
+            Assert.True(activated[0]);
+            Assert.Equal(1, activated.Count);
+
+            fakeRenderedDecorator.Child = null;
+            Assert.True(activated[0]);
+            Assert.False(activated[1]);
+            Assert.Equal(2, activated.Count);
+        }
+
+        [Fact]
+        public void Get_Affinity_For_View_Should_Return_Non_Zero_For_Visual_Elements() 
+        {
+            var userControl = new TestUserControl();
+            var activationForViewFetcher = new AvaloniaActivationForViewFetcher();
+
+            var forUserControl = activationForViewFetcher.GetAffinityForView(userControl.GetType());
+            var forNonUserControl = activationForViewFetcher.GetAffinityForView(typeof(object));
+
+            Assert.NotEqual(0, forUserControl);
+            Assert.Equal(0, forNonUserControl);
+        }
+
+        [Fact]
+        public void Activation_For_View_Fetcher_Should_Support_When_Activated()
+        {
+            Locator.CurrentMutable.RegisterConstant(
+                new AvaloniaActivationForViewFetcher(), 
+                typeof(IActivationForViewFetcher));
+
+            var userControl = new TestUserControlWithWhenActivated();
+            Assert.False(userControl.Active);
+
+            var fakeRenderedDecorator = new TestRoot();
+            fakeRenderedDecorator.Child = userControl;
+            Assert.True(userControl.Active);
+
+            fakeRenderedDecorator.Child = null;
+            Assert.False(userControl.Active);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
index 8356e78cc3..6a01536b12 100644
--- a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
@@ -124,7 +124,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                     {
                         StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
                         EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
-                        GradientStops = new[]
+                        GradientStops =
                         {
                             new GradientStop(Color.FromUInt32(0xffffffff), 0),
                             new GradientStop(Color.FromUInt32(0x00ffffff), 1)
diff --git a/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs b/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs
index 656e77fc31..a0d6f1e423 100644
--- a/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                     {
                         StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
                         EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
-                        GradientStops = new[]
+                        GradientStops =
                         {
                             new GradientStop { Color = Colors.Red, Offset = 0 },
                             new GradientStop { Color = Colors.Blue, Offset = 1 }
@@ -63,7 +63,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                     {
                         StartPoint = new RelativePoint(0.5, 0, RelativeUnit.Relative),
                         EndPoint = new RelativePoint(0.5, 1, RelativeUnit.Relative),
-                        GradientStops = new[]
+                        GradientStops =
                         {
                             new GradientStop { Color = Colors.Red, Offset = 0 },
                             new GradientStop { Color = Colors.Blue, Offset = 1 }
diff --git a/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs b/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs
index 0017feb106..bd1d26ce70 100644
--- a/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 {
                     Background = new RadialGradientBrush
                     {
-                        GradientStops = new[]
+                        GradientStops =
                         {
                             new GradientStop { Color = Colors.Red, Offset = 0 },
                             new GradientStop { Color = Colors.Blue, Offset = 1 }
diff --git a/tests/Avalonia.RenderTests/OpacityMaskTests.cs b/tests/Avalonia.RenderTests/OpacityMaskTests.cs
index 4edf4daa13..2f01b03db6 100644
--- a/tests/Avalonia.RenderTests/OpacityMaskTests.cs
+++ b/tests/Avalonia.RenderTests/OpacityMaskTests.cs
@@ -29,7 +29,7 @@ namespace Avalonia.Direct2D1.RenderTests
                 {
                     StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
                     EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
-                    GradientStops = new List<GradientStop>
+                    GradientStops =
                     {
                         new GradientStop(Color.FromUInt32(0xffffffff), 0),
                         new GradientStop(Color.FromUInt32(0x00ffffff), 1)
@@ -65,7 +65,7 @@ namespace Avalonia.Direct2D1.RenderTests
                 {
                     StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
                     EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
-                    GradientStops = new List<GradientStop>
+                    GradientStops =
                     {
                         new GradientStop(Color.FromUInt32(0xffffffff), 0),
                         new GradientStop(Color.FromUInt32(0x00ffffff), 1)
diff --git a/tests/Avalonia.UnitTests/TestRoot.cs b/tests/Avalonia.UnitTests/TestRoot.cs
index 884df33fc0..972b1d78c0 100644
--- a/tests/Avalonia.UnitTests/TestRoot.cs
+++ b/tests/Avalonia.UnitTests/TestRoot.cs
@@ -19,6 +19,13 @@ namespace Avalonia.UnitTests
 
         public TestRoot()
         {
+            Renderer = Mock.Of<IRenderer>();
+        }
+
+        public TestRoot(IControl child)
+            : this()
+        {
+            Child = child;
         }
 
         event EventHandler<NameScopeEventArgs> INameScope.Registered
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index d990defe3d..d68f1d167a 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -64,7 +64,7 @@ namespace Avalonia.UnitTests
             Func<IMouseDevice> mouseDevice = null,
             IRuntimePlatform platform = null,
             IPlatformRenderInterface renderInterface = null,
-            IRenderLoop renderLoop = null,
+            IRenderTimer renderLoop = null,
             IScheduler scheduler = null,
             IStandardCursorFactory standardCursorFactory = null,
             IStyler styler = null,
@@ -115,7 +115,7 @@ namespace Avalonia.UnitTests
             Func<IMouseDevice> mouseDevice = null,
             IRuntimePlatform platform = null,
             IPlatformRenderInterface renderInterface = null,
-            IRenderLoop renderLoop = null,
+            IRenderTimer renderLoop = null,
             IScheduler scheduler = null,
             IStandardCursorFactory standardCursorFactory = null,
             IStyler styler = null,
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs
new file mode 100644
index 0000000000..ff7b94105a
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media
+{
+    public class ImageBrushTests
+    {
+        [Fact]
+        public void Changing_Source_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new ImageBrush(bitmap1);
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Source = bitmap2;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs
new file mode 100644
index 0000000000..b3f78dfe8f
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs
@@ -0,0 +1,86 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media
+{
+    public class LinearGradientBrushTests
+    {
+        [Fact]
+        public void Changing_StartPoint_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.StartPoint = new RelativePoint();
+            target.Invalidated += (s, e) => raised = true;
+            target.StartPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_EndPoint_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.EndPoint = new RelativePoint();
+            target.Invalidated += (s, e) => raised = true;
+            target.EndPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_GradientStops_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Green, 0) };
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Adding_GradientStop_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops.Add(new GradientStop(Colors.Green, 1));
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_GradientStop_Offset_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops[0].Offset = 0.5;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
index 8dca52e6a7..5570378063 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
@@ -9,6 +9,8 @@ namespace Avalonia.Visuals.UnitTests.Media
 {
     using System.Globalization;
     using System.IO;
+    using Avalonia.Platform;
+    using Moq;
 
     public class PathMarkupParserTests
     {
@@ -18,7 +20,7 @@ namespace Avalonia.Visuals.UnitTests.Media
             var pathGeometry = new PathGeometry();
             using (var context = new PathGeometryContext(pathGeometry))
             using (var parser = new PathMarkupParser(context))
-            {               
+            {
                 parser.Parse("M10 10");
 
                 var figure = pathGeometry.Figures[0];
@@ -202,6 +204,25 @@ namespace Avalonia.Visuals.UnitTests.Media
             }
         }
 
+        [Theory]
+        [InlineData("M0 0L10 10")]
+        [InlineData("M0 0L10 10z")]
+        [InlineData("M0 0L10 10 \n ")]
+        [InlineData("M0 0L10 10z \n ")]
+        [InlineData("M0 0L10 10 ")]
+        [InlineData("M0 0L10 10z ")]
+        public void Should_AlwaysEndFigure(string pathData)
+        {
+            var context = new Mock<IGeometryContext>();
+
+            using (var parser = new PathMarkupParser(context.Object))
+            {
+                parser.Parse(pathData);
+            }
+
+            context.Verify(v => v.EndFigure(It.IsAny<bool>()), Times.AtLeastOnce());
+        }
+
         [Theory]
         [InlineData("0 0")]
         [InlineData("j")]
@@ -215,4 +236,4 @@ namespace Avalonia.Visuals.UnitTests.Media
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs
new file mode 100644
index 0000000000..bcf63f9660
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs
@@ -0,0 +1,21 @@
+using System;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media
+{
+    public class SolidColorBrushTests
+    {
+        [Fact]
+        public void Changing_Color_Raises_Invalidated()
+        {
+            var target = new SolidColorBrush(Colors.Red);
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Color = Colors.Green;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index 2350a31d5c..8c103360d4 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Subjects;
-
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Media;
@@ -22,27 +22,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 {
     public class DeferredRendererTests
     {
-        [Fact]
-        public void First_Frame_Calls_UpdateScene_On_Dispatcher()
-        {
-            var root = new TestRoot();
-
-            var dispatcher = new Mock<IDispatcher>();
-            dispatcher.Setup(x => x.Post(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback<Action, DispatcherPriority>((a, p) => a());
-
-            CreateTargetAndRunFrame(root, dispatcher: dispatcher.Object);
-
-            dispatcher.Verify(x => 
-                x.Post(
-                    It.Is<Action>(a => a.Method.Name == "UpdateScene"),
-                    DispatcherPriority.Render));
-        }
-
         [Fact]
         public void First_Frame_Calls_SceneBuilder_UpdateAll()
         {
-            var loop = new Mock<IRenderLoop>();
             var root = new TestRoot();
             var sceneBuilder = MockSceneBuilder(root);
 
@@ -54,6 +36,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void Frame_Does_Not_Call_SceneBuilder_If_No_Dirty_Controls()
         {
+            var dispatcher = new ImmediateDispatcher();
             var loop = new Mock<IRenderLoop>();
             var root = new TestRoot();
             var sceneBuilder = MockSceneBuilder(root);
@@ -63,8 +46,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 sceneBuilder: sceneBuilder.Object);
 
             target.Start();
-            IgnoreFirstFrame(loop, sceneBuilder);
-            RunFrame(loop);
+            IgnoreFirstFrame(target, sceneBuilder);
+            RunFrame(target);
 
             sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()), Times.Never);
             sceneBuilder.Verify(x => x.Update(It.IsAny<Scene>(), It.IsAny<Visual>()), Times.Never);
@@ -73,8 +56,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void Should_Update_Dirty_Controls_In_Order()
         {
-            var loop = new Mock<IRenderLoop>();
             var dispatcher = new ImmediateDispatcher();
+            var loop = new Mock<IRenderLoop>();
 
             Border border;
             Decorator decorator;
@@ -98,7 +81,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 dispatcher: dispatcher);
 
             target.Start();
-            IgnoreFirstFrame(loop, sceneBuilder);
+            IgnoreFirstFrame(target, sceneBuilder);
             target.AddDirty(border);
             target.AddDirty(canvas);
             target.AddDirty(root);
@@ -108,7 +91,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             sceneBuilder.Setup(x => x.Update(It.IsAny<Scene>(), It.IsAny<IVisual>()))
                 .Callback<Scene, IVisual>((_, v) => result.Add(v));
 
-            RunFrame(loop);
+            RunFrame(target);
 
             Assert.Equal(new List<IVisual> { root, decorator, border, canvas }, result);
         }
@@ -198,7 +181,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void Should_Create_Layer_For_Root()
         {
-            var loop = new Mock<IRenderLoop>();
             var root = new TestRoot();
             var rootLayer = new Mock<IRenderTargetBitmapImpl>();
 
@@ -239,19 +221,19 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             root.Measure(Size.Infinity);
             root.Arrange(new Rect(root.DesiredSize));
 
-            var loop = new Mock<IRenderLoop>();
-            var target = CreateTargetAndRunFrame(root, loop: loop);
+            var timer = new Mock<IRenderTimer>();
+            var target = CreateTargetAndRunFrame(root, timer);
 
             Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
 
             var animation = new BehaviorSubject<double>(0.5);
             border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-            RunFrame(loop);
+            RunFrame(target);
 
             Assert.Equal(new IVisual[] { root, border }, target.Layers.Select(x => x.LayerRoot));
 
             animation.OnCompleted();
-            RunFrame(loop);
+            RunFrame(target);
 
             Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
         }
@@ -280,8 +262,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             root.Measure(Size.Infinity);
             root.Arrange(new Rect(root.DesiredSize));
 
-            var loop = new Mock<IRenderLoop>();
-            var target = CreateTargetAndRunFrame(root, loop: loop);
+            var timer = new Mock<IRenderTimer>();
+            var target = CreateTargetAndRunFrame(root, timer);
 
             Assert.Single(target.Layers);
         }
@@ -345,19 +327,20 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 
         private DeferredRenderer CreateTargetAndRunFrame(
             TestRoot root,
-            Mock<IRenderLoop> loop = null,
+            Mock<IRenderTimer> timer = null,
             ISceneBuilder sceneBuilder = null,
             IDispatcher dispatcher = null)
         {
-            loop = loop ?? new Mock<IRenderLoop>();
+            timer = timer ?? new Mock<IRenderTimer>();
+            dispatcher = dispatcher ?? new ImmediateDispatcher();
             var target = new DeferredRenderer(
                 root,
-                loop.Object,
+                new RenderLoop(timer.Object, dispatcher),
                 sceneBuilder: sceneBuilder,
-                dispatcher: dispatcher ?? new ImmediateDispatcher());
+                dispatcher: dispatcher);
             root.Renderer = target;
             target.Start();
-            RunFrame(loop);
+            RunFrame(target);
             return target;
         }
 
@@ -366,15 +349,16 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
         }
 
-        private void IgnoreFirstFrame(Mock<IRenderLoop> loop, Mock<ISceneBuilder> sceneBuilder)
+        private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
         {
-            RunFrame(loop);
+            RunFrame(task);
             sceneBuilder.ResetCalls();
         }
 
-        private void RunFrame(Mock<IRenderLoop> loop)
+        private void RunFrame(IRenderLoopTask task)
         {
-            loop.Raise(x => x.Tick += null, EventArgs.Empty);
+            task.Update(TimeSpan.Zero);
+            task.Render();
         }
 
         private IRenderTargetBitmapImpl CreateLayer()
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs
new file mode 100644
index 0000000000..e9aefc46e6
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Rendering;
+using Avalonia.Threading;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Rendering
+{
+    public class RenderLoopTests
+    {
+        [Fact]
+        public void RenderLoop_Update_Runs_On_Dispatcher()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+
+            bool inDispatcher = false;
+
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) =>
+                {
+                    inDispatcher = true;
+                    a();
+                    inDispatcher = false;
+                });
+
+            var timer = new Mock<IRenderTimer>();
+
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+
+            var renderTask = new Mock<IRenderLoopTask>();
+
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+            renderTask.Setup(t => t.Update(It.IsAny<TimeSpan>()))
+                .Callback((TimeSpan _) => Assert.True(inDispatcher));
+
+            loop.Add(renderTask.Object);
+
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
+        }
+
+        [Fact]
+        public void RenderLoop_Does_Not_Update_When_No_Tasks_Need_Update()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            dispatcher.Setup(
+                d => d.InvokeAsync(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) => a())
+                .Returns(Task.CompletedTask);
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+            var renderTask = new Mock<IRenderLoopTask>();
+            renderTask.Setup(t => t.NeedsUpdate).Returns(false);
+
+            loop.Add(renderTask.Object);
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+            
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Never());
+        }
+
+        [Fact]
+        public void RenderLoop_Render_Runs_Off_Dispatcher()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            bool inDispatcher = false;
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) =>
+                {
+                    inDispatcher = true;
+                    a();
+                    inDispatcher = false;
+                });
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+
+            var renderTask = new Mock<IRenderLoopTask>();
+
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+            renderTask.Setup(t => t.Render())
+                .Callback(() => Assert.False(inDispatcher));
+
+            loop.Add(renderTask.Object);
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
+        }
+        
+        [Fact]
+        public void RenderLoop_Passes_Tick_Count_To_Update()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) => a());
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+            var renderTask = new Mock<IRenderLoopTask>();
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+
+            loop.Add(renderTask.Object);
+            var time = new TimeSpan(123456789L);
+            timer.Raise(t => t.Tick += null, time);
+
+            renderTask.Verify(t => t.Update(time), Times.Once());
+        }
+    }
+}