diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..bff594a46a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,27 @@
+language: csharp
+mono:
+  - nightly
+solution: Avalonia.mono.sln
+before_install:
+  - mkdir -p .nuget
+  - wget -O .nuget/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+install:
+  - sudo apt-get install -y gtk-sharp2
+  - mono .nuget/nuget.exe restore Avalonia.mono.sln
+  - mono .nuget/nuget.exe install xunit.runner.console -Version 2.1.0 -OutputDirectory testrunner
+script:
+  - xbuild /p:Configuration=Release Avalonia.mono.sln
+  - mono ./testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ./tests/Avalonia.Base.UnitTests/bin/Release/Avalonia.Base.UnitTests.dll
+  - mono ./testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ./tests/Avalonia.Input.UnitTests/bin/Release/Avalonia.Input.UnitTests.dll
+  - mono ./testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ./tests/Avalonia.Interactivity.UnitTests/bin/Release/Avalonia.Interactivity.UnitTests.dll
+  - mono ./testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ./tests/Avalonia.Layout.UnitTests/bin/Release/Avalonia.Layout.UnitTests.dll
+  - mono ./testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ./tests/Avalonia.Markup.UnitTests/bin/Release/Avalonia.Markup.UnitTests.dll
+  - mono ./testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ./tests/Avalonia.Styling.UnitTests/bin/Release/Avalonia.Styling.UnitTests.dll
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/98f653320ef2b7506c05
+    on_success: change
+    on_failure: always
+    on_start: never
diff --git a/Avalonia.mono.sln b/Avalonia.mono.sln
new file mode 100644
index 0000000000..a1997ff135
--- /dev/null
+++ b/Avalonia.mono.sln
@@ -0,0 +1,1365 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.SceneGraph", "src\Avalonia.SceneGraph\Avalonia.SceneGraph.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Layout", "src\Avalonia.Layout\Avalonia.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B39A8919-9F95-48FE-AD7B-76E08B509888}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Input", "src\Avalonia.Input\Avalonia.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Interactivity", "src\Avalonia.Interactivity\Avalonia.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Styling", "src\Avalonia.Styling\Avalonia.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Themes.Default", "src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Diagnostics", "src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Animation", "src\Avalonia.Animation\Avalonia.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Styling.UnitTests", "tests\Avalonia.Styling.UnitTests\Avalonia.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Controls.UnitTests", "tests\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.SceneGraph.UnitTests", "tests\Avalonia.SceneGraph.UnitTests\Avalonia.SceneGraph.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base.UnitTests", "tests\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Layout.UnitTests", "tests\Avalonia.Layout.UnitTests\Avalonia.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Interactivity.UnitTests", "tests\Avalonia.Interactivity.UnitTests\Avalonia.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Input.UnitTests", "tests\Avalonia.Input.UnitTests\Avalonia.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Cairo.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Cairo.RenderTests.csproj", "{E106CF37-4066-4615-B684-172A6D30B058}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup.Xaml.UnitTests", "tests\Avalonia.Markup.Xaml.UnitTests\Avalonia.Markup.Xaml.UnitTests.csproj", "{99135EAB-653D-47E4-A378-C96E1278CA44}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markup", "Markup", "{8B6A8209-894F-4BA1-B880-965FD453982C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup.Xaml", "src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9B9E3891-2366-4253-A952-D08BCEB71098}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "samples\TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C} = {FB05AC90-89BA-4F2F-A924-F37875FB547C}
+		{54F237D5-A70A-4752-9656-0C70B1A7B047} = {54F237D5-A70A-4752-9656-0C70B1A7B047}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplication", "samples\XamlTestApplication\XamlTestApplication.csproj", "{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C} = {FB05AC90-89BA-4F2F-A924-F37875FB547C}
+		{54F237D5-A70A-4752-9656-0C70B1A7B047} = {54F237D5-A70A-4752-9656-0C70B1A7B047}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DEF5-D50F-4975-8B72-124C9EB54066}"
+	ProjectSection(SolutionItems) = preProject
+		src\Shared\SharedAssemblyInfo.cs = src\Shared\SharedAssemblyInfo.cs
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gtk", "Gtk", "{B9894058-278A-46B5-B6ED-AD613FCC03B3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Gtk", "src\Gtk\Avalonia.Gtk\Avalonia.Gtk.csproj", "{54F237D5-A70A-4752-9656-0C70B1A7B047}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Cairo", "src\Gtk\Avalonia.Cairo\Avalonia.Cairo.csproj", "{FB05AC90-89BA-4F2F-A924-F37875FB547C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.ReactiveUI", "src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj", "{6417B24E-49C2-4985-8DB2-3AB9D898EC91}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.HtmlRenderer", "src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj", "{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformSupport", "src\Shared\PlatformSupport\PlatformSupport.shproj", "{E4D9629C-F168-4224-3F51-A5E482FFBC42}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup", "src\Markup\Avalonia.Markup\Avalonia.Markup.csproj", "{6417E941-21BC-467B-A771-0DE389353CE6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup.UnitTests", "tests\Avalonia.Markup.UnitTests\Avalonia.Markup.UnitTests.csproj", "{8EF392D5-1416-45AA-9956-7CBBC3229E8A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BindingTest", "samples\BindingTest\BindingTest.csproj", "{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9} = {B61B66A3-B82D-4875-8001-89D3394FE0C9}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplicationPcl", "samples\XamlTestApplicationPcl\XamlTestApplicationPcl.csproj", "{EA113F1A-D8D7-4142-9948-353270E7EBAE}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RenderHelpers", "src\Shared\RenderHelpers\RenderHelpers.shproj", "{3C4C0CB4-0C0F-4450-A37B-148C84FF905F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skia", "Skia", "{3743B0F2-CC41-4F14-A8C8-267F579BF91E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestApplicationShared", "samples\TestApplicationShared\TestApplicationShared.shproj", "{78345174-5B52-4A14-B9FD-D5F2428137F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.UnitTests", "tests\Avalonia.UnitTests\Avalonia.UnitTests.csproj", "{88060192-33D5-4932-B0F9-8BD2763E857D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Benchmarks", "tests\Avalonia.Benchmarks\Avalonia.Benchmarks.csproj", "{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Logging.Serilog", "src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj", "{B61B66A3-B82D-4875-8001-89D3394FE0C9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport", "src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{D0A739B9-3C68-4BA6-A328-41606954B6BD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{52F55355-D120-42AC-8116-8410A7D602FA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualizationTest", "samples\VirtualizationTest\VirtualizationTest.csproj", "{FBCAF3D0-2808-4934-8E96-3F607594517B}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{e106cf37-4066-4615-b684-172a6d30b058}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{db070a10-bf39-4752-8456-86e9d5928478}*SharedItemsImports = 4
+		samples\TestApplicationShared\TestApplicationShared.projitems*{78345174-5b52-4a14-b9fd-d5f2428137f0}*SharedItemsImports = 13
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{54f237d5-a70a-4752-9656-0c70b1a7b047}*SharedItemsImports = 4
+		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{88060192-33d5-4932-b0f9-8bd2763e857d}*SharedItemsImports = 4
+		samples\TestApplicationShared\TestApplicationShared.projitems*{e3a1060b-50d0-44e8-88b6-f44ef2e5bd72}*SharedItemsImports = 4
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
+		Ad-Hoc|iPhone = Ad-Hoc|iPhone
+		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+		Ad-Hoc|x86 = Ad-Hoc|x86
+		AppStore|Any CPU = AppStore|Any CPU
+		AppStore|iPhone = AppStore|iPhone
+		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+		AppStore|x86 = AppStore|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|x86.Build.0 = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|x86.Build.0 = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhone.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|x86.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|x86.Build.0 = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhone.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|x86.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|x86.Build.0 = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|x86.Build.0 = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhone.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|x86.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|x86.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|x86.Build.0 = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|x86.Build.0 = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhone.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|x86.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|x86.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|x86.Build.0 = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|x86.Build.0 = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhone.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|x86.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|x86.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|x86.Build.0 = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|x86.Build.0 = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhone.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|x86.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|x86.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|x86.Build.0 = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|x86.Build.0 = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhone.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|x86.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|x86.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|x86.Build.0 = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|x86.Build.0 = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhone.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|x86.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|x86.Build.0 = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|x86.Build.0 = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhone.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|x86.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|x86.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|x86.Build.0 = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|x86.Build.0 = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhone.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|x86.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|x86.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|x86.Build.0 = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|x86.Build.0 = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhone.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|x86.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|x86.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|x86.Build.0 = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhone.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|x86.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|x86.Build.0 = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|x86.Build.0 = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhone.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|x86.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|x86.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|x86.Build.0 = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|x86.Build.0 = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhone.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|x86.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|x86.Build.0 = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhone.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|x86.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|x86.Build.0 = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|x86.Build.0 = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhone.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|x86.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.AppStore|x86.Build.0 = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|x86.Build.0 = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|iPhone.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|x86.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|x86.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|x86.Build.0 = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|x86.Build.0 = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|x86.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|x86.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|x86.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.AppStore|x86.Build.0 = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|iPhone.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|x86.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.AppStore|x86.Build.0 = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|x86.Build.0 = Debug|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|iPhone.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|x86.ActiveCfg = Release|Any CPU
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|x86.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.AppStore|x86.Build.0 = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|x86.Build.0 = Debug|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|iPhone.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|x86.ActiveCfg = Release|Any CPU
+		{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|x86.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.AppStore|x86.Build.0 = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|x86.Build.0 = Debug|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|iPhone.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|x86.ActiveCfg = Release|Any CPU
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|x86.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|x86.Build.0 = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|x86.Build.0 = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhone.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|x86.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|x86.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|x86.Build.0 = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|x86.Build.0 = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhone.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|x86.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|x86.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|x86.Build.0 = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|x86.Build.0 = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhone.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|x86.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|x86.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|x86.Build.0 = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhone.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|x86.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|x86.Build.0 = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|x86.Build.0 = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhone.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|x86.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|x86.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.AppStore|x86.Build.0 = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|iPhone.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE}.Release|x86.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|x86.Build.0 = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|x86.Build.0 = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhone.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|x86.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|x86.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|x86.Build.0 = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|x86.Build.0 = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|x86.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|x86.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|x86.Build.0 = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|x86.Build.0 = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhone.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|x86.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|x86.Build.0 = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|x86.Build.0 = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|x86.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhone.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|x86.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|x86.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|x86.Build.0 = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhone.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|x86.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|x86.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|x86.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|x86.Build.0 = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhone.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|x86.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{76716382-3159-460E-BDA6-C5715CF606D7} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{2905FF23-53FB-45E6-AA49-6AF47A172056} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{DB070A10-BF39-4752-8456-86E9D5928478} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{E106CF37-4066-4615-B684-172A6D30B058} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{99135EAB-653D-47E4-A378-C96E1278CA44} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{3E53A01A-B331-47F3-B828-4A5717E77A24} = {8B6A8209-894F-4BA1-B880-965FD453982C}
+		{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{54F237D5-A70A-4752-9656-0C70B1A7B047} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
+		{FB05AC90-89BA-4F2F-A924-F37875FB547C} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
+		{E4D9629C-F168-4224-3F51-A5E482FFBC42} = {A689DEF5-D50F-4975-8B72-124C9EB54066}
+		{6417E941-21BC-467B-A771-0DE389353CE6} = {8B6A8209-894F-4BA1-B880-965FD453982C}
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{3C4C0CB4-0C0F-4450-A37B-148C84FF905F} = {A689DEF5-D50F-4975-8B72-124C9EB54066}
+		{78345174-5B52-4A14-B9FD-D5F2428137F0} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{88060192-33D5-4932-B0F9-8BD2763E857D} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{52F55355-D120-42AC-8116-8410A7D602FA} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{FBCAF3D0-2808-4934-8E96-3F607594517B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+	EndGlobalSection
+EndGlobal
diff --git a/Avalonia.sln b/Avalonia.sln
index 928ba71ec8..21c317549c 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -15,6 +15,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1", "src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Designer", "src\Windows\Avalonia.Designer\Avalonia.Designer.csproj", "{EC42600F-049B-43FF-AED1-8314D61B2749}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2B888490-D14A-4BCA-AB4B-48676FA93C9B} = {2B888490-D14A-4BCA-AB4B-48676FA93C9B}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Input", "src\Avalonia.Input\Avalonia.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
 EndProject
@@ -156,23 +159,33 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport.Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport.TestApp", "tests\Avalonia.DesignerSupport.TestApp\Avalonia.DesignerSupport.TestApp.csproj", "{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Avalonia.RenderTests", "tests\Avalonia.RenderTests\Avalonia.RenderTests.shproj", "{48840EDD-24BF-495D-911E-2EB12AE75D3B}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualizationTest", "samples\VirtualizationTest\VirtualizationTest.csproj", "{FBCAF3D0-2808-4934-8E96-3F607594517B}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{4488ad85-1495-4809-9aa4-ddfe0a48527e}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{e106cf37-4066-4615-b684-172a6d30b058}*SharedItemsImports = 4
 		src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{2f59f3d0-748d-4652-b01e-e0d954756308}*SharedItemsImports = 13
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{dabfd304-d6a4-4752-8123-c2ccf7ac7831}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{db070a10-bf39-4752-8456-86e9d5928478}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4
 		src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4
 		samples\TestApplicationShared\TestApplicationShared.projitems*{78345174-5b52-4a14-b9fd-d5f2428137f0}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{54f237d5-a70a-4752-9656-0c70b1a7b047}*SharedItemsImports = 4
+		samples\TestApplicationShared\TestApplicationShared.projitems*{ff69b927-c545-49ae-8e16-3d14d621aa12}*SharedItemsImports = 4
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{d35a9f3d-8bb0-496e-bf72-444038a7debb}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{88060192-33d5-4932-b0f9-8bd2763e857d}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4
 		src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4
+		samples\TestApplicationShared\TestApplicationShared.projitems*{8c923867-8a8f-4f6b-8b80-47d9e8436166}*SharedItemsImports = 4
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{48840edd-24bf-495d-911e-2eb12ae75d3b}*SharedItemsImports = 13
 		samples\TestApplicationShared\TestApplicationShared.projitems*{e3a1060b-50d0-44e8-88b6-f44ef2e5bd72}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4
 		src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4
@@ -1983,6 +1996,7 @@ Global
 		{D35A9F3D-8BB0-496E-BF72-444038A7DEBB} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{52F55355-D120-42AC-8116-8410A7D602FA} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{48840EDD-24BF-495D-911E-2EB12AE75D3B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{FBCAF3D0-2808-4934-8E96-3F607594517B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 EndGlobal
diff --git a/nuget/template/Avalonia.Skia.Desktop.nuspec b/nuget/template/Avalonia.Skia.Desktop.nuspec
index aa52ac4fa1..ab962c5521 100644
--- a/nuget/template/Avalonia.Skia.Desktop.nuspec
+++ b/nuget/template/Avalonia.Skia.Desktop.nuspec
@@ -13,7 +13,7 @@
     <copyright>Copyright 2015</copyright>
     <tags>Avalonia</tags>
     <dependencies>
-      <dependency id="SkiaSharp" version="1.49.2.1-beta"/>
+      <dependency id="SkiaSharp" version="1.49.3.0-beta"/>
       <dependency id="Avalonia" version="#VERSION#" />
     </dependencies>
   </metadata>
diff --git a/readme.md b/readme.md
index 1c77a38c08..3a6c136682 100644
--- a/readme.md
+++ b/readme.md
@@ -3,6 +3,8 @@
 
 [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master)
 
+[![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia)
+
 A multi-platform .NET UI framework. It can run on Windows, Linux, Mac OS X, iOS and Android.
 
 ![](docs/images/screen.png)
@@ -45,7 +47,7 @@ framework.
 As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can
 take a look at the [getting started page](docs/tutorial/gettingstarted.md) for an
 overview of how to get started but probably the best thing to do for now is to already know a little bit
-about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/Avalonia/Avalonia).
+about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
 
 There's also a high-level [architecture document](docs/spec/architecture.md) that is currently a little bit
 out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
diff --git a/samples/BindingTest/App.xaml.cs b/samples/BindingTest/App.xaml.cs
index fd457f7ba9..7bcaf837a8 100644
--- a/samples/BindingTest/App.xaml.cs
+++ b/samples/BindingTest/App.xaml.cs
@@ -19,8 +19,7 @@ namespace BindingTest
             InitializeLogging();
 
             AppBuilder.Configure<App>()
-                .UseWin32()
-                .UseDirect2D1()
+                .UsePlatformDetect()
                 .Start<MainWindow>();
         }
 
diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs
index ae8c9f5d8f..03842f78c1 100644
--- a/samples/ControlCatalog.Desktop/Program.cs
+++ b/samples/ControlCatalog.Desktop/Program.cs
@@ -17,8 +17,7 @@ namespace ControlCatalog
             // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
             // again.
             AppBuilder.Configure<App>()
-                .UseWin32()
-                .UseDirect2D1()
+                .UsePlatformDetect()
                 .Start<MainWindow>();
         }
 
diff --git a/samples/ControlCatalog/Pages/CanvasPage.xaml b/samples/ControlCatalog/Pages/CanvasPage.xaml
index 6804489b14..211c312e94 100644
--- a/samples/ControlCatalog/Pages/CanvasPage.xaml
+++ b/samples/ControlCatalog/Pages/CanvasPage.xaml
@@ -3,7 +3,15 @@
     <TextBlock Classes="h1">Canvas</TextBlock>
     <TextBlock Classes="h2">A panel which lays out its children by explicit coordinates</TextBlock>
     <Canvas Background="Yellow" Width="300" Height="400">
-      <Rectangle Fill="Blue" Width="63" Height="41" Canvas.Left="40" Canvas.Top="31"/>
+      <Rectangle Fill="Blue" Width="63" Height="41" Canvas.Left="40" Canvas.Top="31">
+        <Rectangle.OpacityMask>
+          <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+            <LinearGradientBrush.GradientStops>
+              <GradientStop Offset="0" Color="Black"/>
+              <GradientStop Offset="1" Color="Transparent"/>
+            </LinearGradientBrush.GradientStops>
+          </LinearGradientBrush>
+        </Rectangle.OpacityMask>      </Rectangle>
       <Ellipse Fill="Green" Width="58" Height="58" Canvas.Left="88" Canvas.Top="100"/>
       <Path Fill="Orange" Data="M 0,0 c 50,0 50,-50 c 50,0 50,50 h -50 v 50 l -50,-50 Z" Canvas.Left="30" Canvas.Top="250"/>
       <Path Fill="OrangeRed" Canvas.Left="180" Canvas.Top="250">
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml b/samples/ControlCatalog/Pages/MenuPage.xaml
index ca28fadea0..98171f29d6 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml
@@ -10,6 +10,7 @@
       <Menu>
         <MenuItem Header="_First">
           <MenuItem Header="Standard _Menu Item"/>
+          <Separator/>
           <MenuItem Header="Menu with _Submenu">
             <MenuItem Header="Submenu _1"/>
             <MenuItem Header="Submenu _2"/>
diff --git a/samples/TestApplication/Program.cs b/samples/TestApplication/Program.cs
index 5e79916a8d..9e331c8634 100644
--- a/samples/TestApplication/Program.cs
+++ b/samples/TestApplication/Program.cs
@@ -35,8 +35,7 @@ namespace TestApplication
             var app = new App();
 
             AppBuilder.Configure(app)
-                .UseWin32()
-                .UseDirect2D1()
+                .UsePlatformDetect()
                 .SetupWithoutStarting();
 
             app.Run();
diff --git a/samples/VirtualizationTest/MainWindow.xaml b/samples/VirtualizationTest/MainWindow.xaml
index 94a0fc1b68..55bd729fec 100644
--- a/samples/VirtualizationTest/MainWindow.xaml
+++ b/samples/VirtualizationTest/MainWindow.xaml
@@ -5,6 +5,10 @@
                     Margin="16 0 0 0" 
                     MinWidth="150"
                     Gap="4">
+            <DropDown Items="{Binding VirtualizationModes}"
+                      SelectedItem="{Binding VirtualizationMode}"/>
+            <DropDown Items="{Binding Orientations}"
+                      SelectedItem="{Binding Orientation}"/>
             <TextBox Watermark="Item Count"
                      UseFloatingWatermark="True"
                      Text="{Binding ItemCount}"/>
@@ -23,12 +27,20 @@
             <Button Command="{Binding AddItemCommand}">Add Item</Button>
             <Button Command="{Binding RemoveItemCommand}">Remove Item</Button>
             <Button Command="{Binding RecreateCommand}">Recreate</Button>
+            <Button Command="{Binding SelectFirstCommand}">Select First</Button>
+            <Button Command="{Binding SelectLastCommand}">Select Last</Button>
         </StackPanel>
 
         <ListBox Name="listBox" 
                  Items="{Binding Items}" 
                  SelectedItems="{Binding SelectedItems}"
-                 SelectionMode="Multiple">
+                 SelectionMode="Multiple"
+                 VirtualizationMode="{Binding VirtualizationMode}">
+            <ListBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel Orientation="{Binding Orientation}"/>
+                </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <TextBlock Text="{Binding Header}"/>
diff --git a/samples/VirtualizationTest/Program.cs b/samples/VirtualizationTest/Program.cs
index 8958605a3b..d5649f6a06 100644
--- a/samples/VirtualizationTest/Program.cs
+++ b/samples/VirtualizationTest/Program.cs
@@ -16,8 +16,7 @@ namespace VirtualizationTest
             InitializeLogging();
 
             AppBuilder.Configure<App>()
-               .UseWin32()
-               .UseDirect2D1()
+               .UsePlatformDetect()
                .Start<MainWindow>();
         }
 
diff --git a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
index 0e1f56fa07..86869eb46a 100644
--- a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
@@ -2,8 +2,10 @@
 // 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 ReactiveUI;
 
 namespace VirtualizationTest.ViewModels
@@ -15,6 +17,8 @@ namespace VirtualizationTest.ViewModels
         private int _newItemIndex;
         private IReactiveList<ItemViewModel> _items;
         private string _prefix = "Item";
+        private Orientation _orientation;
+        private ItemVirtualizationMode _virtualizationMode = ItemVirtualizationMode.Simple;
 
         public MainWindowViewModel()
         {
@@ -27,6 +31,12 @@ namespace VirtualizationTest.ViewModels
 
             RemoveItemCommand = ReactiveCommand.Create();
             RemoveItemCommand.Subscribe(_ => Remove());
+
+            SelectFirstCommand = ReactiveCommand.Create();
+            SelectFirstCommand.Subscribe(_ => SelectItem(0));
+
+            SelectLastCommand = ReactiveCommand.Create();
+            SelectLastCommand.Subscribe(_ => SelectItem(Items.Count - 1));
         }
 
         public string NewItemString
@@ -50,11 +60,29 @@ namespace VirtualizationTest.ViewModels
             private set { this.RaiseAndSetIfChanged(ref _items, value); }
         }
 
-        public ReactiveCommand<object> AddItemCommand { get; private set; }
+        public Orientation Orientation
+        {
+            get { return _orientation; }
+            set { this.RaiseAndSetIfChanged(ref _orientation, value); }
+        }
 
-        public ReactiveCommand<object> RecreateCommand { get; private set; }
+        public IEnumerable<Orientation> Orientations =>
+            Enum.GetValues(typeof(Orientation)).Cast<Orientation>();
 
+        public ItemVirtualizationMode VirtualizationMode
+        {
+            get { return _virtualizationMode; }
+            set { this.RaiseAndSetIfChanged(ref _virtualizationMode, value); }
+        }
+
+        public IEnumerable<ItemVirtualizationMode> VirtualizationModes => 
+            Enum.GetValues(typeof(ItemVirtualizationMode)).Cast<ItemVirtualizationMode>();
+
+        public ReactiveCommand<object> AddItemCommand { get; private set; }
+        public ReactiveCommand<object> RecreateCommand { get; private set; }
         public ReactiveCommand<object> RemoveItemCommand { get; private set; }
+        public ReactiveCommand<object> SelectFirstCommand { get; private set; }
+        public ReactiveCommand<object> SelectLastCommand { get; private set; }
 
         private void ResizeItems(int count)
         {
@@ -103,5 +131,11 @@ namespace VirtualizationTest.ViewModels
                 .Select(x => new ItemViewModel(x, _prefix));
             Items = new ReactiveList<ItemViewModel>(items);
         }
+
+        private void SelectItem(int index)
+        {
+            SelectedItems.Clear();
+            SelectedItems.Add(Items[index]);
+        }
     }
 }
diff --git a/samples/XamlTestApplication/Program.cs b/samples/XamlTestApplication/Program.cs
index 50b3c364d4..6485796ce7 100644
--- a/samples/XamlTestApplication/Program.cs
+++ b/samples/XamlTestApplication/Program.cs
@@ -21,8 +21,7 @@ namespace XamlTestApplication
             InitializeLogging();
 
             AppBuilder.Configure<XamlTestApp>()
-                .UseWin32()
-                .UseDirect2D1()
+                .UsePlatformDetect()
                 .Start<Views.MainWindow>();
         }
 
diff --git a/samples/XamlTestApplicationPcl/TestScrollable.cs b/samples/XamlTestApplicationPcl/TestScrollable.cs
index 39e708d043..9d4c1d9b29 100644
--- a/samples/XamlTestApplicationPcl/TestScrollable.cs
+++ b/samples/XamlTestApplicationPcl/TestScrollable.cs
@@ -2,6 +2,7 @@ using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.VisualTree;
 
@@ -75,7 +76,12 @@ namespace XamlTestApplication
             }
         }
 
-        public bool BringIntoView(IVisual target, Rect targetRect)
+        public bool BringIntoView(IControl target, Rect targetRect)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IControl GetControlInDirection(NavigationDirection direction, IControl from)
         {
             throw new NotImplementedException();
         }
diff --git a/samples/XamlTestApplicationPcl/Views/MainWindow.cs b/samples/XamlTestApplicationPcl/Views/MainWindow.cs
index ed5cb8f73a..8a19cef15d 100644
--- a/samples/XamlTestApplicationPcl/Views/MainWindow.cs
+++ b/samples/XamlTestApplicationPcl/Views/MainWindow.cs
@@ -27,9 +27,6 @@ namespace XamlTestApplication.Views
             AvaloniaXamlLoader.Load(this);
             _exitMenu = this.FindControl<MenuItem>("exitMenu");
             _exitMenu.Click += (s, e) => Application.Current.Exit();
-
-            var virtualList = this.FindControl<ListBox>("virtualList");
-            virtualList.Items = Enumerable.Range(0, 200).Select(x => $"Item {x}").ToList();
         }
     }
 }
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/Views/MainWindow.xaml b/samples/XamlTestApplicationPcl/Views/MainWindow.xaml
index 75cdfd00a4..a844986169 100644
--- a/samples/XamlTestApplicationPcl/Views/MainWindow.xaml
+++ b/samples/XamlTestApplicationPcl/Views/MainWindow.xaml
@@ -24,16 +24,7 @@
       <TabControl.Transition>
         <PageSlide Duration="0.25" />
       </TabControl.Transition>
-
-
-      <TabItem Header="Virtualization">
-        <DockPanel LastChildFill="True">
-          <StackPanel DockPanel.Dock="Right" Orientation="Vertical">
-          </StackPanel>
-          <ListBox Name="virtualList"/>
-        </DockPanel>
-      </TabItem>
-      
+     
       <TabItem Header="Buttons">
         <ScrollViewer CanScrollHorizontally="False">
           <StackPanel Margin="10" Gap="4">
diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 012e19da50..3192629494 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -38,7 +38,6 @@ namespace Avalonia.Android
                 .Bind<IWindowingPlatform>().ToConstant(this);
 
             SkiaPlatform.Initialize();
-            Application.RegisterPlatformCallback(() => { });
 
             _scalingFactor = global::Android.App.Application.Context.Resources.DisplayMetrics.ScaledDensity;
 
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject b/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject
index 30815b1937..f744eecae0 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject
+++ b/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject
@@ -7,7 +7,7 @@
   <AllowDynamicCodeContractChecking>true</AllowDynamicCodeContractChecking>
   <AllowStaticCodeContractChecking>false</AllowStaticCodeContractChecking>
   <AllowCodeAnalysis>false</AllowCodeAnalysis>
-  <IgnoreThisComponentCompletely>false</IgnoreThisComponentCompletely>
+  <IgnoreThisComponentCompletely>true</IgnoreThisComponentCompletely>
   <RunPreBuildEvents>false</RunPreBuildEvents>
   <RunPostBuildEvents>false</RunPostBuildEvents>
   <PreviouslyBuiltSuccessfully>true</PreviouslyBuiltSuccessfully>
@@ -17,9 +17,9 @@
   <DetectStackOverflow>true</DetectStackOverflow>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
   <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration />
-  <UseBuildPlatform />
-  <ProxyProcessPath />
+  <UseBuildConfiguration></UseBuildConfiguration>
+  <UseBuildPlatform></UseBuildPlatform>
+  <ProxyProcessPath></ProxyProcessPath>
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
   <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
   <BuildProcessArchitecture>x86</BuildProcessArchitecture>
diff --git a/src/Avalonia.Controls/AppBuilder.cs b/src/Avalonia.Controls/AppBuilder.cs
index 86ba8c3786..8b3e0e731a 100644
--- a/src/Avalonia.Controls/AppBuilder.cs
+++ b/src/Avalonia.Controls/AppBuilder.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Reflection;
 
 namespace Avalonia.Controls
 {
@@ -98,23 +99,64 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="initializer">The method to call to initialize the windowing subsystem.</param>
         /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder WithWindowingSubsystem(Action initializer)
+        public AppBuilder UseWindowingSubsystem(Action initializer)
         {
             WindowingSubsystem = initializer;
             return this;
         }
 
+        /// <summary>
+        /// Specifies a windowing subsystem to use.
+        /// </summary>
+        /// <param name="dll">The dll in which to look for subsystem.</param>
+        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
+        public AppBuilder UseWindowingSubsystem(string dll) => UseWindowingSubsystem(GetInitializer(dll));
+
         /// <summary>
         /// Specifies a rendering subsystem to use.
         /// </summary>
         /// <param name="initializer">The method to call to initialize the rendering subsystem.</param>
         /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder WithRenderingSubsystem(Action initializer)
+        public AppBuilder UseRenderingSubsystem(Action initializer)
         {
             RenderingSubsystem = initializer;
             return this;
         }
 
+        /// <summary>
+        /// Specifies a rendering subsystem to use.
+        /// </summary>
+        /// <param name="dll">The dll in which to look for subsystem.</param>
+        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
+        public AppBuilder UseRenderingSubsystem(string dll) => UseRenderingSubsystem(GetInitializer(dll));
+
+        static Action GetInitializer(string assemblyName) => () =>
+        {
+            var assembly = Assembly.Load(new AssemblyName(assemblyName));
+            var platformClassName = assemblyName.Replace("Avalonia.", string.Empty) + "Platform";
+            var platformClassFullName = assemblyName + "." + platformClassName;
+            var platformClass = assembly.GetType(platformClassFullName);
+            var init = platformClass.GetRuntimeMethod("Initialize", new Type[0]);
+            init.Invoke(null, null);
+        };
+
+        public AppBuilder UsePlatformDetect()
+        {
+            var platformId = (int)
+                ((dynamic) Type.GetType("System.Environment").GetRuntimeProperty("OSVersion").GetValue(null)).Platform;
+            if (platformId == 4 || platformId == 6)
+            {
+                UseRenderingSubsystem("Avalonia.Cairo");
+                UseWindowingSubsystem("Avalonia.Gtk");
+            }
+            else
+            {
+                UseRenderingSubsystem("Avalonia.Direct2D1");
+                UseWindowingSubsystem("Avalonia.Win32");
+            }
+            return this;
+        }
+
         /// <summary>
         /// Sets up the platform-speciic services for the <see cref="Application"/>.
         /// </summary>
diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index f73ead5576..1991f49ac0 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -26,16 +26,12 @@ namespace Avalonia
     /// - A global set of <see cref="Styles"/>.
     /// - A <see cref="FocusManager"/>.
     /// - An <see cref="InputManager"/>.
-    /// - Loads and initializes rendering and windowing subsystems with
-    /// <see cref="InitializeSubsystems(int)"/> and <see cref="InitializeSubsystem(string)"/>.
     /// - Registers services needed by the rest of Avalonia in the <see cref="RegisterServices"/>
     /// method.
     /// - Tracks the lifetime of the application.
     /// </remarks>
     public class Application : IGlobalDataTemplates, IGlobalStyles, IStyleRoot, IApplicationLifecycle
     {
-        static Action _platformInitializationCallback;
-
         /// <summary>
         /// The application-global data templates.
         /// </summary>
@@ -121,11 +117,6 @@ namespace Avalonia
         /// </summary>
         IStyleHost IStyleHost.StylingParent => null;
 
-        public static void RegisterPlatformCallback(Action cb)
-        {
-            _platformInitializationCallback = cb;
-        }
-
         /// <summary>
         /// Initializes the application by loading XAML etc.
         /// </summary>
@@ -189,47 +180,5 @@ namespace Avalonia
                 .Bind<IRenderQueueManager>().ToTransient<RenderQueueManager>()
                 .Bind<IApplicationLifecycle>().ToConstant(this);
         }
-
-        /// <summary>
-        /// Initializes the rendering and windowing subsystems according to platform.
-        /// </summary>
-        /// <param name="platformID">The value of Environment.OSVersion.Platform.</param>
-        protected void InitializeSubsystems(int platformID)
-        {
-            if (_platformInitializationCallback != null)
-            {
-                _platformInitializationCallback();
-            }
-            else if (platformID == 4 || platformID == 6)
-            {
-                InitializeSubsystem("Avalonia.Cairo");
-                InitializeSubsystem("Avalonia.Gtk");
-            }
-            else
-            {
-                InitializeSubsystem("Avalonia.Direct2D1");
-                InitializeSubsystem("Avalonia.Win32");
-            }
-        }
-
-        /// <summary>
-        /// Initializes the rendering or windowing subsystem defined by the specified assemblt.
-        /// </summary>
-        /// <param name="assemblyName">The name of the assembly.</param>
-        protected static void InitializeSubsystem(string assemblyName)
-        {
-            var assembly = Assembly.Load(new AssemblyName(assemblyName));
-            var platformClassName = assemblyName.Replace("Avalonia.", string.Empty) + "Platform";
-            var platformClassFullName = assemblyName + "." + platformClassName;
-            var platformClass = assembly.GetType(platformClassFullName);
-            var init = platformClass.GetRuntimeMethod("Initialize", new Type[0]);
-            init.Invoke(null, null);
-        }
-
-        internal static void InitializeWin32Subsystem()
-        {
-            InitializeSubsystem("Avalonia.Direct2D1");
-            InitializeSubsystem("Avalonia.Win32");
-        }
     }
 }
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 22d17bf633..3f8985aa12 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -51,21 +51,19 @@
     <Compile Include="DockPanel.cs" />
     <Compile Include="Expander.cs" />
     <Compile Include="Generators\ItemContainerInfo.cs" />
+    <Compile Include="Generators\MenuItemContainerGenerator.cs" />
     <Compile Include="Generators\TreeContainerIndex.cs" />
     <Compile Include="HotkeyManager.cs" />
     <Compile Include="IApplicationLifecycle.cs" />
     <Compile Include="IScrollable.cs" />
-    <Compile Include="INameScope.cs" />
     <Compile Include="IPseudoClasses.cs" />
     <Compile Include="DropDownItem.cs" />
     <Compile Include="ISetInheritanceParent.cs" />
     <Compile Include="ItemVirtualizationMode.cs" />
+    <Compile Include="IVirtualizingController.cs" />
     <Compile Include="IVirtualizingPanel.cs" />
     <Compile Include="LayoutTransformControl.cs" />
     <Compile Include="Mixins\ContentControlMixin.cs" />
-    <Compile Include="NameScope.cs" />
-    <Compile Include="NameScopeEventArgs.cs" />
-    <Compile Include="NameScopeExtensions.cs" />
     <Compile Include="Platform\ITopLevelRenderer.cs" />
     <Compile Include="Platform\IWindowingPlatform.cs" />
     <Compile Include="Platform\PlatformManager.cs" />
diff --git a/src/Avalonia.Controls/Canvas.cs b/src/Avalonia.Controls/Canvas.cs
index ebccb7435e..74eebea4bc 100644
--- a/src/Avalonia.Controls/Canvas.cs
+++ b/src/Avalonia.Controls/Canvas.cs
@@ -136,7 +136,7 @@ namespace Avalonia.Controls
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
+        IInputElement INavigableContainer.GetControl(NavigationDirection direction, IInputElement from)
         {
             // TODO: Implement this
             return null;
diff --git a/src/Avalonia.Controls/ControlExtensions.cs b/src/Avalonia.Controls/ControlExtensions.cs
index 0b15835b19..60a940627f 100644
--- a/src/Avalonia.Controls/ControlExtensions.cs
+++ b/src/Avalonia.Controls/ControlExtensions.cs
@@ -20,6 +20,8 @@ namespace Avalonia.Controls
         /// <param name="control">The control.</param>
         public static void BringIntoView(this IControl control)
         {
+            Contract.Requires<ArgumentNullException>(control != null);
+
             control.BringIntoView(new Rect(control.Bounds.Size));
         }
 
@@ -30,6 +32,8 @@ namespace Avalonia.Controls
         /// <param name="rect">The area of the control to being into view.</param>
         public static void BringIntoView(this IControl control, Rect rect)
         {
+            Contract.Requires<ArgumentNullException>(control != null);
+
             var ev = new RequestBringIntoViewEventArgs
             {
                 RoutedEvent = Control.RequestBringIntoViewEvent,
@@ -49,6 +53,9 @@ namespace Avalonia.Controls
         /// <returns>The control or null if not found.</returns>
         public static T FindControl<T>(this IControl control, string name) where T : class, IControl
         {
+            Contract.Requires<ArgumentNullException>(control != null);
+            Contract.Requires<ArgumentNullException>(name != null);
+
             var nameScope = control.FindNameScope();
 
             if (nameScope == null)
@@ -66,6 +73,8 @@ namespace Avalonia.Controls
         /// <returns>The control's name scope, or null if not found.</returns>
         public static INameScope FindNameScope(this IControl control)
         {
+            Contract.Requires<ArgumentNullException>(control != null);
+
             return control.GetSelfAndLogicalAncestors()
                 .OfType<Control>()
                 .Select(x => (x as INameScope) ?? NameScope.GetNameScope(x))
@@ -80,6 +89,8 @@ namespace Avalonia.Controls
         /// <param name="value">True to add the pseudoclass or false to remove.</param>
         public static void Set(this IPseudoClasses classes, string name, bool value)
         {
+            Contract.Requires<ArgumentNullException>(classes != null);
+
             if (value)
             {
                 classes.Add(name);
@@ -99,6 +110,8 @@ namespace Avalonia.Controls
         /// <returns>A disposable used to cancel the subscription.</returns>
         public static IDisposable Set(this IPseudoClasses classes, string name, IObservable<bool> trigger)
         {
+            Contract.Requires<ArgumentNullException>(classes != null);
+
             return trigger.Subscribe(x => classes.Set(name, x));
         }
     }
diff --git a/src/Avalonia.Controls/Design.cs b/src/Avalonia.Controls/Design.cs
index 231914740e..a0b0d5d0ca 100644
--- a/src/Avalonia.Controls/Design.cs
+++ b/src/Avalonia.Controls/Design.cs
@@ -1,4 +1,6 @@
 
+using System.Runtime.CompilerServices;
+
 namespace Avalonia.Controls
 {
     public static class Design
@@ -43,7 +45,25 @@ namespace Avalonia.Controls
         {
             return control.GetValue(DataContextProperty);
         }
-        
+
+        static readonly ConditionalWeakTable<object, Control> Substitutes = new ConditionalWeakTable<object, Control>();
+
+        public static readonly AttachedProperty<Control> PreviewWithProperty = AvaloniaProperty
+            .RegisterAttached<AvaloniaObject, Control>("PreviewWith", typeof (Design));
+
+        public static void SetPreviewWith(object target, Control control)
+        {
+            Substitutes.Remove(target);
+            Substitutes.Add(target, control);
+        }
+
+        public static Control GetPreviewWith(object target)
+        {
+            Control rv;
+            Substitutes.TryGetValue(target, out rv);
+            return rv;
+        }
+
         internal static void ApplyDesignerProperties(Control target, Control source)
         {
             if (source.IsSet(WidthProperty))
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index 45f7dff49c..6bbf757106 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 
 namespace Avalonia.Controls.Generators
 {
@@ -187,11 +188,16 @@ namespace Avalonia.Controls.Generators
 
             if (result == null)
             {
-                result = new ContentPresenter
+                result = new ContentPresenter();
+                result.SetValue(ContentPresenter.ContentProperty, item, BindingPriority.Style);
+
+                if (ItemTemplate != null)
                 {
-                    ContentTemplate = ItemTemplate,
-                    Content = item,
-                };
+                    result.SetValue(
+                        ContentPresenter.ContentTemplateProperty,
+                        ItemTemplate,
+                        BindingPriority.TemplatedParent);
+                }
             }
 
             return result;
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
index 35107a84fc..3aa2181cd4 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq.Expressions;
 using System.Reflection;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 
 namespace Avalonia.Controls.Generators
 {
@@ -62,10 +63,10 @@ namespace Avalonia.Controls.Generators
 
                 if (ContentTemplateProperty != null)
                 {
-                    result.SetValue(ContentTemplateProperty, ItemTemplate);
+                    result.SetValue(ContentTemplateProperty, ItemTemplate, BindingPriority.Style);
                 }
 
-                result.SetValue(ContentProperty, item);
+                result.SetValue(ContentProperty, item, BindingPriority.Style);
 
                 if (!(item is IControl))
                 {
diff --git a/src/Avalonia.Controls/Generators/MenuItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/MenuItemContainerGenerator.cs
new file mode 100644
index 0000000000..c9b3a55aaa
--- /dev/null
+++ b/src/Avalonia.Controls/Generators/MenuItemContainerGenerator.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Controls.Generators
+{
+    public class MenuItemContainerGenerator : ItemContainerGenerator<MenuItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemContainerGenerator{T}"/> class.
+        /// </summary>
+        /// <param name="owner">The owner control.</param>
+        public MenuItemContainerGenerator(IControl owner)
+            : base(owner, MenuItem.HeaderProperty, null)
+        {
+        }
+
+        /// <inheritdoc/>
+        protected override IControl CreateContainer(object item)
+        {
+            var separator = item as Separator;
+            return separator != null ? separator : base.CreateContainer(item);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
index e26a4fb0d6..8a70aa7307 100644
--- a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
@@ -78,7 +78,7 @@ namespace Avalonia.Controls.Generators
                 var template = GetTreeDataTemplate(item, ItemTemplate);
                 var result = new T();
 
-                result.SetValue(ContentProperty, template.Build(item));
+                result.SetValue(ContentProperty, template.Build(item), BindingPriority.Style);
 
                 var itemsSelector = template.ItemsSelector(item);
 
diff --git a/src/Avalonia.Controls/IVirtualizingController.cs b/src/Avalonia.Controls/IVirtualizingController.cs
new file mode 100644
index 0000000000..0b997f4948
--- /dev/null
+++ b/src/Avalonia.Controls/IVirtualizingController.cs
@@ -0,0 +1,22 @@
+// 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.Controls
+{
+    /// <summary>
+    /// Interface implemented by controls that act as controllers for an
+    /// <see cref="IVirtualizingPanel"/>.
+    /// </summary>
+    public interface IVirtualizingController
+    {
+        /// <summary>
+        /// Called when the <see cref="IVirtualizingPanel"/>'s controls should be updated.
+        /// </summary>
+        /// <remarks>
+        /// The controller should respond to this method being called by either adding
+        /// children up until <see cref="IVirtualizingPanel.IsFull"/> becomes true or
+        /// removing <see cref="IVirtualizingPanel.OverflowCount"/> controls.
+        /// </remarks>
+        void UpdateControls();
+    }
+}
diff --git a/src/Avalonia.Controls/IVirtualizingPanel.cs b/src/Avalonia.Controls/IVirtualizingPanel.cs
index ce320c0da7..5d35fa1ec8 100644
--- a/src/Avalonia.Controls/IVirtualizingPanel.cs
+++ b/src/Avalonia.Controls/IVirtualizingPanel.cs
@@ -1,8 +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;
-
 namespace Avalonia.Controls
 {
     /// <summary>
@@ -10,14 +8,35 @@ namespace Avalonia.Controls
     /// </summary>
     public interface IVirtualizingPanel : IPanel
     {
+        /// <summary>
+        /// Gets or sets the controller for the virtualizing panel.
+        /// </summary>
+        /// <remarks>
+        /// A virtualizing controller is responsible for maintaing the controls in the virtualizing
+        /// panel. This property will be set by the controller when virtualization is initialized.
+        /// Note that this property may remain null if the panel is added to a control that does
+        /// not act as a virtualizing controller.
+        /// </remarks>
+        IVirtualizingController Controller { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether the panel is full.
         /// </summary>
+        /// <remarks>
+        /// This property should return false until enough children are added to fill the space
+        /// passed into the last measure in the direction of scroll. It should be updated
+        /// immediately after a child is added or removed.
+        /// </remarks>
         bool IsFull { get; }
 
         /// <summary>
         /// Gets the number of items that can be removed while keeping the panel full.
         /// </summary>
+        /// <remarks>
+        /// This property should return the number of children that are completely out of the
+        /// panel's current bounds in the direction of scroll. It should be updated after an
+        /// arrange.
+        /// </remarks>
         int OverflowCount { get; }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index ded75d708a..ed7a50d9b0 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -139,7 +139,7 @@ namespace Avalonia.Controls
             if (null != TransformRoot)
             {
                 TransformRoot.RenderTransform = _matrixTransform;
-                TransformRoot.TransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
+                TransformRoot.RenderTransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
             }
 
             ApplyLayoutTransform();
diff --git a/src/Avalonia.Controls/Menu.cs b/src/Avalonia.Controls/Menu.cs
index d5d70ab1ea..2185fd982b 100644
--- a/src/Avalonia.Controls/Menu.cs
+++ b/src/Avalonia.Controls/Menu.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using System.Reactive.Disposables;
+using Avalonia.Controls.Generators;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
@@ -131,6 +132,12 @@ namespace Avalonia.Controls
             _subscription.Dispose();
         }
 
+        /// <inheritdoc/>
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
+        {
+            return new ItemContainerGenerator<MenuItem>(this, MenuItem.HeaderProperty, null);
+        }
+
         /// <summary>
         /// Called when a key is pressed within the menu.
         /// </summary>
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index e4bb44049d..3d15ed99e7 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using System.Windows.Input;
+using Avalonia.Controls.Generators;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -204,6 +205,12 @@ namespace Avalonia.Controls
             IsSelected = true;
         }
 
+        /// <inheritdoc/>
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
+        {
+            return new MenuItemContainerGenerator(this);
+        }
+
         /// <summary>
         /// Called when a key is pressed in the <see cref="MenuItem"/>.
         /// </summary>
diff --git a/src/Avalonia.Controls/Mixins/SelectableMixin.cs b/src/Avalonia.Controls/Mixins/SelectableMixin.cs
index 0472b604db..2369e9f530 100644
--- a/src/Avalonia.Controls/Mixins/SelectableMixin.cs
+++ b/src/Avalonia.Controls/Mixins/SelectableMixin.cs
@@ -51,22 +51,7 @@ namespace Avalonia.Controls.Mixins
 
                 if (sender != null)
                 {
-                    var itemsControl = sender.Parent as SelectingItemsControl;
-
-                    if ((bool)x.NewValue)
-                    {
-                        ((IPseudoClasses)sender.Classes).Add(":selected");
-
-                        if (((IVisual)sender).IsAttachedToVisualTree && 
-                            itemsControl?.AutoScrollToSelectedItem == true)
-                        {
-                            sender.BringIntoView();
-                        }
-                    }
-                    else
-                    {
-                        ((IPseudoClasses)sender.Classes).Remove(":selected");
-                    }
+                    ((IPseudoClasses)sender.Classes).Set(":selected", (bool)x.NewValue);
 
                     sender.RaiseEvent(new RoutedEventArgs
                     {
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 54d7e76d73..4c5a488003 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -277,9 +277,23 @@ namespace Avalonia.Controls.Presenters
 
                 Child = newChild;
 
+                if (oldChild?.Parent == this)
+                {
+                    LogicalChildren.Remove(oldChild);
+                }
+
                 if (newChild.Parent == null)
                 {
-                    ((ISetLogicalParent)newChild).SetParent((ILogical)this.TemplatedParent ?? this);
+                    var templatedLogicalParent = TemplatedParent as ILogical;
+
+                    if (templatedLogicalParent != null)
+                    {
+                        ((ISetLogicalParent)newChild).SetParent(templatedLogicalParent);
+                    }
+                    else
+                    {
+                        LogicalChildren.Add(newChild);
+                    }
                 }
 
                 VisualChildren.Add(newChild);
diff --git a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
index 95df903ed3..42311dc781 100644
--- a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
@@ -6,5 +6,7 @@ namespace Avalonia.Controls.Presenters
     public interface IItemsPresenter : IPresenter
     {
         IPanel Panel { get; }
+
+        void ScrollIntoView(object item);
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
index dd7cf3bf1d..964ce82849 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
@@ -6,6 +6,7 @@ using System.Collections;
 using System.Collections.Specialized;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Utils;
+using Avalonia.Input;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Presenters
@@ -13,8 +14,10 @@ namespace Avalonia.Controls.Presenters
     /// <summary>
     /// Base class for classes which handle virtualization for an <see cref="ItemsPresenter"/>.
     /// </summary>
-    internal abstract class ItemVirtualizer
+    internal abstract class ItemVirtualizer : IVirtualizingController, IDisposable
     {
+        private bool disposedValue;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemVirtualizer"/> class.
         /// </summary>
@@ -22,6 +25,8 @@ namespace Avalonia.Controls.Presenters
         public ItemVirtualizer(ItemsPresenter owner)
         {
             Owner = owner;
+            Items = owner.Items;
+            ItemCount = owner.Items.Count();
         }
 
         /// <summary>
@@ -115,34 +120,45 @@ namespace Avalonia.Controls.Presenters
         {
             var virtualizingPanel = owner.Panel as IVirtualizingPanel;
             var scrollable = (ILogicalScrollable)owner;
+            ItemVirtualizer result = null;
 
             if (virtualizingPanel != null && scrollable.InvalidateScroll != null)
             {
                 switch (owner.VirtualizationMode)
                 {
                     case ItemVirtualizationMode.Simple:
-                        return new ItemVirtualizerSimple(owner);
+                        result = new ItemVirtualizerSimple(owner);
+                        break;
                 }
             }
 
-            return new ItemVirtualizerNone(owner);
+            if (result == null)
+            {
+                result = new ItemVirtualizerNone(owner);
+            }
+
+            if (virtualizingPanel != null)
+            {
+                virtualizingPanel.Controller = result;
+            }
+
+            return result;
         }
 
-        /// <summary>
-        /// Called by the <see cref="Owner"/> when it carries out an arrange.
-        /// </summary>
-        /// <param name="finalSize">The final size passed to the arrange.</param>
-        public abstract void Arranging(Size finalSize);
+        /// <inheritdoc/>
+        public virtual void UpdateControls()
+        {
+        }
 
         /// <summary>
-        /// Called when a request is made to bring an item into view.
+        /// Gets the next control in the specified direction.
         /// </summary>
-        /// <param name="target">The item to bring into view.</param>
-        /// <param name="targetRect">The rect on the item to bring into view.</param>
-        /// <returns>True if the request was handled; otherwise false.</returns>
-        public virtual bool BringIntoView(IVisual target, Rect targetRect)
+        /// <param name="direction">The movement direction.</param>
+        /// <param name="from">The control from which movement begins.</param>
+        /// <returns>The control.</returns>
+        public virtual IControl GetControlInDirection(NavigationDirection direction, IControl from)
         {
-            return false;
+            return null;
         }
 
         /// <summary>
@@ -157,5 +173,26 @@ namespace Avalonia.Controls.Presenters
             Items = items;
             ItemCount = items.Count();
         }
+
+        /// <summary>
+        /// Scrolls the specified item into view.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        public virtual void ScrollIntoView(object item)
+        {
+        }
+
+        /// <inheritdoc/>
+        public virtual void Dispose()
+        {
+            VirtualizingPanel.Controller = null;
+            VirtualizingPanel.Children.Clear();
+            Owner.ItemContainerGenerator.Clear();
+        }
+
+        /// <summary>
+        /// Invalidates the current scroll.
+        /// </summary>
+        protected void InvalidateScroll() => ((ILogicalScrollable)Owner).InvalidateScroll();
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
index 303c7442c2..8947b30e63 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
@@ -19,6 +19,10 @@ namespace Avalonia.Controls.Presenters
         public ItemVirtualizerNone(ItemsPresenter owner)
             : base(owner)
         {
+            if (Items != null && owner.Panel != null)
+            {
+                AddContainers(0, Items);
+            }
         }
 
         /// <inheritdoc/>
@@ -52,12 +56,6 @@ namespace Avalonia.Controls.Presenters
             get { throw new NotSupportedException(); }
         }
 
-        /// <inheritdoc/>
-        public override void Arranging(Size finalSize)
-        {
-            // We don't need to do anything here.
-        }
-
         /// <inheritdoc/>
         public override void ItemsChanged(IEnumerable items, NotifyCollectionChangedEventArgs e)
         {
@@ -112,6 +110,24 @@ namespace Avalonia.Controls.Presenters
             Owner.InvalidateMeasure();
         }
 
+        /// <summary>
+        /// Scrolls the specified item into view.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        public override void ScrollIntoView(object item)
+        {
+            if (Items != null)
+            {
+                var index = Items.IndexOf(item);
+
+                if (index != -1)
+                {
+                    var container = Owner.ItemContainerGenerator.ContainerFromIndex(index);
+                    container?.BringIntoView();
+                }
+            }
+        }
+
         private IList<ItemContainerInfo> AddContainers(int index, IEnumerable items)
         {
             var generator = Owner.ItemContainerGenerator;
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
index 7750ed7f4a..a54e502033 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
@@ -5,8 +5,11 @@ using System;
 using System.Collections;
 using System.Collections.Specialized;
 using System.Linq;
-using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Utils;
+using Avalonia.Input;
+using Avalonia.Layout;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -23,6 +26,8 @@ namespace Avalonia.Controls.Presenters
         public ItemVirtualizerSimple(ItemsPresenter owner)
             : base(owner)
         {
+            // Don't need to add children here as UpdateControls should be called by the panel
+            // measure/arrange.
         }
 
         /// <inheritdoc/>
@@ -48,7 +53,9 @@ namespace Avalonia.Controls.Presenters
 
                 if (delta != 0)
                 {
-                    if ((NextIndex - 1) + delta < ItemCount)
+                    var newLastIndex = (NextIndex - 1) + delta;
+
+                    if (newLastIndex < ItemCount)
                     {
                         if (panel.PixelOffset > 0)
                         {
@@ -63,10 +70,14 @@ namespace Avalonia.Controls.Presenters
                     }
                     else
                     {
-                        // We're moving to a partially obscured item at the end of the list.
+                        // We're moving to a partially obscured item at the end of the list so
+                        // offset the panel by the height of the first item.
                         var firstIndex = ItemCount - panel.Children.Count;
                         RecycleContainersForMove(firstIndex - FirstIndex);
-                        panel.PixelOffset = VirtualizingPanel.PixelOverflow;
+
+                        panel.PixelOffset = VirtualizingPanel.ScrollDirection == Orientation.Vertical ?
+                            panel.Children[0].Bounds.Height :
+                            panel.Children[0].Bounds.Width;
                     }
                 }
             }
@@ -84,10 +95,10 @@ namespace Avalonia.Controls.Presenters
         }
 
         /// <inheritdoc/>
-        public override void Arranging(Size finalSize)
+        public override void UpdateControls()
         {
             CreateAndRemoveContainers();
-            ((ILogicalScrollable)Owner).InvalidateScroll();
+            InvalidateScroll();
         }
 
         /// <inheritdoc/>
@@ -95,15 +106,18 @@ namespace Avalonia.Controls.Presenters
         {
             base.ItemsChanged(items, e);
 
+            var panel = VirtualizingPanel;
+
             if (items != null)
             {
                 switch (e.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        CreateAndRemoveContainers();
+
                         if (e.NewStartingIndex >= FirstIndex &&
                             e.NewStartingIndex + e.NewItems.Count <= NextIndex)
                         {
-                            CreateAndRemoveContainers();
                             RecycleContainers();
                         }
 
@@ -125,6 +139,7 @@ namespace Avalonia.Controls.Presenters
 
                     case NotifyCollectionChangedAction.Reset:
                         RecycleContainersOnRemove();
+                        CreateAndRemoveContainers();
                         break;
                 }
             }
@@ -132,9 +147,94 @@ namespace Avalonia.Controls.Presenters
             {
                 Owner.ItemContainerGenerator.Clear();
                 VirtualizingPanel.Children.Clear();
+                FirstIndex = NextIndex = 0;
             }
 
-            ((ILogicalScrollable)Owner).InvalidateScroll();
+            // If we are scrolled to view a partially visible last item but controls were added
+            // then we need to return to a non-offset scroll position.
+            if (panel.PixelOffset != 0 && FirstIndex + panel.Children.Count < ItemCount)
+            {
+                panel.PixelOffset = 0;
+                RecycleContainersForMove(1);
+            }
+
+            InvalidateScroll();
+        }
+
+        public override IControl GetControlInDirection(NavigationDirection direction, IControl from)
+        {
+            var generator = Owner.ItemContainerGenerator;
+            var panel = VirtualizingPanel;
+            var itemIndex = generator.IndexFromContainer(from);
+            var vertical = VirtualizingPanel.ScrollDirection == Orientation.Vertical;
+
+            if (itemIndex == -1)
+            {
+                return null;
+            }
+
+            var newItemIndex = -1;
+
+            switch (direction)
+            {
+                case NavigationDirection.First:
+                    newItemIndex = 0;
+                    break;
+
+                case NavigationDirection.Last:
+                    newItemIndex = ItemCount - 1;
+                    break;
+
+                case NavigationDirection.Up:
+                    if (vertical)
+                    {
+                        newItemIndex = itemIndex - 1;
+                    }
+
+                    break;
+                case NavigationDirection.Down:
+                    if (vertical)
+                    {
+                        newItemIndex = itemIndex + 1;
+                    }
+
+                    break;
+
+                case NavigationDirection.Left:
+                    if (!vertical)
+                    {
+                        newItemIndex = itemIndex - 1;
+                    }
+                    break;
+
+                case NavigationDirection.Right:
+                    if (!vertical)
+                    {
+                        newItemIndex = itemIndex + 1;
+                    }
+                    break;
+
+                case NavigationDirection.PageUp:
+                    newItemIndex = Math.Max(0, itemIndex - (int)ViewportValue);
+                    break;
+
+                case NavigationDirection.PageDown:
+                    newItemIndex = Math.Min(ItemCount - 1, itemIndex + (int)ViewportValue);
+                    break;
+            }
+
+            return ScrollIntoView(newItemIndex);
+        }
+
+        /// <inheritdoc/>
+        public override void ScrollIntoView(object item)
+        {
+            var index = Items.IndexOf(item);
+
+            if (index != -1)
+            {
+                ScrollIntoView(index);
+            }
         }
 
         /// <summary>
@@ -146,7 +246,7 @@ namespace Avalonia.Controls.Presenters
             var generator = Owner.ItemContainerGenerator;
             var panel = VirtualizingPanel;
 
-            if (!panel.IsFull && Items != null)
+            if (!panel.IsFull && Items != null && panel.IsAttachedToVisualTree)
             {
                 var memberSelector = Owner.MemberSelector;
                 var index = NextIndex;
@@ -336,5 +436,70 @@ namespace Avalonia.Controls.Presenters
             Owner.ItemContainerGenerator.Dematerialize(FirstIndex + index, count);
             NextIndex -= count;
         }
+
+        /// <summary>
+        /// Scrolls the item with the specified index into view.
+        /// </summary>
+        /// <param name="index">The item index.</param>
+        /// <returns>The container that was brought into view.</returns>
+        private IControl ScrollIntoView(int index)
+        {
+            var panel = VirtualizingPanel;
+            var generator = Owner.ItemContainerGenerator;
+            var newOffset = -1.0;
+
+            if (index >= 0 && index < ItemCount)
+            {
+                if (index < FirstIndex)
+                {
+                    newOffset = index;
+                }
+                else if (index >= NextIndex)
+                {
+                    newOffset = index - Math.Ceiling(ViewportValue - 1);
+                }
+                else if (OffsetValue + ViewportValue >= ItemCount)
+                {
+                    newOffset = OffsetValue - 1;
+                }
+
+                if (newOffset != -1)
+                {
+                    OffsetValue = newOffset;
+                }
+
+                var container = generator.ContainerFromIndex(index);
+                var layoutManager = LayoutManager.Instance;
+
+                // We need to do a layout here because it's possible that the container we moved to
+                // is only partially visible due to differing item sizes. If the container is only 
+                // partially visible, scroll again. Don't do this if there's no layout manager:
+                // it means we're running a unit test.
+                if (layoutManager != null)
+                {
+                    layoutManager.ExecuteLayoutPass();
+
+                    if (!new Rect(panel.Bounds.Size).Contains(container.Bounds))
+                    {
+                        OffsetValue += 1;
+                    }
+                }
+
+                return container;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Ensures an offset value is within the value range.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The coerced value.</returns>
+        private double CoerceOffset(double value)
+        {
+            var max = Math.Max(ExtentValue - ViewportValue, 0);
+            return MathUtilities.Clamp(value, 0, max);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
index 817d734506..9a7df4e337 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Specialized;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.VisualTree;
 using static Avalonia.Utilities.MathUtilities;
 
 namespace Avalonia.Controls.Presenters
@@ -33,6 +32,9 @@ namespace Avalonia.Controls.Presenters
             KeyboardNavigation.TabNavigationProperty.OverrideDefaultValue(
                 typeof(ItemsPresenter),
                 KeyboardNavigationMode.Once);
+
+            VirtualizationModeProperty.Changed
+                .AddClassHandler<ItemsPresenter>(x => x.VirtualizationModeChanged);
         }
 
         /// <summary>
@@ -67,23 +69,46 @@ namespace Avalonia.Controls.Presenters
         Action ILogicalScrollable.InvalidateScroll { get; set; }
 
         /// <inheritdoc/>
-        Size ILogicalScrollable.ScrollSize => new Size(0, 1);
+        Size ILogicalScrollable.ScrollSize => new Size(1, 1);
 
         /// <inheritdoc/>
         Size ILogicalScrollable.PageScrollSize => new Size(0, 1);
 
         /// <inheritdoc/>
-        bool ILogicalScrollable.BringIntoView(IVisual target, Rect targetRect)
+        bool ILogicalScrollable.BringIntoView(IControl target, Rect targetRect)
         {
-            return _virtualizer?.BringIntoView(target, targetRect) ?? false;
+            return false;
         }
 
         /// <inheritdoc/>
-        protected override Size ArrangeOverride(Size finalSize)
+        IControl ILogicalScrollable.GetControlInDirection(NavigationDirection direction, IControl from)
+        {
+            return _virtualizer?.GetControlInDirection(direction, from);
+        }
+
+        public override void ScrollIntoView(object item)
         {
-            var result = base.ArrangeOverride(finalSize);
-            _virtualizer.Arranging(finalSize);
-            return result;
+            _virtualizer?.ScrollIntoView(item);
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            // If infinity is passed as the available size and we're virtualized then we need to
+            // fill the available space, but to do that we *don't* want to materialize all our
+            // items! Take a look at the root of the tree for a MaxClientSize and use that as
+            // the available size.
+            if (availableSize == Size.Infinity && VirtualizationMode != ItemVirtualizationMode.None)
+            {
+                var window = VisualRoot as Window;
+
+                if (window != null)
+                {
+                    availableSize = window.PlatformImpl.MaxClientSize;
+                }
+            }
+
+            Panel.Measure(availableSize);
+            return Panel.DesiredSize;
         }
 
         /// <inheritdoc/>
@@ -116,5 +141,12 @@ namespace Avalonia.Controls.Presenters
             var maxY = Math.Max(scrollable.Extent.Height - scrollable.Viewport.Height, 0);
             return new Vector(Clamp(value.X, 0, maxX), Clamp(value.Y, 0, maxY));
         }
+
+        private void VirtualizationModeChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            _virtualizer?.Dispose();
+            _virtualizer = ItemVirtualizer.Create(this);
+            ((ILogicalScrollable)this).InvalidateScroll?.Invoke();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
index abebe85080..5a56e52029 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
@@ -163,6 +163,11 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        /// <inheritdoc/>
+        public virtual void ScrollIntoView(object item)
+        {
+        }
+
         /// <summary>
         /// Creates the <see cref="ItemContainerGenerator"/> for the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 0aeb61a529..d9f0260e39 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -59,6 +59,7 @@ namespace Avalonia.Controls.Presenters
         static ScrollContentPresenter()
         {
             ClipToBoundsProperty.OverrideDefaultValue(typeof(ScrollContentPresenter), true);
+            ChildProperty.Changed.AddClassHandler<ScrollContentPresenter>(x => x.ChildChanged);
             AffectsArrange(OffsetProperty);
         }
 
@@ -118,10 +119,11 @@ namespace Avalonia.Controls.Presenters
             }
 
             var scrollable = Child as ILogicalScrollable;
+            var control = target as IControl;
 
-            if (scrollable?.IsLogicalScrollEnabled == true)
+            if (scrollable?.IsLogicalScrollEnabled == true && control != null)
             {
-                return scrollable.BringIntoView(target, targetRect);
+                return scrollable.BringIntoView(control, targetRect);
             }
 
             var transform = target.TransformToVisual(Child);
@@ -229,26 +231,32 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
         {
-            if (Extent.Height > Viewport.Height)
+            if (Extent.Height > Viewport.Height || Extent.Width > Viewport.Width)
             {
                 var scrollable = Child as ILogicalScrollable;
+                bool isLogical = scrollable?.IsLogicalScrollEnabled == true;
 
-                if (scrollable?.IsLogicalScrollEnabled == true)
-                {                    
-                    var y = Offset.Y + (-e.Delta.Y * scrollable.ScrollSize.Height);
+                double x = Offset.X;
+                double y = Offset.Y;
+
+                if (Extent.Height > Viewport.Height)
+                {
+                    double height = isLogical ? scrollable.ScrollSize.Height : 50;
+                    y += -e.Delta.Y * height;
                     y = Math.Max(y, 0);
                     y = Math.Min(y, Extent.Height - Viewport.Height);
-                    Offset = new Vector(Offset.X, y);
-                    e.Handled = true;
                 }
-                else
+
+                if (Extent.Width > Viewport.Width)
                 {
-                    var y = Offset.Y + (-e.Delta.Y * 50);
-                    y = Math.Max(y, 0);
-                    y = Math.Min(y, Extent.Height - Viewport.Height);
-                    Offset = new Vector(Offset.X, y);
-                    e.Handled = true;
+                    double width = isLogical ? scrollable.ScrollSize.Width : 50;
+                    x += -e.Delta.X * width;
+                    x = Math.Max(x, 0);
+                    x = Math.Min(x, Extent.Width - Viewport.Width);
                 }
+
+                Offset = new Vector(x, y);
+                e.Handled = true;
             }
         }
 
@@ -257,6 +265,16 @@ namespace Avalonia.Controls.Presenters
             e.Handled = BringDescendentIntoView(e.TargetObject, e.TargetRect);
         }
 
+        private void ChildChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            UpdateScrollableSubscription((IControl)e.NewValue);
+
+            if (e.OldValue != null)
+            {
+                Offset = default(Vector);
+            }
+        }
+
         private void UpdateScrollableSubscription(IControl child)
         {
             var scrollable = child as ILogicalScrollable;
@@ -268,7 +286,7 @@ namespace Avalonia.Controls.Presenters
             {
                 scrollable.InvalidateScroll = () => UpdateFromScrollable(scrollable);
 
-                if (scrollable?.IsLogicalScrollEnabled == true)
+                if (scrollable.IsLogicalScrollEnabled == true)
                 {
                     _logicalScrollSubscription = new CompositeDisposable(
                         this.GetObservable(OffsetProperty).Skip(1).Subscribe(x => scrollable.Offset = x),
@@ -285,15 +303,10 @@ namespace Avalonia.Controls.Presenters
             if (logicalScroll != scrollable.IsLogicalScrollEnabled)
             {
                 UpdateScrollableSubscription(Child);
-
-                if (!scrollable.IsLogicalScrollEnabled)
-                {
-                    Offset = default(Vector);
-                    InvalidateMeasure();
-                }
+                Offset = default(Vector);
+                InvalidateMeasure();
             }
-
-            if (scrollable.IsLogicalScrollEnabled)
+            else if (scrollable.IsLogicalScrollEnabled)
             {
                 Viewport = scrollable.Viewport;
                 Extent = scrollable.Extent;
@@ -301,4 +314,4 @@ namespace Avalonia.Controls.Presenters
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index abdd890ecd..1dfa2d7af2 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.VisualTree;
+using Avalonia.Media;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -58,6 +59,8 @@ namespace Avalonia.Controls.Primitives
 
                 if (info != null)
                 {
+                    child.RenderTransform = new MatrixTransform(info.Bounds.Transform);
+                    child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
                     child.Arrange(info.Bounds.Bounds);
                 }
                 else
diff --git a/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs b/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
index b8b90f83a9..6c8f463a96 100644
--- a/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
+++ b/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using Avalonia.VisualTree;
+using Avalonia.Input;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -56,6 +56,14 @@ namespace Avalonia.Controls.Primitives
         /// <param name="target">The target visual.</param>
         /// <param name="targetRect">The portion of the target visual to bring into view.</param>
         /// <returns>True if the scroll offset was changed; otherwise false.</returns>
-        bool BringIntoView(IVisual target, Rect targetRect);
+        bool BringIntoView(IControl target, Rect targetRect);
+
+        /// <summary>
+        /// Gets the next control in the specified direction.
+        /// </summary>
+        /// <param name="direction">The movement direction.</param>
+        /// <param name="from">The control from which movement begins.</param>
+        /// <returns>The control.</returns>
+        IControl GetControlInDirection(NavigationDirection direction, IControl from);
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index c24d1cef2d..81d01ff74f 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -10,6 +10,7 @@ using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.Rendering;
 using Avalonia.VisualTree;
+using Avalonia.Layout;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -39,6 +40,18 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<PlacementMode> PlacementModeProperty =
             AvaloniaProperty.Register<Popup, PlacementMode>(nameof(PlacementMode), defaultValue: PlacementMode.Bottom);
 
+        /// <summary>
+        /// Defines the <see cref="HorizontalOffset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> HorizontalOffsetProperty =
+            AvaloniaProperty.Register<Popup, double>(nameof(HorizontalOffset));
+
+        /// <summary>
+        /// Defines the <see cref="VerticalOffset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> VerticalOffsetProperty =
+            AvaloniaProperty.Register<Popup, double>(nameof(VerticalOffset));
+
         /// <summary>
         /// Defines the <see cref="PlacementTarget"/> property.
         /// </summary>
@@ -122,6 +135,24 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(PlacementModeProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the Horizontal offset of the popup in relation to the <see cref="PlacementTarget"/>
+        /// </summary>
+        public double HorizontalOffset
+        {
+            get { return GetValue(HorizontalOffsetProperty); }
+            set { SetValue(HorizontalOffsetProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Vertical offset of the popup in relation to the <see cref="PlacementTarget"/>
+        /// </summary>
+        public double VerticalOffset
+        {
+            get { return GetValue(VerticalOffsetProperty); }
+            set { SetValue(VerticalOffsetProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the control that is used to determine the popup's position.
         /// </summary>
@@ -287,18 +318,26 @@ namespace Avalonia.Controls.Primitives
             if (target?.GetVisualRoot() == null)
             {
                 mode = PlacementMode.Pointer;
-            }
+            }            
 
             switch (mode)
             {
                 case PlacementMode.Pointer:
-                    return MouseDevice.Instance?.Position ?? default(Point);
+                    if (MouseDevice.Instance != null)
+                    {
+                        // Scales the Horizontal and Vertical offset to screen co-ordinates.
+                        var screenOffset = new Point(HorizontalOffset * (PopupRoot as ILayoutRoot).LayoutScaling, VerticalOffset * (PopupRoot as ILayoutRoot).LayoutScaling);
+                        return MouseDevice.Instance.Position + screenOffset;
+                    }
+
+                    return default(Point);
 
                 case PlacementMode.Bottom:
-                    return target?.PointToScreen(new Point(0, target.Bounds.Height)) ?? zero;
+
+                    return target?.PointToScreen(new Point(0 + HorizontalOffset, target.Bounds.Height + VerticalOffset)) ?? zero;
 
                 case PlacementMode.Right:
-                    return target?.PointToScreen(new Point(target.Bounds.Width, 0)) ?? zero;
+                    return target?.PointToScreen(new Point(target.Bounds.Width + HorizontalOffset, 0 + VerticalOffset)) ?? zero;
 
                 default:
                     throw new InvalidOperationException("Invalid value for Popup.PlacementMode");
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index a46aa8d853..27f3407fd9 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -280,6 +280,12 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        /// <summary>
+        /// Scrolls the specified item into view.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        public void ScrollIntoView(object item) => Presenter?.ScrollIntoView(item);
+
         /// <summary>
         /// Tries to get the container that was the source of an event.
         /// </summary>
@@ -723,6 +729,12 @@ namespace Avalonia.Controls.Primitives
             {
                 case NotifyCollectionChangedAction.Add:
                     SelectedItemsAdded(e.NewItems.Cast<object>().ToList());
+
+                    if (AutoScrollToSelectedItem)
+                    {
+                        ScrollIntoView(e.NewItems[0]);
+                    }
+
                     added = e.NewItems;
                     break;
 
diff --git a/src/Avalonia.Controls/Primitives/TabStrip.cs b/src/Avalonia.Controls/Primitives/TabStrip.cs
index 4a6c9af95f..0e15ae4d7b 100644
--- a/src/Avalonia.Controls/Primitives/TabStrip.cs
+++ b/src/Avalonia.Controls/Primitives/TabStrip.cs
@@ -9,6 +9,9 @@ namespace Avalonia.Controls.Primitives
 {
     public class TabStrip : SelectingItemsControl
     {
+        private static readonly FuncTemplate<IPanel> DefaultPanel =
+            new FuncTemplate<IPanel>(() => new WrapPanel { Orientation = Orientation.Horizontal });
+
         private static IMemberSelector s_MemberSelector = new FuncMemberSelector<object, object>(SelectHeader);
 
         static TabStrip()
@@ -16,6 +19,7 @@ namespace Avalonia.Controls.Primitives
             MemberSelectorProperty.OverrideDefaultValue<TabStrip>(s_MemberSelector);
             SelectionModeProperty.OverrideDefaultValue<TabStrip>(SelectionMode.AlwaysSelected);
             FocusableProperty.OverrideDefaultValue(typeof(TabStrip), false);
+            ItemsPanelProperty.OverrideDefaultValue<TabStrip>(DefaultPanel);
         }
 
         protected override IItemContainerGenerator CreateItemContainerGenerator()
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index e9d1e56b3a..c52c1ad505 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -370,7 +370,7 @@ namespace Avalonia.Controls
         private static double Max(double x, double y)
         {
             var result = Math.Max(x, y);
-            return double.IsNaN(result) ? 0 : Math.Round(result);
+            return double.IsNaN(result) ? 0 : result;
         }
 
         private static Vector ValidateOffset(AvaloniaObject o, Vector value)
diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index 0284d84df3..26a755e5f1 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -72,37 +72,52 @@ namespace Avalonia.Controls
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
+        IInputElement INavigableContainer.GetControl(NavigationDirection direction, IInputElement from)
+        {
+            var fromControl = from as IControl;
+            return (fromControl != null) ? GetControlInDirection(direction, fromControl) : null;
+        }
+
+        /// <summary>
+        /// Gets the next control in the specified direction.
+        /// </summary>
+        /// <param name="direction">The movement direction.</param>
+        /// <param name="from">The control from which movement begins.</param>
+        /// <returns>The control.</returns>
+        protected virtual IInputElement GetControlInDirection(NavigationDirection direction, IControl from)
         {
             var horiz = Orientation == Orientation.Horizontal;
             int index = Children.IndexOf((IControl)from);
 
             switch (direction)
             {
-                case FocusNavigationDirection.First:
+                case NavigationDirection.First:
                     index = 0;
                     break;
-                case FocusNavigationDirection.Last:
+                case NavigationDirection.Last:
                     index = Children.Count - 1;
                     break;
-                case FocusNavigationDirection.Next:
+                case NavigationDirection.Next:
                     ++index;
                     break;
-                case FocusNavigationDirection.Previous:
+                case NavigationDirection.Previous:
                     --index;
                     break;
-                case FocusNavigationDirection.Left:
+                case NavigationDirection.Left:
                     index = horiz ? index - 1 : -1;
                     break;
-                case FocusNavigationDirection.Right:
+                case NavigationDirection.Right:
                     index = horiz ? index + 1 : -1;
                     break;
-                case FocusNavigationDirection.Up:
+                case NavigationDirection.Up:
                     index = horiz ? -1 : index - 1;
                     break;
-                case FocusNavigationDirection.Down:
+                case NavigationDirection.Down:
                     index = horiz ? -1 : index + 1;
                     break;
+                default:
+                    index = -1;
+                    break;
             }
 
             if (index >= 0 && index < Children.Count)
diff --git a/src/Avalonia.Controls/Templates/FuncTemplate`1.cs b/src/Avalonia.Controls/Templates/FuncTemplate`1.cs
index c04b08de4d..88321ee1a3 100644
--- a/src/Avalonia.Controls/Templates/FuncTemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/FuncTemplate`1.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls.Templates
 {
@@ -34,5 +35,7 @@ namespace Avalonia.Controls.Templates
         {
             return _func();
         }
+
+        object ITemplate.Build() => Build();
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Templates/ITemplate`1.cs b/src/Avalonia.Controls/Templates/ITemplate`1.cs
index 79c6ae47ba..2bf4b5a285 100644
--- a/src/Avalonia.Controls/Templates/ITemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/ITemplate`1.cs
@@ -1,13 +1,15 @@
 // 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.Styling;
+
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Creates a control.
     /// </summary>
     /// <typeparam name="TControl">The type of control.</typeparam>
-    public interface ITemplate<TControl> where TControl : IControl
+    public interface ITemplate<TControl> : ITemplate where TControl : IControl
     {
         /// <summary>
         /// Creates the control.
@@ -15,6 +17,6 @@ namespace Avalonia.Controls
         /// <returns>
         /// The created control.
         /// </returns>
-        TControl Build();
+        new TControl Build();
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs
index 2915ff07d5..840ed06c73 100644
--- a/src/Avalonia.Controls/VirtualizingStackPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs
@@ -3,12 +3,17 @@
 
 using System;
 using System.Collections.Specialized;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
     public class VirtualizingStackPanel : StackPanel, IVirtualizingPanel
     {
+        private Size _availableSpace;
         private double _takenSpace;
         private int _canBeRemoved;
         private double _averageItemSize;
@@ -20,15 +25,14 @@ namespace Avalonia.Controls
             get
             {
                 return Orientation == Orientation.Horizontal ?
-                    _takenSpace >= AvailableSpace.Width :
-                    _takenSpace >= AvailableSpace.Height;
+                    _takenSpace >= _availableSpace.Width :
+                    _takenSpace >= _availableSpace.Height;
             }
         }
 
+        IVirtualizingController IVirtualizingPanel.Controller { get; set; }
         int IVirtualizingPanel.OverflowCount => _canBeRemoved;
-
         Orientation IVirtualizingPanel.ScrollDirection => Orientation;
-
         double IVirtualizingPanel.AverageItemSize => _averageItemSize;
 
         double IVirtualizingPanel.PixelOverflow
@@ -36,8 +40,8 @@ namespace Avalonia.Controls
             get
             {
                 var bounds = Orientation == Orientation.Horizontal ? 
-                    Bounds.Width : Bounds.Height;
-                return Math.Max(0, (_takenSpace - _pixelOffset) - bounds);
+                    _availableSpace.Width : _availableSpace.Height;
+                return Math.Max(0, _takenSpace - bounds);
             }
         }
 
@@ -55,16 +59,29 @@ namespace Avalonia.Controls
             }
         }
 
-        // TODO: We need to put a reasonable limit on this, probably based on the max window size.
-        private Size AvailableSpace => ((ILayoutable)this).PreviousMeasure ?? Bounds.Size;
+        private IVirtualizingController Controller => ((IVirtualizingPanel)this).Controller;
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            if (availableSize != ((ILayoutable)this).PreviousMeasure)
+            {
+                _availableSpace = availableSize;
+                Controller?.UpdateControls();
+            }
+
+            return base.MeasureOverride(availableSize);
+        }
 
         protected override Size ArrangeOverride(Size finalSize)
         {
+            _availableSpace = finalSize;
             _canBeRemoved = 0;
             _takenSpace = 0;
             _averageItemSize = 0;
             _averageCount = 0;
             var result = base.ArrangeOverride(finalSize);
+            _takenSpace += _pixelOffset;
+            Controller?.UpdateControls();
             return result;
         }
 
@@ -92,6 +109,21 @@ namespace Avalonia.Controls
             }
         }
 
+        protected override IInputElement GetControlInDirection(NavigationDirection direction, IControl from)
+        {
+            var logicalScrollable = Parent as ILogicalScrollable;
+            var fromControl = from as IControl;
+
+            if (logicalScrollable?.IsLogicalScrollEnabled == true && fromControl != null)
+            {
+                return logicalScrollable.GetControlInDirection(direction, fromControl);
+            }
+            else
+            {
+                return base.GetControlInDirection(direction, from);
+            }
+        }
+
         internal override void ArrangeChild(
             IControl child, 
             Rect rect,
@@ -103,7 +135,7 @@ namespace Avalonia.Controls
                 rect = new Rect(rect.X, rect.Y - _pixelOffset, rect.Width, rect.Height);
                 child.Arrange(rect);
 
-                if (rect.Y >= AvailableSpace.Height)
+                if (rect.Y >= _availableSpace.Height)
                 {
                     ++_canBeRemoved;
                 }
@@ -120,7 +152,7 @@ namespace Avalonia.Controls
                 rect = new Rect(rect.X - _pixelOffset, rect.Y, rect.Width, rect.Height);
                 child.Arrange(rect);
 
-                if (rect.X >= AvailableSpace.Width)
+                if (rect.X >= _availableSpace.Width)
                 {
                     ++_canBeRemoved;
                 }
@@ -139,7 +171,7 @@ namespace Avalonia.Controls
             var bounds = Bounds;
             var gap = Gap;
 
-            child.Measure(AvailableSpace);
+            child.Measure(_availableSpace);
             ++_averageCount;
 
             if (Orientation == Orientation.Vertical)
@@ -173,6 +205,11 @@ namespace Avalonia.Controls
                 _takenSpace -= width + gap;
                 RemoveFromAverageItemSize(width);
             }
+
+            if (_canBeRemoved > 0)
+            {
+                --_canBeRemoved;
+            }
         }
 
         private void AddToAverageItemSize(double value)
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 1000e3ef20..36bc87af02 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -89,7 +89,16 @@ namespace Avalonia.Controls
         /// Initializes a new instance of the <see cref="Window"/> class.
         /// </summary>
         public Window()
-            : base(PlatformManager.CreateWindow())
+            : this(PlatformManager.CreateWindow())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Window"/> class.
+        /// </summary>
+        /// <param name="impl">The window implementation.</param>
+        public Window(IWindowImpl impl)
+            : base(impl)
         {
             _maxPlatformClientSize = this.PlatformImpl.MaxClientSize;
         }
diff --git a/src/Avalonia.Controls/WrapPanel.cs b/src/Avalonia.Controls/WrapPanel.cs
index d0f1e93c56..9d3a5b6536 100644
--- a/src/Avalonia.Controls/WrapPanel.cs
+++ b/src/Avalonia.Controls/WrapPanel.cs
@@ -48,35 +48,35 @@ namespace Avalonia.Controls
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
+        IInputElement INavigableContainer.GetControl(NavigationDirection direction, IInputElement from)
         {
             var horiz = Orientation == Orientation.Horizontal;
             int index = Children.IndexOf((IControl)from);
 
             switch (direction)
             {
-                case FocusNavigationDirection.First:
+                case NavigationDirection.First:
                     index = 0;
                     break;
-                case FocusNavigationDirection.Last:
+                case NavigationDirection.Last:
                     index = Children.Count - 1;
                     break;
-                case FocusNavigationDirection.Next:
+                case NavigationDirection.Next:
                     ++index;
                     break;
-                case FocusNavigationDirection.Previous:
+                case NavigationDirection.Previous:
                     --index;
                     break;
-                case FocusNavigationDirection.Left:
+                case NavigationDirection.Left:
                     index = horiz ? index - 1 : -1;
                     break;
-                case FocusNavigationDirection.Right:
+                case NavigationDirection.Right:
                     index = horiz ? index + 1 : -1;
                     break;
-                case FocusNavigationDirection.Up:
+                case NavigationDirection.Up:
                     index = horiz ? -1 : index - 1;
                     break;
-                case FocusNavigationDirection.Down:
+                case NavigationDirection.Down:
                     index = horiz ? -1 : index + 1;
                     break;
             }
diff --git a/src/Avalonia.DesignerSupport/DesignerApi.cs b/src/Avalonia.DesignerSupport/DesignerApi.cs
index 7c17051ce2..cbbfbffec8 100644
--- a/src/Avalonia.DesignerSupport/DesignerApi.cs
+++ b/src/Avalonia.DesignerSupport/DesignerApi.cs
@@ -7,33 +7,42 @@ using System.Threading.Tasks;
 
 namespace Avalonia.DesignerSupport
 {
-    class DesignerApi
+    class DesignerApiDictionary
     {
-        private readonly Dictionary<string, object> _inner;
+        public Dictionary<string, object> Dictionary { get; set; }
 
-        public DesignerApi(Dictionary<string, object> inner)
+        public DesignerApiDictionary(Dictionary<string, object> dictionary)
         {
-            _inner = inner;
+            Dictionary = dictionary;
         }
 
-        object Get([CallerMemberName] string name = null)
+        protected object Get([CallerMemberName] string name = null)
         {
             object rv;
-            _inner.TryGetValue(name, out rv);
+            Dictionary.TryGetValue(name, out rv);
             return rv;
         }
 
-        void Set(object value, [CallerMemberName] string name = null)
+        protected void Set(object value, [CallerMemberName] string name = null)
         {
-            _inner[name] = value;
+            Dictionary[name] = value;
         }
+    }
 
+    class DesignerApi : DesignerApiDictionary
+    {
         public Action<string> UpdateXaml
         {
             get { return (Action<string>) Get(); }
             set {Set(value); }
         }
 
+        public Action<Dictionary<string, object>> UpdateXaml2
+        {
+            get { return (Action<Dictionary<string, object>>)Get(); }
+            set { Set(value); }
+        }
+
         public Action OnResize
         {
             get { return (Action) Get(); }
@@ -52,5 +61,32 @@ namespace Avalonia.DesignerSupport
             get { return (Action<double>) Get(); }
         }
 
+        public DesignerApi(Dictionary<string, object> dictionary) : base(dictionary)
+        {
+        }
+    }
+
+    class DesignerApiXamlFileInfo : DesignerApiDictionary
+    {
+        public string Xaml
+        {
+            get { return (string)Get(); }
+            set { Set(value); }
+        }
+
+        public string AssemblyPath
+        {
+            get { return (string) Get(); }
+            set { Set(value); }
+        }
+
+        public DesignerApiXamlFileInfo(Dictionary<string, object> dictionary) : base(dictionary)
+        {
+        }
+
+        public DesignerApiXamlFileInfo(): base(new Dictionary<string, object>())
+        {
+            
+        }
     }
 }
diff --git a/src/Avalonia.DesignerSupport/DesignerAssist.cs b/src/Avalonia.DesignerSupport/DesignerAssist.cs
index 64aa9106c7..8787144665 100644
--- a/src/Avalonia.DesignerSupport/DesignerAssist.cs
+++ b/src/Avalonia.DesignerSupport/DesignerAssist.cs
@@ -36,7 +36,7 @@ namespace Avalonia.DesignerSupport
         public static void Init(Dictionary<string, object> shared)
         {
             Design.IsDesignMode = true;
-            Api = new DesignerApi(shared) {UpdateXaml = UpdateXaml, SetScalingFactor = SetScalingFactor};
+            Api = new DesignerApi(shared) {UpdateXaml = UpdateXaml, UpdateXaml2 = UpdateXaml2, SetScalingFactor = SetScalingFactor};
             var plat = (IPclPlatformWrapper) Activator.CreateInstance(Assembly.Load(new AssemblyName("Avalonia.Win32"))
                 .DefinedTypes.First(typeof (IPclPlatformWrapper).GetTypeInfo().IsAssignableFrom).AsType());
             
@@ -58,10 +58,9 @@ namespace Avalonia.DesignerSupport
                     //Ignore, Assembly.DefinedTypes threw an exception, we can't do anything about that
                 }
             }
-
             AppBuilder.Configure(app == null ? new DesignerApp() : (Application) Activator.CreateInstance(app.AsType()))
-                .WithWindowingSubsystem(Application.InitializeWin32Subsystem)
-                .WithRenderingSubsystem(() => { })
+                .UseWindowingSubsystem("Avalonia.Win32")
+                .UseRenderingSubsystem("Avalonia.Direct2D1")
                 .SetupWithoutStarting();
         }
 
@@ -74,22 +73,65 @@ namespace Avalonia.DesignerSupport
 
         static Window s_currentWindow;
 
-        private static void UpdateXaml(string xaml)
+        private static void UpdateXaml(string xaml) => UpdateXaml2(new DesignerApiXamlFileInfo
+        {
+            Xaml = xaml
+        }.Dictionary);
+
+        private static void UpdateXaml2(Dictionary<string, object> dic)
         {
+            var xamlInfo = new DesignerApiXamlFileInfo(dic);
             Window window;
-            Control original;
+            Control control;
 
             using (PlatformManager.DesignerMode())
             {
                 var loader = new AvaloniaXamlLoader();
-                var stream = new MemoryStream(Encoding.UTF8.GetBytes(xaml));
+                var stream = new MemoryStream(Encoding.UTF8.GetBytes(xamlInfo.Xaml));
 
-                original = (Control)loader.Load(stream);
-                window = original as Window;
 
+                
+                Uri baseUri = null;
+                if (xamlInfo.AssemblyPath != null)
+                {
+                    //Fabricate fake Uri
+                    baseUri =
+                        new Uri("resm:Fake.xaml?assembly=" + Path.GetFileNameWithoutExtension(xamlInfo.AssemblyPath));
+                }
+
+                var loaded = loader.Load(stream, null, baseUri);
+                var styles = loaded as Styles;
+                if (styles != null)
+                {
+                    var substitute = Design.GetPreviewWith(styles) ??
+                                     styles.Select(Design.GetPreviewWith).FirstOrDefault(s => s != null);
+                    if (substitute != null)
+                    {
+                        substitute.Styles.AddRange(styles);
+                        control = substitute;
+                    }
+                    else
+                        control = new StackPanel
+                        {
+                            Children =
+                            {
+                                new TextBlock {Text = "Styles can't be previewed without Design.PreviewWith. Add"},
+                                new TextBlock {Text = "<Design.PreviewWith>"},
+                                new TextBlock {Text = "    <Border Padding=20><!-- YOUR CONTROL FOR PREVIEW HERE--></Border>"},
+                                new TextBlock {Text = "<Design.PreviewWith>"},
+                                new TextBlock {Text = "before setters in your first Style"}
+                            }
+                        };
+                }
+                if (loaded is Application)
+                    control = new TextBlock {Text = "Application can't be previewed in design view"};
+                else
+                    control = (Control) loaded;
+
+                window = control as Window;
                 if (window == null)
                 {
-                    window = new Window() {Content = original};
+                    window = new Window() {Content = (Control)control};
                 }
 
                 if (!window.IsSet(Window.SizeToContentProperty))
@@ -99,7 +141,7 @@ namespace Avalonia.DesignerSupport
             s_currentWindow?.Close();
             s_currentWindow = window;
             window.Show();
-            Design.ApplyDesignerProperties(window, original);
+            Design.ApplyDesignerProperties(window, control);
             Api.OnWindowCreated?.Invoke(window.PlatformImpl.Handle.Handle);
             Api.OnResize?.Invoke();
         }
diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj
index 569e1bb2cc..3722c80def 100644
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ b/src/Avalonia.Input/Avalonia.Input.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -79,7 +79,7 @@
     <Compile Include="IMainMenu.cs" />
     <Compile Include="IAccessKeyHandler.cs" />
     <Compile Include="FocusManager.cs" />
-    <Compile Include="FocusNavigationDirection.cs" />
+    <Compile Include="NavigationDirection.cs" />
     <Compile Include="ICloseable.cs" />
     <Compile Include="IFocusManager.cs" />
     <Compile Include="IFocusScope.cs" />
diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs
index 37026d16f5..e5cc5a8557 100644
--- a/src/Avalonia.Input/FocusManager.cs
+++ b/src/Avalonia.Input/FocusManager.cs
@@ -79,7 +79,7 @@ namespace Avalonia.Input
                 {
                     IInputElement element;
 
-                    if (_focusScopes.TryGetValue(scope, out element))
+                    if (_focusScopes.TryGetValue(scope, out element) && element != null)
                     {
                         Focus(element, method);
                         return;
diff --git a/src/Avalonia.Input/IKeyboardNavigationHandler.cs b/src/Avalonia.Input/IKeyboardNavigationHandler.cs
index 14e2144da9..db3a3cf114 100644
--- a/src/Avalonia.Input/IKeyboardNavigationHandler.cs
+++ b/src/Avalonia.Input/IKeyboardNavigationHandler.cs
@@ -25,7 +25,7 @@ namespace Avalonia.Input
         /// <param name="modifiers">Any input modifiers active at the time of focus.</param>
         void Move(
             IInputElement element, 
-            FocusNavigationDirection direction,
+            NavigationDirection direction,
             InputModifiers modifiers = InputModifiers.None);
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Input/INavigableContainer.cs b/src/Avalonia.Input/INavigableContainer.cs
index 48f85819c0..13d734bd0b 100644
--- a/src/Avalonia.Input/INavigableContainer.cs
+++ b/src/Avalonia.Input/INavigableContainer.cs
@@ -14,6 +14,6 @@ namespace Avalonia.Input
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement GetControl(FocusNavigationDirection direction, IInputElement from);
+        IInputElement GetControl(NavigationDirection direction, IInputElement from);
     }
 }
diff --git a/src/Avalonia.Input/InputExtensions.cs b/src/Avalonia.Input/InputExtensions.cs
index fcf82287ec..35ffeca7bb 100644
--- a/src/Avalonia.Input/InputExtensions.cs
+++ b/src/Avalonia.Input/InputExtensions.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.VisualTree;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,14 +25,13 @@ namespace Avalonia.Input
         {
             Contract.Requires<ArgumentNullException>(element != null);
 
-            if (element.Bounds.Contains(p) &&
-                element.IsVisible &&
+            if (element.IsVisible &&
                 element.IsHitTestVisible &&
                 element.IsEnabledCore)
             {
-                p -= element.Bounds.Position;
+                bool containsPoint = BoundsTracker.GetTransformedBounds((Visual)element).Contains(p);
 
-                if (element.VisualChildren.Any())
+                if ((containsPoint || !element.ClipToBounds) && element.VisualChildren.Any())
                 {
                     foreach (var child in ZSort(element.VisualChildren.OfType<IInputElement>()))
                     {
@@ -42,7 +42,10 @@ namespace Avalonia.Input
                     }
                 }
 
-                yield return element;
+                if (containsPoint)
+                {
+                    yield return element;
+                }
             }
         }
 
@@ -68,7 +71,6 @@ namespace Avalonia.Input
                 })
                 .OrderBy(x => x, null)
                 .Select(x => x.Element);
-                
         }
 
         private class ZOrderElement : IComparable<ZOrderElement>
@@ -92,4 +94,4 @@ namespace Avalonia.Input
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Input/KeyboardNavigationHandler.cs b/src/Avalonia.Input/KeyboardNavigationHandler.cs
index 9991f7ec10..57da49fa03 100644
--- a/src/Avalonia.Input/KeyboardNavigationHandler.cs
+++ b/src/Avalonia.Input/KeyboardNavigationHandler.cs
@@ -48,11 +48,11 @@ namespace Avalonia.Input
         /// </returns>
         public static IInputElement GetNext(
             IInputElement element,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             Contract.Requires<ArgumentNullException>(element != null);
 
-            if (direction == FocusNavigationDirection.Next || direction == FocusNavigationDirection.Previous)
+            if (direction == NavigationDirection.Next || direction == NavigationDirection.Previous)
             {
                 return TabNavigation.GetNextInTabOrder(element, direction);
             }
@@ -70,7 +70,7 @@ namespace Avalonia.Input
         /// <param name="modifiers">Any input modifiers active at the time of focus.</param>
         public void Move(
             IInputElement element, 
-            FocusNavigationDirection direction,
+            NavigationDirection direction,
             InputModifiers modifiers = InputModifiers.None)
         {
             Contract.Requires<ArgumentNullException>(element != null);
@@ -79,8 +79,8 @@ namespace Avalonia.Input
 
             if (next != null)
             {
-                var method = direction == FocusNavigationDirection.Next ||
-                             direction == FocusNavigationDirection.Previous ?
+                var method = direction == NavigationDirection.Next ||
+                             direction == NavigationDirection.Previous ?
                              NavigationMethod.Tab : NavigationMethod.Directional;
                 FocusManager.Instance.Focus(next, method, modifiers);
             }
@@ -97,25 +97,37 @@ namespace Avalonia.Input
 
             if (current != null)
             {
-                FocusNavigationDirection? direction = null;
+                NavigationDirection? direction = null;
 
                 switch (e.Key)
                 {
                     case Key.Tab:
                         direction = (e.Modifiers & InputModifiers.Shift) == 0 ?
-                            FocusNavigationDirection.Next : FocusNavigationDirection.Previous;
+                            NavigationDirection.Next : NavigationDirection.Previous;
                         break;
                     case Key.Up:
-                        direction = FocusNavigationDirection.Up;
+                        direction = NavigationDirection.Up;
                         break;
                     case Key.Down:
-                        direction = FocusNavigationDirection.Down;
+                        direction = NavigationDirection.Down;
                         break;
                     case Key.Left:
-                        direction = FocusNavigationDirection.Left;
+                        direction = NavigationDirection.Left;
                         break;
                     case Key.Right:
-                        direction = FocusNavigationDirection.Right;
+                        direction = NavigationDirection.Right;
+                        break;
+                    case Key.PageUp:
+                        direction = NavigationDirection.PageUp;
+                        break;
+                    case Key.PageDown:
+                        direction = NavigationDirection.PageDown;
+                        break;
+                    case Key.Home:
+                        direction = NavigationDirection.First;
+                        break;
+                    case Key.End:
+                        direction = NavigationDirection.Last;
                         break;
                 }
 
diff --git a/src/Avalonia.Input/Navigation/DirectionalNavigation.cs b/src/Avalonia.Input/Navigation/DirectionalNavigation.cs
index 4d6e706516..6d4da5d976 100644
--- a/src/Avalonia.Input/Navigation/DirectionalNavigation.cs
+++ b/src/Avalonia.Input/Navigation/DirectionalNavigation.cs
@@ -24,18 +24,17 @@ namespace Avalonia.Input.Navigation
         /// </returns>
         public static IInputElement GetNext(
             IInputElement element,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             Contract.Requires<ArgumentNullException>(element != null);
             Contract.Requires<ArgumentException>(
-                direction != FocusNavigationDirection.Next &&
-                direction != FocusNavigationDirection.Previous);
+                direction != NavigationDirection.Next &&
+                direction != NavigationDirection.Previous);
 
             var container = element.GetVisualParent<IInputElement>();
 
             if (container != null)
             {
-                var isForward = IsForward(direction);
                 var mode = KeyboardNavigation.GetDirectionalNavigation((InputElement)container);
 
                 switch (mode)
@@ -63,12 +62,12 @@ namespace Avalonia.Input.Navigation
         /// </summary>
         /// <param name="direction">The direction.</param>
         /// <returns>True if the direction is forward.</returns>
-        private static bool IsForward(FocusNavigationDirection direction)
+        private static bool IsForward(NavigationDirection direction)
         {
-            return direction == FocusNavigationDirection.Next ||
-                   direction == FocusNavigationDirection.Last ||
-                   direction == FocusNavigationDirection.Right ||
-                   direction == FocusNavigationDirection.Down;
+            return direction == NavigationDirection.Next ||
+                   direction == NavigationDirection.Last ||
+                   direction == NavigationDirection.Right ||
+                   direction == NavigationDirection.Down;
         }
 
         /// <summary>
@@ -77,7 +76,7 @@ namespace Avalonia.Input.Navigation
         /// <param name="container">The element.</param>
         /// <param name="direction">The direction to search.</param>
         /// <returns>The element or null if not found.##</returns>
-        private static IInputElement GetFocusableDescendent(IInputElement container, FocusNavigationDirection direction)
+        private static IInputElement GetFocusableDescendent(IInputElement container, NavigationDirection direction)
         {
             return IsForward(direction) ?
                 GetFocusableDescendents(container).FirstOrDefault() :
@@ -121,9 +120,9 @@ namespace Avalonia.Input.Navigation
         private static IInputElement GetNextInContainer(
             IInputElement element,
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
-            if (direction == FocusNavigationDirection.Down)
+            if (direction == NavigationDirection.Down)
             {
                 var descendent = GetFocusableDescendents(element).FirstOrDefault();
 
@@ -156,7 +155,7 @@ namespace Avalonia.Input.Navigation
                     element = null;
                 }
 
-                if (element != null && direction == FocusNavigationDirection.Up)
+                if (element != null && direction == NavigationDirection.Up)
                 {
                     var descendent = GetFocusableDescendents(element).LastOrDefault();
 
@@ -180,7 +179,7 @@ namespace Avalonia.Input.Navigation
         /// <returns>The first element, or null if there are no more elements.</returns>
         private static IInputElement GetFirstInNextContainer(
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             var parent = container.GetVisualParent<IInputElement>();
             var isForward = IsForward(direction);
diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
index 90502cdbf9..bc3826d90e 100644
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ b/src/Avalonia.Input/Navigation/TabNavigation.cs
@@ -24,12 +24,12 @@ namespace Avalonia.Input.Navigation
         /// </returns>
         public static IInputElement GetNextInTabOrder(
             IInputElement element,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             Contract.Requires<ArgumentNullException>(element != null);
             Contract.Requires<ArgumentException>(
-                direction == FocusNavigationDirection.Next ||
-                direction == FocusNavigationDirection.Previous);
+                direction == NavigationDirection.Next ||
+                direction == NavigationDirection.Previous);
 
             var container = element.GetVisualParent<IInputElement>();
 
@@ -63,9 +63,9 @@ namespace Avalonia.Input.Navigation
         /// <param name="container">The element.</param>
         /// <param name="direction">The direction to search.</param>
         /// <returns>The element or null if not found.##</returns>
-        private static IInputElement GetFocusableDescendent(IInputElement container, FocusNavigationDirection direction)
+        private static IInputElement GetFocusableDescendent(IInputElement container, NavigationDirection direction)
         {
-            return direction == FocusNavigationDirection.Next ?
+            return direction == NavigationDirection.Next ?
                 GetFocusableDescendents(container).FirstOrDefault() :
                 GetFocusableDescendents(container).LastOrDefault();
         }
@@ -128,9 +128,9 @@ namespace Avalonia.Input.Navigation
         private static IInputElement GetNextInContainer(
             IInputElement element,
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
-            if (direction == FocusNavigationDirection.Next)
+            if (direction == NavigationDirection.Next)
             {
                 var descendent = GetFocusableDescendents(element).FirstOrDefault();
 
@@ -165,7 +165,7 @@ namespace Avalonia.Input.Navigation
                     element = null;
                 }
 
-                if (element != null && direction == FocusNavigationDirection.Previous)
+                if (element != null && direction == NavigationDirection.Previous)
                 {
                     var descendent = GetFocusableDescendents(element).LastOrDefault();
 
@@ -189,14 +189,14 @@ namespace Avalonia.Input.Navigation
         /// <returns>The first element, or null if there are no more elements.</returns>
         private static IInputElement GetFirstInNextContainer(
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             var parent = container.GetVisualParent<IInputElement>();
             IInputElement next = null;
 
             if (parent != null)
             {
-                if (direction == FocusNavigationDirection.Previous && parent.CanFocus())
+                if (direction == NavigationDirection.Previous && parent.CanFocus())
                 {
                     return parent;
                 }
@@ -204,7 +204,7 @@ namespace Avalonia.Input.Navigation
                 var siblings = parent.GetVisualChildren()
                     .OfType<IInputElement>()
                     .Where(FocusExtensions.CanFocusDescendents);
-                var sibling = direction == FocusNavigationDirection.Next ? 
+                var sibling = direction == NavigationDirection.Next ? 
                     siblings.SkipWhile(x => x != container).Skip(1).FirstOrDefault() : 
                     siblings.TakeWhile(x => x != container).LastOrDefault();
 
@@ -216,7 +216,7 @@ namespace Avalonia.Input.Navigation
                     }
                     else
                     {
-                        next = direction == FocusNavigationDirection.Next ?
+                        next = direction == NavigationDirection.Next ?
                             GetFocusableDescendents(sibling).FirstOrDefault() :
                             GetFocusableDescendents(sibling).LastOrDefault();
                     }
@@ -229,7 +229,7 @@ namespace Avalonia.Input.Navigation
             }
             else
             {
-                next = direction == FocusNavigationDirection.Next ?
+                next = direction == NavigationDirection.Next ?
                     GetFocusableDescendents(container).FirstOrDefault() :
                     GetFocusableDescendents(container).LastOrDefault();
             }
diff --git a/src/Avalonia.Input/FocusNavigationDirection.cs b/src/Avalonia.Input/NavigationDirection.cs
similarity index 78%
rename from src/Avalonia.Input/FocusNavigationDirection.cs
rename to src/Avalonia.Input/NavigationDirection.cs
index c8f670a13c..fbaa7e74c7 100644
--- a/src/Avalonia.Input/FocusNavigationDirection.cs
+++ b/src/Avalonia.Input/NavigationDirection.cs
@@ -4,9 +4,9 @@
 namespace Avalonia.Input
 {
     /// <summary>
-    /// Describes how focus should be moved.
+    /// Describes how focus should be moved by directional or tab keys.
     /// </summary>
-    public enum FocusNavigationDirection
+    public enum NavigationDirection
     {
         /// <summary>
         /// Move the focus to the next control in the tab order.
@@ -47,5 +47,15 @@ namespace Avalonia.Input
         /// Move the focus down.
         /// </summary>
         Down,
+
+        /// <summary>
+        /// Move the focus up a page.
+        /// </summary>
+        PageUp,
+
+        /// <summary>
+        /// Move the focus down a page.
+        /// </summary>
+        PageDown,
     }
 }
diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
index 42ed45b0bb..85daff28b9 100644
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ b/src/Avalonia.Layout/LayoutManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Avalonia.Logging;
 using Avalonia.Threading;
 
@@ -13,8 +14,8 @@ namespace Avalonia.Layout
     /// </summary>
     public class LayoutManager : ILayoutManager
     {
-        private readonly Queue<ILayoutable> _toMeasure = new Queue<ILayoutable>();
-        private readonly Queue<ILayoutable> _toArrange = new Queue<ILayoutable>();
+        private readonly HashSet<ILayoutable> _toMeasure = new HashSet<ILayoutable>();
+        private readonly HashSet<ILayoutable> _toArrange = new HashSet<ILayoutable>();
         private bool _queued;
         private bool _running;
 
@@ -29,8 +30,8 @@ namespace Avalonia.Layout
             Contract.Requires<ArgumentNullException>(control != null);
             Dispatcher.UIThread.VerifyAccess();
 
-            _toMeasure.Enqueue(control);
-            _toArrange.Enqueue(control);
+            _toMeasure.Add(control);
+            _toArrange.Add(control);
             QueueLayoutPass();
         }
 
@@ -40,7 +41,7 @@ namespace Avalonia.Layout
             Contract.Requires<ArgumentNullException>(control != null);
             Dispatcher.UIThread.VerifyAccess();
 
-            _toArrange.Enqueue(control);
+            _toArrange.Add(control);
             QueueLayoutPass();
         }
 
@@ -107,7 +108,7 @@ namespace Avalonia.Layout
         {
             while (_toMeasure.Count > 0)
             {
-                var next = _toMeasure.Dequeue();
+                var next = _toMeasure.First();
                 Measure(next);
             }
         }
@@ -116,7 +117,7 @@ namespace Avalonia.Layout
         {
             while (_toArrange.Count > 0 && _toMeasure.Count == 0)
             {
-                var next = _toArrange.Dequeue();
+                var next = _toArrange.First();
                 Arrange(next);
             }
         }
@@ -124,29 +125,45 @@ namespace Avalonia.Layout
         private void Measure(ILayoutable control)
         {
             var root = control as ILayoutRoot;
+            var parent = control.VisualParent as ILayoutable;
 
             if (root != null)
             {
                 root.Measure(root.MaxClientSize);
             }
-            else if (control.PreviousMeasure.HasValue)
+            else if (parent != null)
+            {
+                Measure(parent);
+            }
+
+            if (!control.IsMeasureValid)
             {
                 control.Measure(control.PreviousMeasure.Value);
             }
+
+            _toMeasure.Remove(control);
         }
 
         private void Arrange(ILayoutable control)
         {
             var root = control as ILayoutRoot;
+            var parent = control.VisualParent as ILayoutable;
 
             if (root != null)
             {
                 root.Arrange(new Rect(root.DesiredSize));
             }
-            else if (control.PreviousArrange.HasValue)
+            else if (parent != null)
+            {
+                Arrange(parent);
+            }
+
+            if (control.PreviousArrange.HasValue)
             {
                 control.Arrange(control.PreviousArrange.Value);
             }
+
+            _toArrange.Remove(control);
         }
 
         private void QueueLayoutPass()
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
index 91c230b877..7624928e4b 100644
--- a/src/Avalonia.Layout/Layoutable.cs
+++ b/src/Avalonia.Layout/Layoutable.cs
@@ -603,6 +603,17 @@ namespace Avalonia.Layout
             return finalSize;
         }
 
+        /// <inheritdoc/>
+        protected override sealed void OnVisualParentChanged(IVisual oldParent, IVisual newParent)
+        {
+            foreach (ILayoutable i in this.GetSelfAndVisualDescendents())
+            {
+                i.InvalidateMeasure();
+            }
+
+            base.OnVisualParentChanged(oldParent, newParent);
+        }
+
         /// <summary>
         /// Calls <see cref="InvalidateMeasure"/> on the control on which a property changed.
         /// </summary>
diff --git a/src/Avalonia.SceneGraph/Media/DrawingContext.cs b/src/Avalonia.SceneGraph/Media/DrawingContext.cs
index c12434a442..d56d2ae1ad 100644
--- a/src/Avalonia.SceneGraph/Media/DrawingContext.cs
+++ b/src/Avalonia.SceneGraph/Media/DrawingContext.cs
@@ -44,6 +44,8 @@ namespace Avalonia.Media
 
         private Matrix _currentTransform = Matrix.Identity;
 
+        private Matrix _currentContainerTransform = Matrix.Identity;
+        
         /// <summary>
         /// Gets the current transform of the drawing context.
         /// </summary>
@@ -57,7 +59,7 @@ namespace Avalonia.Media
             }
         }
 
-        private Matrix _currentContainerTransform = Matrix.Identity;
+        internal Matrix CurrentContainerTransform => _currentContainerTransform;
 
         /// <summary>
         /// Draws a bitmap image.
@@ -125,7 +127,9 @@ namespace Avalonia.Media
                 Matrix,
                 Opacity,
                 Clip,
-                MatrixContainer
+                MatrixContainer,
+                GeometryClip,
+                OpacityMask
             }
 
             public PushedState(DrawingContext context, PushedStateType type, Matrix matrix = default(Matrix))
@@ -147,10 +151,14 @@ namespace Avalonia.Media
                 _context._states.Pop();
                 if (_type == PushedStateType.Matrix)
                     _context.CurrentTransform = _matrix;
-                else if(_type == PushedStateType.Clip)
+                else if (_type == PushedStateType.Clip)
                     _context._impl.PopClip();
-                else if(_type == PushedStateType.Opacity)
+                else if (_type == PushedStateType.Opacity)
                     _context._impl.PopOpacity();
+                else if (_type == PushedStateType.GeometryClip)
+                    _context._impl.PopGeometryClip();
+                else if (_type == PushedStateType.OpacityMask)
+                    _context._impl.PopOpacityMask();
                 else if (_type == PushedStateType.MatrixContainer)
                 {
                     var cont = _context._transformContainers.Pop();
@@ -172,6 +180,18 @@ namespace Avalonia.Media
             return new PushedState(this, PushedState.PushedStateType.Clip);
         }
 
+        /// <summary>
+        /// Pushes a clip geometry.
+        /// </summary>
+        /// <param name="clip">The clip geometry.</param>
+        /// <returns>A disposable used to undo the clip geometry.</returns>
+        public PushedState PushGeometryClip(Geometry clip)
+        {
+            Contract.Requires<ArgumentNullException>(clip != null);
+            _impl.PushGeometryClip(clip);
+            return new PushedState(this, PushedState.PushedStateType.GeometryClip);
+        }
+
         /// <summary>
         /// Pushes an opacity value.
         /// </summary>
@@ -184,6 +204,17 @@ namespace Avalonia.Media
             return new PushedState(this, PushedState.PushedStateType.Opacity);
         }
 
+        /// <summary>
+        /// Pushes an opacity mask.
+        /// </summary>
+        /// <param name="mask">The opacity mask.</param>
+        /// <returns>A disposable to undo the opacity mask.</returns>
+        public PushedState PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            _impl.PushOpacityMask(mask, bounds);
+            return new PushedState(this, PushedState.PushedStateType.OpacityMask);
+        }
+
         /// <summary>
         /// Pushes a matrix transformation.
         /// </summary>
diff --git a/src/Avalonia.SceneGraph/Media/Geometry.cs b/src/Avalonia.SceneGraph/Media/Geometry.cs
index e6eaaff042..092aea0c61 100644
--- a/src/Avalonia.SceneGraph/Media/Geometry.cs
+++ b/src/Avalonia.SceneGraph/Media/Geometry.cs
@@ -66,5 +66,15 @@ namespace Avalonia.Media
         {
             return PlatformImpl.GetRenderBounds(strokeThickness);
         }
+
+        /// <summary>
+        /// Indicates whether the geometry contains the specified point.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        public bool FillContains(Point point)
+        {
+            return PlatformImpl.FillContains(point);
+        }
     }
 }
diff --git a/src/Avalonia.SceneGraph/Media/IDrawingContext.cs b/src/Avalonia.SceneGraph/Media/IDrawingContext.cs
index 31f5b0d38a..c63abc160f 100644
--- a/src/Avalonia.SceneGraph/Media/IDrawingContext.cs
+++ b/src/Avalonia.SceneGraph/Media/IDrawingContext.cs
@@ -69,7 +69,6 @@ namespace Avalonia.Media
         /// Pushes a clip rectange.
         /// </summary>
         /// <param name="clip">The clip rectangle.</param>
-        /// <returns>A disposable used to undo the clip rectangle.</returns>
         void PushClip(Rect clip);
 
         void PopClip();
@@ -78,9 +77,20 @@ namespace Avalonia.Media
         /// Pushes an opacity value.
         /// </summary>
         /// <param name="opacity">The opacity.</param>
-        /// <returns>A disposable used to undo the opacity.</returns>
         void PushOpacity(double opacity);
 
         void PopOpacity();
+
+        void PushOpacityMask(IBrush mask, Rect bounds);
+
+        void PopOpacityMask();
+
+        /// <summary>
+        /// Pushes a clip geometry.
+        /// </summary>
+        /// <param name="clip">The clip geometry.</param>
+        void PushGeometryClip(Geometry clip);
+
+        void PopGeometryClip();
     }
 }
diff --git a/src/Avalonia.SceneGraph/Media/Imaging/Bitmap.cs b/src/Avalonia.SceneGraph/Media/Imaging/Bitmap.cs
index 5b84b0ddd3..3473c4a094 100644
--- a/src/Avalonia.SceneGraph/Media/Imaging/Bitmap.cs
+++ b/src/Avalonia.SceneGraph/Media/Imaging/Bitmap.cs
@@ -55,7 +55,8 @@ namespace Avalonia.Media.Imaging
         /// </summary>
         public IBitmapImpl PlatformImpl
         {
-            get; }
+            get;
+        }
 
         /// <summary>
         /// Saves the bitmap to a file.
diff --git a/src/Avalonia.SceneGraph/Media/PathMarkupParser.cs b/src/Avalonia.SceneGraph/Media/PathMarkupParser.cs
index a089d71127..3c0150e2d3 100644
--- a/src/Avalonia.SceneGraph/Media/PathMarkupParser.cs
+++ b/src/Avalonia.SceneGraph/Media/PathMarkupParser.cs
@@ -34,6 +34,12 @@ namespace Avalonia.Media
             { 'z', Command.Close },
         };
 
+        private static readonly Dictionary<char, FillRule> FillRules = new Dictionary<char, FillRule>
+        {
+            {'0', FillRule.EvenOdd },
+            {'1', FillRule.NonZero }
+        };
+
         private StreamGeometry _geometry;
 
         private readonly StreamGeometryContext _context;
@@ -90,8 +96,7 @@ namespace Avalonia.Media
                     switch (command)
                     {
                         case Command.FillRule:
-                            // TODO: Implement.
-                            reader.Read();
+                            _context.SetFillRule(ReadFillRule(reader));
                             break;
 
                         case Command.Move:
@@ -226,6 +231,24 @@ namespace Avalonia.Media
             }
         }
 
+        private static FillRule ReadFillRule(StringReader reader)
+        {
+            int i = reader.Read();
+            if (i == -1)
+            {
+                throw new InvalidDataException("Invalid fill rule");
+            }
+            char c = (char)i;
+            FillRule rule;
+
+            if (!FillRules.TryGetValue(c, out rule))
+            {
+                throw new InvalidDataException("Invalid fill rule");
+            }
+
+            return rule;
+        }
+
         private static double ReadDouble(StringReader reader)
         {
             ReadWhitespace(reader);
@@ -248,8 +271,16 @@ namespace Avalonia.Media
                 {
                     b.Append(c);
                     reader.Read();
-                    readSign = c == '+' || c == '-';
-                    readPoint = c == '.';
+
+                    if (!readSign)
+                    {
+                        readSign = c == '+' || c == '-';
+                    }
+
+                    if (!readPoint)
+                    {
+                        readPoint = c == '.';
+                    }
 
                     if (c == 'E')
                     {
diff --git a/src/Avalonia.SceneGraph/Platform/IGeometryImpl.cs b/src/Avalonia.SceneGraph/Platform/IGeometryImpl.cs
index f3a3f655e5..e18a76d739 100644
--- a/src/Avalonia.SceneGraph/Platform/IGeometryImpl.cs
+++ b/src/Avalonia.SceneGraph/Platform/IGeometryImpl.cs
@@ -24,5 +24,12 @@ namespace Avalonia.Platform
         /// <param name="strokeThickness">The stroke thickness.</param>
         /// <returns>The bounding rectangle.</returns>
         Rect GetRenderBounds(double strokeThickness);
+
+        /// <summary>
+        /// Indicates whether the geometry contains the specified point.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        bool FillContains(Point point);
     }
 }
diff --git a/src/Avalonia.SceneGraph/Rect.cs b/src/Avalonia.SceneGraph/Rect.cs
index de4d13890b..10253ec829 100644
--- a/src/Avalonia.SceneGraph/Rect.cs
+++ b/src/Avalonia.SceneGraph/Rect.cs
@@ -224,14 +224,24 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Determines whether a points in in the bounds of the rectangle.
+        /// Determines whether a point in in the bounds of the rectangle.
         /// </summary>
         /// <param name="p">The point.</param>
         /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
         public bool Contains(Point p)
         {
-            return p.X >= _x && p.X < _x + _width &&
-                   p.Y >= _y && p.Y < _y + _height;
+            return p.X >= _x && p.X <= _x + _width &&
+                   p.Y >= _y && p.Y <= _y + _height;
+        }
+
+        /// <summary>
+        /// Determines whether the rectangle fully contains another rectangle.
+        /// </summary>
+        /// <param name="r">The rectangle.</param>
+        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
+        public bool Contains(Rect r)
+        {
+            return Contains(r.TopLeft) && Contains(r.BottomRight);
         }
 
         /// <summary>
diff --git a/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs b/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs
index 3157feb369..0bb5bf63f8 100644
--- a/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs
+++ b/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs
@@ -104,7 +104,7 @@ namespace Avalonia.Rendering
 
                 if (visual.RenderTransform != null)
                 {
-                    var origin = visual.TransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
                     var offset = Matrix.CreateTranslation(origin);
                     renderTransform = (-offset) * visual.RenderTransform.Value * (offset);
                 }
@@ -119,9 +119,17 @@ namespace Avalonia.Rendering
                 using (context.PushPostTransform(m))
                 using (context.PushOpacity(opacity))
                 using (clipToBounds ? context.PushClip(bounds) : default(DrawingContext.PushedState))
+                using (visual.Clip != null ? context.PushGeometryClip(visual.Clip) : default(DrawingContext.PushedState))
+                using (visual.OpacityMask != null ? context.PushOpacityMask(visual.OpacityMask, bounds) : default(DrawingContext.PushedState))
                 using (context.PushTransformContainer())
                 {
                     visual.Render(context);
+                    var transformed =
+                        new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
+                    if (visual is Visual)
+                    {
+                        BoundsTracker.SetTransformedBounds((Visual)visual, transformed);
+                    }
 
                     var lst = GetSortedVisualList(visual.VisualChildren);
 
@@ -164,7 +172,7 @@ namespace Avalonia.Rendering
             }
             else
             {
-                var origin = visual.TransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
                 var offset = Matrix.CreateTranslation(visual.Bounds.Position + origin);
                 var m = (-offset) * visual.RenderTransform.Value * (offset);
                 return visual.Bounds.TransformToAABB(m);
diff --git a/src/Avalonia.SceneGraph/Visual.cs b/src/Avalonia.SceneGraph/Visual.cs
index 9cf97c2767..54786ac85a 100644
--- a/src/Avalonia.SceneGraph/Visual.cs
+++ b/src/Avalonia.SceneGraph/Visual.cs
@@ -39,6 +39,12 @@ namespace Avalonia
         public static readonly StyledProperty<bool> ClipToBoundsProperty =
             AvaloniaProperty.Register<Visual, bool>(nameof(ClipToBounds));
 
+        /// <summary>
+        /// Defines the <see cref="Clip"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Geometry> ClipProperty =
+            AvaloniaProperty.Register<Visual, Geometry>(nameof(Clip));
+
         /// <summary>
         /// Defines the <see cref="IsVisibleProperty"/> property.
         /// </summary>
@@ -51,6 +57,12 @@ namespace Avalonia
         public static readonly StyledProperty<double> OpacityProperty =
             AvaloniaProperty.Register<Visual, double>(nameof(Opacity), 1);
 
+        /// <summary>
+        /// Defines the <see cref="OpacityMask"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> OpacityMaskProperty =
+            AvaloniaProperty.Register<Visual, IBrush>(nameof(OpacityMask));
+
         /// <summary>
         /// Defines the <see cref="RenderTransform"/> property.
         /// </summary>
@@ -58,10 +70,10 @@ namespace Avalonia
             AvaloniaProperty.Register<Visual, Transform>(nameof(RenderTransform));
 
         /// <summary>
-        /// Defines the <see cref="TransformOrigin"/> property.
+        /// Defines the <see cref="RenderTransformOrigin"/> property.
         /// </summary>
-        public static readonly StyledProperty<RelativePoint> TransformOriginProperty =
-            AvaloniaProperty.Register<Visual, RelativePoint>(nameof(TransformOrigin), defaultValue: RelativePoint.Center);
+        public static readonly StyledProperty<RelativePoint> RenderTransformOriginProperty =
+            AvaloniaProperty.Register<Visual, RelativePoint>(nameof(RenderTransformOrigin), defaultValue: RelativePoint.Center);
 
         /// <summary>
         /// Defines the <see cref="IVisual.VisualParent"/> property.
@@ -127,6 +139,15 @@ namespace Avalonia
             set { SetValue(ClipToBoundsProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the geometry clip for this visual.
+        /// </summary>
+        public Geometry Clip
+        {
+            get { return GetValue(ClipProperty); }
+            set { SetValue(ClipProperty, value); }
+        }
+
         /// <summary>
         /// Gets a value indicating whether this scene graph node and all its parents are visible.
         /// </summary>
@@ -153,6 +174,16 @@ namespace Avalonia
             set { SetValue(OpacityProperty, value); }
         }
 
+
+        /// <summary>
+        /// Gets the opacity mask of the scene graph node.
+        /// </summary>
+        public IBrush OpacityMask
+        {
+            get { return GetValue(OpacityMaskProperty); }
+            set { SetValue(OpacityMaskProperty, value); }
+        }
+
         /// <summary>
         /// Gets the render transform of the scene graph node.
         /// </summary>
@@ -165,10 +196,10 @@ namespace Avalonia
         /// <summary>
         /// Gets the transform origin of the scene graph node.
         /// </summary>
-        public RelativePoint TransformOrigin
+        public RelativePoint RenderTransformOrigin
         {
-            get { return GetValue(TransformOriginProperty); }
-            set { SetValue(TransformOriginProperty, value); }
+            get { return GetValue(RenderTransformOriginProperty); }
+            set { SetValue(RenderTransformOriginProperty, value); }
         }
 
         /// <summary>
@@ -353,6 +384,16 @@ namespace Avalonia
             DetachedFromVisualTree?.Invoke(this, e);
         }
 
+        /// <summary>
+        /// Called when the control's visual parent changes.
+        /// </summary>
+        /// <param name="oldParent">The old visual parent.</param>
+        /// <param name="newParent">The new visual parent.</param>
+        protected virtual void OnVisualParentChanged(IVisual oldParent, IVisual newParent)
+        {
+            RaisePropertyChanged(VisualParentProperty, oldParent, newParent, BindingPriority.LocalValue);
+        }
+
         /// <summary>
         /// Called when a property changes that should invalidate the visual.
         /// </summary>
@@ -468,7 +509,7 @@ namespace Avalonia
                 OnAttachedToVisualTreeCore(e);
             }
 
-            RaisePropertyChanged(VisualParentProperty, old, value, BindingPriority.LocalValue);
+            OnVisualParentChanged(old, value);
         }
 
         /// <summary>
diff --git a/src/Avalonia.SceneGraph/VisualTree/BoundsTracker.cs b/src/Avalonia.SceneGraph/VisualTree/BoundsTracker.cs
index f39c0f0c87..4824cb141b 100644
--- a/src/Avalonia.SceneGraph/VisualTree/BoundsTracker.cs
+++ b/src/Avalonia.SceneGraph/VisualTree/BoundsTracker.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
+using Avalonia.Media;
 
 namespace Avalonia.VisualTree
 {
@@ -16,6 +17,9 @@ namespace Avalonia.VisualTree
     /// </remarks>
     public class BoundsTracker
     {
+        private static AttachedProperty<TransformedBounds> TransformedBoundsProperty =
+            AvaloniaProperty.RegisterAttached<BoundsTracker, Visual, TransformedBounds>("TransformedBounds");
+
         /// <summary>
         /// Starts tracking the specified visual.
         /// </summary>
@@ -23,42 +27,19 @@ namespace Avalonia.VisualTree
         /// <returns>An observable that returns the tracked bounds.</returns>
         public IObservable<TransformedBounds> Track(Visual visual)
         {
-            return Track(visual, (Visual)visual.GetVisualRoot());
+            return visual.GetObservable(TransformedBoundsProperty);
         }
 
-        /// <summary>
-        /// Starts tracking the specified visual relative to another control.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="relativeTo">The control that the tracking should be relative to.</param>
-        /// <returns>An observable that returns the tracked bounds.</returns>
-        public IObservable<TransformedBounds> Track(Visual visual, Visual relativeTo)
+        internal static void SetTransformedBounds(Visual visual, TransformedBounds bounds)
         {
-            var visuals = visual.GetSelfAndVisualAncestors()
-                .TakeWhile(x => x != relativeTo)
-                .Reverse();
-            var boundsSubscriptions = new List<IObservable<Rect>>();
-
-            foreach (var v in visuals.Cast<Visual>())
-            {
-                boundsSubscriptions.Add(v.GetObservable(Visual.BoundsProperty));
-            }
-
-            var bounds = boundsSubscriptions.CombineLatest().Select(ExtractBounds);
-
-            // TODO: Track transform and clip rectangle.
-            return bounds.Select(x => new TransformedBounds(x, new Rect(), Matrix.Identity));
+            visual.SetValue(TransformedBoundsProperty, bounds);
         }
 
         /// <summary>
-        /// Sums a collection of rectangles.
+        /// Gets the transformed bounds of the visual.
         /// </summary>
-        /// <param name="rects">The collection of rectangles.</param>
-        /// <returns>The summed rectangle.</returns>
-        private static Rect ExtractBounds(IList<Rect> rects)
-        {
-            var position = rects.Select(x => x.Position).Aggregate((a, b) => a + b);
-            return new Rect(position, rects.Last().Size);
-        }
+        /// <param name="visual">The visual.</param>
+        /// <returns>The transformed bounds.</returns>
+        public static TransformedBounds GetTransformedBounds(Visual visual) => visual.GetValue(TransformedBoundsProperty);
     }
 }
diff --git a/src/Avalonia.SceneGraph/VisualTree/IVisual.cs b/src/Avalonia.SceneGraph/VisualTree/IVisual.cs
index 4d6a33b99c..b9b37b1a20 100644
--- a/src/Avalonia.SceneGraph/VisualTree/IVisual.cs
+++ b/src/Avalonia.SceneGraph/VisualTree/IVisual.cs
@@ -41,6 +41,11 @@ namespace Avalonia.VisualTree
         /// </summary>
         bool ClipToBounds { get; set; }
 
+        /// <summary>
+        /// Gets or sets the geometry clip for this visual.
+        /// </summary>
+        Geometry Clip { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether this scene graph node is attached to a visual root.
         /// </summary>
@@ -61,15 +66,20 @@ namespace Avalonia.VisualTree
         /// </summary>
         double Opacity { get; set; }
 
+        /// <summary>
+        /// Gets or sets the opacity mask of the scene graph node.
+        /// </summary>
+        IBrush OpacityMask { get; set; }
+
         /// <summary>
         /// Gets or sets the render transform of the scene graph node.
         /// </summary>
         Transform RenderTransform { get; set; }
 
         /// <summary>
-        /// Gets or sets the transform origin of the scene graph node.
+        /// Gets or sets the render transform origin of the scene graph node.
         /// </summary>
-        RelativePoint TransformOrigin { get; set; }
+        RelativePoint RenderTransformOrigin { get; set; }
 
         /// <summary>
         /// Gets the scene graph node's child nodes.
diff --git a/src/Avalonia.SceneGraph/VisualTree/TransformedBounds.cs b/src/Avalonia.SceneGraph/VisualTree/TransformedBounds.cs
index c7e0f3abe0..4c548669bd 100644
--- a/src/Avalonia.SceneGraph/VisualTree/TransformedBounds.cs
+++ b/src/Avalonia.SceneGraph/VisualTree/TransformedBounds.cs
@@ -1,15 +1,17 @@
 // 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;
+
 namespace Avalonia.VisualTree
 {
     /// <summary>
-    /// Holds information about the bounds of a control, together with a transform and a clip/
+    /// Holds information about the bounds of a control, together with a transform and a clip.
     /// </summary>
-    public class TransformedBounds
+    public struct TransformedBounds
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="TransformedBounds"/> class.
+        /// Initializes a new instance of the <see cref="TransformedBounds"/> struct.
         /// </summary>
         /// <param name="bounds">The control's bounds.</param>
         /// <param name="clip">The control's clip rectangle.</param>
@@ -35,5 +37,19 @@ namespace Avalonia.VisualTree
         /// Gets the control's transform.
         /// </summary>
         public Matrix Transform { get; }
+
+        public bool Contains(Point point)
+        {
+            if (Transform.HasInverse)
+            {
+                Point trPoint = point * Transform.Invert();
+
+                return Bounds.Contains(trPoint);
+            }
+            else
+            {
+                return Bounds.Contains(point);
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
index d40627a16e..5117aeb8c3 100644
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -43,12 +43,17 @@
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Controls\NameScopeEventArgs.cs" />
+    <Compile Include="Controls\NameScopeExtensions.cs" />
     <Compile Include="LogicalTree\ILogical.cs" />
     <Compile Include="LogicalTree\LogicalExtensions.cs" />
     <Compile Include="LogicalTree\LogicalTreeAttachmentEventArgs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Styling\ActivatedSubject.cs" />
     <Compile Include="Styling\ActivatedValue.cs" />
+    <Compile Include="Controls\INameScope.cs" />
+    <Compile Include="Styling\ITemplate.cs" />
+    <Compile Include="Controls\NameScope.cs" />
     <Compile Include="Styling\TemplateSelector.cs" />
     <Compile Include="Styling\DescendentSelector.cs" />
     <Compile Include="Styling\ChildSelector.cs" />
@@ -92,6 +97,10 @@
     <None Include="Styling\packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj">
+      <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
+      <Name>Avalonia.Animation</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj">
       <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
       <Name>Avalonia.Base</Name>
diff --git a/src/Avalonia.Controls/INameScope.cs b/src/Avalonia.Styling/Controls/INameScope.cs
similarity index 100%
rename from src/Avalonia.Controls/INameScope.cs
rename to src/Avalonia.Styling/Controls/INameScope.cs
diff --git a/src/Avalonia.Controls/NameScope.cs b/src/Avalonia.Styling/Controls/NameScope.cs
similarity index 93%
rename from src/Avalonia.Controls/NameScope.cs
rename to src/Avalonia.Styling/Controls/NameScope.cs
index aeba4158ef..ddfb3ea173 100644
--- a/src/Avalonia.Controls/NameScope.cs
+++ b/src/Avalonia.Styling/Controls/NameScope.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls
         /// Defines the NameScope attached property.
         /// </summary>
         public static readonly AttachedProperty<INameScope> NameScopeProperty =
-            AvaloniaProperty.RegisterAttached<NameScope, Control, INameScope>("NameScope");
+            AvaloniaProperty.RegisterAttached<NameScope, Visual, INameScope>("NameScope");
 
         private readonly Dictionary<string, object> _inner = new Dictionary<string, object>();
 
@@ -34,7 +34,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="visual">The visual.</param>
         /// <returns>The value of the NameScope attached property.</returns>
-        public static INameScope GetNameScope(Control visual)
+        public static INameScope GetNameScope(Visual visual)
         {
             return visual.GetValue(NameScopeProperty);
         }
@@ -44,7 +44,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="visual">The visual.</param>
         /// <param name="value">The value to set.</param>
-        public static void SetNameScope(Control visual, INameScope value)
+        public static void SetNameScope(Visual visual, INameScope value)
         {
             visual.SetValue(NameScopeProperty, value);
         }
diff --git a/src/Avalonia.Controls/NameScopeEventArgs.cs b/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
similarity index 100%
rename from src/Avalonia.Controls/NameScopeEventArgs.cs
rename to src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
diff --git a/src/Avalonia.Controls/NameScopeExtensions.cs b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
similarity index 100%
rename from src/Avalonia.Controls/NameScopeExtensions.cs
rename to src/Avalonia.Styling/Controls/NameScopeExtensions.cs
diff --git a/src/Avalonia.Styling/Styling/ITemplate.cs b/src/Avalonia.Styling/Styling/ITemplate.cs
new file mode 100644
index 0000000000..1593326e37
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/ITemplate.cs
@@ -0,0 +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.
+
+namespace Avalonia.Styling
+{
+    public interface ITemplate
+    {
+        object Build();
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index 09faf37360..7f696a1f0a 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Reactive.Disposables;
 using System.Reactive.Subjects;
+using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Metadata;
 using Avalonia.Reactive;
@@ -19,6 +20,8 @@ namespace Avalonia.Styling
     /// </remarks>
     public class Setter : ISetter
     {
+        private object _value;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Setter"/> class.
         /// </summary>
@@ -54,8 +57,22 @@ namespace Avalonia.Styling
         [DependsOn(nameof(Property))]
         public object Value
         {
-            get;
-            set;
+            get
+            {
+                return _value;
+            }
+
+            set
+            {
+                if (value is IStyleable)
+                {
+                    throw new ArgumentException(
+                        "Cannot assign a control to Style.Value. Wrap the control in a <Template>.",
+                        "value");
+                }
+
+                _value = value;
+            }
         }
 
         /// <summary>
@@ -75,17 +92,27 @@ namespace Avalonia.Styling
                 throw new InvalidOperationException("Setter.Property must be set.");
             }
 
-            var binding = Value as IBinding;
+            var value = Value;
+            var binding = value as IBinding;
 
             if (binding == null)
             {
+                var template = value as ITemplate;
+
+                if (template != null)
+                {
+                    var materialized = template.Build();
+                    NameScope.SetNameScope((Visual)materialized, new NameScope());
+                    value = materialized;
+                }
+
                 if (activator == null)
                 {
-                    return control.Bind(Property, ObservableEx.SingleValue(Value), BindingPriority.Style);
+                    return control.Bind(Property, ObservableEx.SingleValue(value), BindingPriority.Style);
                 }
                 else
                 {
-                    var activated = new ActivatedValue(activator, Value, description);
+                    var activated = new ActivatedValue(activator, value, description);
                     return control.Bind(Property, activated, BindingPriority.StyleTrigger);
                 }
             }
diff --git a/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs b/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs
index 74e1c17cf0..696274ed69 100644
--- a/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs
+++ b/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Cairo.Media
     using Cairo = global::Cairo;
 
     /// <summary>
-    /// Draws using Direct2D1.
+    /// Draws using Cairo.
     /// </summary>
     public class DrawingContext : IDrawingContextImpl, IDisposable
     {
@@ -24,6 +24,8 @@ namespace Avalonia.Cairo.Media
         /// </summary>
         private readonly Cairo.Context _context;
 
+        private readonly Stack<BrushImpl> _maskStack = new Stack<BrushImpl>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DrawingContext"/> class.
         /// </summary>
@@ -83,31 +85,31 @@ namespace Avalonia.Cairo.Media
             _context.Scale(scale.X, scale.Y);
             destRect /= scale;
 
-			if (opacityOverride < 1.0f) {
-				_context.PushGroup ();
-				Gdk.CairoHelper.SetSourcePixbuf (
-					_context, 
-					impl.Surface, 
-					-sourceRect.X + destRect.X, 
-					-sourceRect.Y + destRect.Y);
-
-				_context.Rectangle (destRect.ToCairo ());
-				_context.Fill ();
-				_context.PopGroupToSource ();
-				_context.PaintWithAlpha (opacityOverride);
-			} else {
-				_context.PushGroup ();
-				Gdk.CairoHelper.SetSourcePixbuf (
-					_context, 
-					impl.Surface, 
-					-sourceRect.X + destRect.X, 
-					-sourceRect.Y + destRect.Y);
-
-				_context.Rectangle (destRect.ToCairo ());
-				_context.Fill ();
-				_context.PopGroupToSource ();
-				_context.PaintWithAlpha (opacityOverride);			
-			}
+            if (opacityOverride < 1.0f) {
+                _context.PushGroup ();
+                Gdk.CairoHelper.SetSourcePixbuf (
+                    _context, 
+                    impl.Surface, 
+                    -sourceRect.X + destRect.X, 
+                    -sourceRect.Y + destRect.Y);
+
+                _context.Rectangle (destRect.ToCairo ());
+                _context.Fill ();
+                _context.PopGroupToSource ();
+                _context.PaintWithAlpha (opacityOverride);
+            } else {
+                _context.PushGroup ();
+                Gdk.CairoHelper.SetSourcePixbuf (
+                    _context, 
+                    impl.Surface, 
+                    -sourceRect.X + destRect.X, 
+                    -sourceRect.Y + destRect.Y);
+
+                _context.Rectangle (destRect.ToCairo ());
+                _context.Fill ();
+                _context.PopGroupToSource ();
+                _context.PaintWithAlpha (opacityOverride);			
+            }
             _context.Restore();
         }
 
@@ -121,12 +123,12 @@ namespace Avalonia.Cairo.Media
         {
             var size = new Rect(p1, p2).Size;
             
-			using (var p = SetPen(pen, size)) 
-			{
-				_context.MoveTo(p1.ToCairo());
-				_context.LineTo(p2.ToCairo());
-				_context.Stroke();
-			}
+            using (var p = SetPen(pen, size)) 
+            {
+                _context.MoveTo(p1.ToCairo());
+                _context.LineTo(p2.ToCairo());
+                _context.Stroke();
+            }
         }
 
         /// <summary>
@@ -177,11 +179,11 @@ namespace Avalonia.Cairo.Media
         /// <param name="rect">The rectangle bounds.</param>
         public void DrawRectangle(Pen pen, Rect rect, float cornerRadius)
         {
-			using (var p = SetPen(pen, rect.Size)) 
-			{
-				_context.Rectangle(rect.ToCairo ());
-				_context.Stroke();
-			}
+            using (var p = SetPen(pen, rect.Size)) 
+            {
+                _context.Rectangle(rect.ToCairo ());
+                _context.Stroke();
+            }
         }
 
         /// <summary>
@@ -195,10 +197,10 @@ namespace Avalonia.Cairo.Media
             var layout = ((FormattedTextImpl)text.PlatformImpl).Layout;
             _context.MoveTo(origin.X, origin.Y);
 
-			using (var b = SetBrush(foreground, new Size(0, 0))) 
-			{
-				Pango.CairoHelper.ShowLayout(_context, layout);
-			}
+            using (var b = SetBrush(foreground, new Size(0, 0))) 
+            {
+                Pango.CairoHelper.ShowLayout(_context, layout);
+            }
         }
 
         /// <summary>
@@ -208,11 +210,11 @@ namespace Avalonia.Cairo.Media
         /// <param name="rect">The rectangle bounds.</param>
         public void FillRectangle(IBrush brush, Rect rect, float cornerRadius)
         {
-			using (var b = SetBrush(brush, rect.Size)) 
-			{
-				_context.Rectangle(rect.ToCairo ());
-				_context.Fill();
-			}
+            using (var b = SetBrush(brush, rect.Size)) 
+            {
+                _context.Rectangle(rect.ToCairo ());
+                _context.Fill();
+            }
         }
 
         /// <summary>
@@ -269,50 +271,57 @@ namespace Avalonia.Cairo.Media
             });
         }
         
-		private double opacityOverride = 1.0f;
+        private double opacityOverride = 1.0f;
 
         private IDisposable SetBrush(IBrush brush, Size destinationSize)
         {
-			_context.Save ();
+            _context.Save();
+
+            BrushImpl impl = CreateBrushImpl(brush, destinationSize);
 
+            _context.SetSource(impl.PlatformBrush);
+            return Disposable.Create(() =>
+            {
+                impl.Dispose();
+                _context.Restore();
+            });
+        }
+
+        private BrushImpl CreateBrushImpl(IBrush brush, Size destinationSize)
+        {
             var solid = brush as SolidColorBrush;
             var linearGradientBrush = brush as LinearGradientBrush;
             var radialGradientBrush = brush as RadialGradientBrush;
             var imageBrush = brush as ImageBrush;
             var visualBrush = brush as VisualBrush;
-			BrushImpl impl = null;
-
-			if (solid != null) 
-			{
-				impl = new SolidColorBrushImpl(solid, opacityOverride);
-			} 
-			else if (linearGradientBrush != null) 
-			{
-				impl = new LinearGradientBrushImpl(linearGradientBrush, destinationSize);
-			}
+            BrushImpl impl = null;
+
+            if (solid != null)
+            {
+                impl = new SolidColorBrushImpl(solid, opacityOverride);
+            }
+            else if (linearGradientBrush != null)
+            {
+                impl = new LinearGradientBrushImpl(linearGradientBrush, destinationSize);
+            }
             else if (radialGradientBrush != null)
             {
                 impl = new RadialGradientBrushImpl(radialGradientBrush, destinationSize);
             }
-            else if (imageBrush != null) 
-			{
-				impl = new ImageBrushImpl(imageBrush, destinationSize);
-			} 
-			else if (visualBrush != null) 
-			{
-				impl = new VisualBrushImpl(visualBrush, destinationSize);
-			} 
-			else 
-			{
-				impl = new SolidColorBrushImpl(null, opacityOverride);
-			}
-
-			_context.SetSource(impl.PlatformBrush);
-			return Disposable.Create(() => 
-			{
-			    impl.Dispose();
-				_context.Restore();
-			});
+            else if (imageBrush != null)
+            {
+                impl = new ImageBrushImpl(imageBrush, destinationSize);
+            }
+            else if (visualBrush != null)
+            {
+                impl = new VisualBrushImpl(visualBrush, destinationSize);
+            }
+            else
+            {
+                impl = new SolidColorBrushImpl(null, opacityOverride);
+            }
+
+            return impl;
         }
 
         private IDisposable SetPen(Pen pen, Size destinationSize)
@@ -335,10 +344,35 @@ namespace Avalonia.Cairo.Media
             _context.LineJoin = Cairo.LineJoin.Miter;
             _context.LineCap = Cairo.LineCap.Butt;
 
-			if (pen.Brush == null)
-				return Disposable.Empty;
-			
-			return SetBrush(pen.Brush, destinationSize);
+            if (pen.Brush == null)
+                return Disposable.Empty;
+            
+            return SetBrush(pen.Brush, destinationSize);
+        }
+
+        public void PushGeometryClip(Geometry clip)
+        {
+            _context.Save();
+            _context.AppendPath(((StreamGeometryImpl)clip.PlatformImpl).Path);
+            _context.Clip();
+        }
+
+        public void PopGeometryClip()
+        {
+            _context.Restore();
+        }
+
+        public void PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            _context.PushGroup();
+            var impl = CreateBrushImpl(mask, bounds.Size);
+            _maskStack.Push(impl);
+        }
+
+        public void PopOpacityMask()
+        {
+            _context.PopGroupToSource();
+            _context.Mask(_maskStack.Pop().PlatformBrush);
         }
     }
 }
diff --git a/src/Gtk/Avalonia.Cairo/Media/StreamGeometryContextImpl.cs b/src/Gtk/Avalonia.Cairo/Media/StreamGeometryContextImpl.cs
index 126db894be..1938d7e49e 100644
--- a/src/Gtk/Avalonia.Cairo/Media/StreamGeometryContextImpl.cs
+++ b/src/Gtk/Avalonia.Cairo/Media/StreamGeometryContextImpl.cs
@@ -62,6 +62,15 @@ namespace Avalonia.Cairo.Media
             }
         }
 
+        internal bool FillContains(Point point)
+        {
+            using (var context = new Cairo.Context(new Cairo.ImageSurface(Cairo.Format.Argb32, 0, 0)))
+            {
+                context.AppendPath(Path);
+                return context.InFill(point.X, point.Y); 
+            }
+        }
+
         public void LineTo(Point point)
         {
             if (this.Path == null)
diff --git a/src/Gtk/Avalonia.Cairo/Media/StreamGeometryImpl.cs b/src/Gtk/Avalonia.Cairo/Media/StreamGeometryImpl.cs
index 6152e73489..c325ebab14 100644
--- a/src/Gtk/Avalonia.Cairo/Media/StreamGeometryImpl.cs
+++ b/src/Gtk/Avalonia.Cairo/Media/StreamGeometryImpl.cs
@@ -67,5 +67,10 @@ namespace Avalonia.Cairo.Media
         {
             return _impl;
         }
+
+        public bool FillContains(Point point)
+        {
+            return _impl.FillContains(point);
+        }
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs b/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs
index f5dd4b5f4b..1f5d259fc3 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs
@@ -23,6 +23,7 @@ namespace Avalonia.Markup.Xaml.Context
             Settings settings = null)
         {
             var mapping = new DeferredLoaderMapping();
+            mapping.Map<Template>(x => x.Content, new TemplateLoader());
             mapping.Map<ControlTemplate>(x => x.Content, new TemplateLoader());
             mapping.Map<DataTemplate>(x => x.Content, new TemplateLoader());
             mapping.Map<FocusAdornerTemplate>(x => x.Content, new TemplateLoader());
diff --git a/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs b/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs
index 20d9b07daf..e295292ba0 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs
@@ -136,7 +136,14 @@ namespace Avalonia.Markup.Xaml.Context
 
             if (control != null)
             {
-                DelayedBinding.Add(control, property, binding);
+                if (property != Control.DataContextProperty)
+                {
+                    DelayedBinding.Add(control, property, binding);
+                }
+                else
+                {
+                    control.Bind(property, binding);
+                }
             }
             else
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 4b812e12f0..ec60695374 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -20,6 +20,7 @@ namespace Avalonia.Markup.Xaml.Data
         /// </summary>
         public Binding()
         {
+            FallbackValue = AvaloniaProperty.UnsetValue;
         }
 
         /// <summary>
@@ -27,6 +28,7 @@ namespace Avalonia.Markup.Xaml.Data
         /// </summary>
         /// <param name="path">The binding path.</param>
         public Binding(string path)
+            : this()
         {
             Path = path;
         }
@@ -122,12 +124,23 @@ namespace Avalonia.Markup.Xaml.Data
                 throw new NotSupportedException();
             }
 
+            var fallback = FallbackValue;
+
+            // If we're binding to DataContext and our fallback is UnsetValue then override
+            // the fallback value to null, as broken bindings to DataContext must reset the
+            // DataContext in order to not propagate incorrect DataContexts to child controls.
+            // See Avalonia.Markup.Xaml.UnitTests.Data.DataContext_Binding_Should_Produce_Correct_Results.
+            if (targetProperty == Control.DataContextProperty && fallback == AvaloniaProperty.UnsetValue)
+            {
+                fallback = null;
+            }
+
             var subject = new ExpressionSubject(
                 observer,
                 targetProperty?.PropertyType ?? typeof(object),
+                fallback,
                 Converter ?? DefaultValueConverter.Instance,
                 ConverterParameter,
-                FallbackValue,
                 Priority);
 
             return new InstancedBinding(subject, Mode, Priority);
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/DelayedBinding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/DelayedBinding.cs
index ea79c7429f..083cb24b11 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/DelayedBinding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/DelayedBinding.cs
@@ -14,11 +14,11 @@ namespace Avalonia.Markup.Xaml.Data
     /// </summary>
     /// <remarks>
     /// The XAML engine applies its bindings in a delayed manner where bindings are only applied
-    /// when a control has finished initializing. This was done because applying bindings as soon
+    /// when a control has finished initializing. This is done because applying bindings as soon
     /// as controls are created means that long-form bindings (i.e. bindings that don't use the
-    /// `{Binding}` markup extension) don't work as the binding is applied to the property before
-    /// the binding properties are set, and looking at WPF it uses a similar mechanism for bindings
-    /// that come from XAML.
+    /// `{Binding}` markup extension but instead use `&lt;Binding&gt;`) don't work, as the binding
+    /// is applied to the property before the properties on the `Binding` object are set. Looking 
+    /// at WPF it uses a similar mechanism for bindings that come from XAML.
     /// </remarks>
     public static class DelayedBinding
     {
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index a58a8614ee..70d3f7d161 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         public IValueConverter Converter { get; set; }
         public object ConverterParameter { get; set; }
         public string ElementName { get; set; }
-        public object FallbackValue { get; set; }
+        public object FallbackValue { get; set; } = AvaloniaProperty.UnsetValue;
         public BindingMode Mode { get; set; }
         public string Path { get; set; }
         public BindingPriority Priority { get; set; } = BindingPriority.LocalValue;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs
index a59e4231de..48309570cf 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs
@@ -3,17 +3,11 @@
 
 using Avalonia.Controls;
 using Avalonia.Metadata;
+using Avalonia.Styling;
 
 namespace Avalonia.Markup.Xaml.Templates
 {
-    public class FocusAdornerTemplate : ITemplate<IControl>
+    public class FocusAdornerTemplate : Template
     {
-        [Content]
-        public TemplateContent Content { get; set; }
-
-        public IControl Build()
-        {
-            return Content.Load();
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs
index d5811924f2..c4d19e5a6e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs
@@ -1,11 +1,9 @@
-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 Avalonia.Controls;
 using Avalonia.Metadata;
+using Avalonia.Styling;
 
 namespace Avalonia.Markup.Xaml.Templates
 {
@@ -18,5 +16,7 @@ namespace Avalonia.Markup.Xaml.Templates
         {
             return (IPanel)Content.Load();
         }
+
+        object ITemplate.Build() => Build();
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs
index a901c175c9..be4287605c 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs
@@ -51,6 +51,8 @@ namespace Avalonia.Markup.Xaml.Templates
 
             object result = _memberValueNode.CurrentValue.Target;
 
+            _expressionNode.Target = null;
+
             if (result == AvaloniaProperty.UnsetValue)
             {
                 return null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs
index 53edea6ce4..a34093037f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs
@@ -1,10 +1,19 @@
 // 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.Controls;
+using Avalonia.Metadata;
+using Avalonia.Styling;
+
 namespace Avalonia.Markup.Xaml.Templates
 {
-    public class Template
+    public class Template : ITemplate<IControl>
     {
+        [Content]
         public TemplateContent Content { get; set; }
+
+        public IControl Build() => Content.Load();
+
+        object ITemplate.Build() => Build();
     }
 }
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
index a640f00c65..f37d6c8782 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -43,7 +43,7 @@ namespace Avalonia.Markup.Xaml.Templates
             if (ItemsSource != null)
             {
                 var obs = new ExpressionObserver(item, ItemsSource.Path);
-                return new InstancedBinding(obs);
+                return new InstancedBinding(obs, BindingMode.OneWay, BindingPriority.Style);
             }
 
             return null;
diff --git a/src/Markup/Avalonia.Markup/Data/ExpressionSubject.cs b/src/Markup/Avalonia.Markup/Data/ExpressionSubject.cs
index 05bf818aad..0a3be26c18 100644
--- a/src/Markup/Avalonia.Markup/Data/ExpressionSubject.cs
+++ b/src/Markup/Avalonia.Markup/Data/ExpressionSubject.cs
@@ -41,16 +41,36 @@ namespace Avalonia.Markup.Data
         /// <param name="converterParameter">
         /// A parameter to pass to <paramref name="converter"/>.
         /// </param>
+        /// <param name="priority">The binding priority.</param>
+        public ExpressionSubject(
+            ExpressionObserver inner,
+            Type targetType,
+            IValueConverter converter,
+            object converterParameter = null,
+            BindingPriority priority = BindingPriority.LocalValue)
+            : this(inner, targetType, AvaloniaProperty.UnsetValue, converter, converterParameter, priority)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExpressionObserver"/> class.
+        /// </summary>
+        /// <param name="inner">The <see cref="ExpressionObserver"/>.</param>
+        /// <param name="targetType">The type to convert the value to.</param>
         /// <param name="fallbackValue">
         /// The value to use when the binding is unable to produce a value.
         /// </param>
+        /// <param name="converter">The value converter to use.</param>
+        /// <param name="converterParameter">
+        /// A parameter to pass to <paramref name="converter"/>.
+        /// </param>
         /// <param name="priority">The binding priority.</param>
         public ExpressionSubject(
             ExpressionObserver inner, 
-            Type targetType, 
+            Type targetType,
+            object fallbackValue,
             IValueConverter converter,
             object converterParameter = null,
-            object fallbackValue = null,
             BindingPriority priority = BindingPriority.LocalValue)
         {
             Contract.Requires<ArgumentNullException>(inner != null);
@@ -117,7 +137,7 @@ namespace Avalonia.Markup.Data
                         _inner.Expression,
                         error.Exception.Message);
 
-                    if (_fallbackValue != null)
+                    if (_fallbackValue != AvaloniaProperty.UnsetValue)
                     {
                         if (TypeUtilities.TryConvert(
                             type, 
@@ -162,7 +182,7 @@ namespace Avalonia.Markup.Data
                     ConverterParameter,
                     CultureInfo.CurrentUICulture);
 
-            if (_fallbackValue != null &&
+            if (_fallbackValue != AvaloniaProperty.UnsetValue &&
                 (converted == AvaloniaProperty.UnsetValue ||
                  converted is BindingError))
             {
diff --git a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
index a7d30994e6..26a675dade 100644
--- a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
+++ b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,7 +40,7 @@
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
     <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SkiaSharp.1.49.2.1-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
+      <HintPath>..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Skia/Avalonia.Skia.Android/packages.config b/src/Skia/Avalonia.Skia.Android/packages.config
index 050c885479..374eca5c3f 100644
--- a/src/Skia/Avalonia.Skia.Android/packages.config
+++ b/src/Skia/Avalonia.Skia.Android/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="monoandroid50" />
+  <package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="monoandroid50" />
 </packages>
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
index 4f726bee7a..a9939c6ef6 100644
--- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
+++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -57,7 +57,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SkiaSharp.1.49.2.1-beta\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -116,12 +116,12 @@
   <Import Project="..\Avalonia.Skia\Avalonia.Skia.projitems" Label="Shared" />
   <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SkiaSharp.1.49.2.1-beta\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Skia/Avalonia.Skia.Desktop/packages.config b/src/Skia/Avalonia.Skia.Desktop/packages.config
index a2d6225904..3ed3880dc4 100644
--- a/src/Skia/Avalonia.Skia.Desktop/packages.config
+++ b/src/Skia/Avalonia.Skia.Desktop/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject b/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject
index 30815b1937..f744eecae0 100644
--- a/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject
+++ b/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject
@@ -7,7 +7,7 @@
   <AllowDynamicCodeContractChecking>true</AllowDynamicCodeContractChecking>
   <AllowStaticCodeContractChecking>false</AllowStaticCodeContractChecking>
   <AllowCodeAnalysis>false</AllowCodeAnalysis>
-  <IgnoreThisComponentCompletely>false</IgnoreThisComponentCompletely>
+  <IgnoreThisComponentCompletely>true</IgnoreThisComponentCompletely>
   <RunPreBuildEvents>false</RunPreBuildEvents>
   <RunPostBuildEvents>false</RunPostBuildEvents>
   <PreviouslyBuiltSuccessfully>true</PreviouslyBuiltSuccessfully>
@@ -17,9 +17,9 @@
   <DetectStackOverflow>true</DetectStackOverflow>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
   <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration />
-  <UseBuildPlatform />
-  <ProxyProcessPath />
+  <UseBuildConfiguration></UseBuildConfiguration>
+  <UseBuildPlatform></UseBuildPlatform>
+  <ProxyProcessPath></ProxyProcessPath>
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
   <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
   <BuildProcessArchitecture>x86</BuildProcessArchitecture>
diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
index 40251d3e48..d13d94d175 100644
--- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
+++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,7 +41,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SkiaSharp.1.49.2.1-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
+      <HintPath>..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject
index 30815b1937..f744eecae0 100644
--- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject
+++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject
@@ -7,7 +7,7 @@
   <AllowDynamicCodeContractChecking>true</AllowDynamicCodeContractChecking>
   <AllowStaticCodeContractChecking>false</AllowStaticCodeContractChecking>
   <AllowCodeAnalysis>false</AllowCodeAnalysis>
-  <IgnoreThisComponentCompletely>false</IgnoreThisComponentCompletely>
+  <IgnoreThisComponentCompletely>true</IgnoreThisComponentCompletely>
   <RunPreBuildEvents>false</RunPreBuildEvents>
   <RunPostBuildEvents>false</RunPostBuildEvents>
   <PreviouslyBuiltSuccessfully>true</PreviouslyBuiltSuccessfully>
@@ -17,9 +17,9 @@
   <DetectStackOverflow>true</DetectStackOverflow>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
   <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration />
-  <UseBuildPlatform />
-  <ProxyProcessPath />
+  <UseBuildConfiguration></UseBuildConfiguration>
+  <UseBuildPlatform></UseBuildPlatform>
+  <ProxyProcessPath></ProxyProcessPath>
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
   <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
   <BuildProcessArchitecture>x86</BuildProcessArchitecture>
diff --git a/src/Skia/Avalonia.Skia.iOS/packages.config b/src/Skia/Avalonia.Skia.iOS/packages.config
index cad65f14ba..585663e56a 100644
--- a/src/Skia/Avalonia.Skia.iOS/packages.config
+++ b/src/Skia/Avalonia.Skia.iOS/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.49.2.1-beta" targetFramework="xamarinios10" />
+  <package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia/BitmapImpl.cs b/src/Skia/Avalonia.Skia/BitmapImpl.cs
index ba825f6694..e7c3abdf9f 100644
--- a/src/Skia/Avalonia.Skia/BitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/BitmapImpl.cs
@@ -16,8 +16,8 @@ namespace Avalonia.Skia
         public BitmapImpl(SKBitmap bm)
         {
             Bitmap = bm;
-            PixelHeight = bm.Width;
-            PixelWidth = bm.Height;
+            PixelHeight = bm.Height;
+            PixelWidth = bm.Width;
         }
 
         public BitmapImpl(int width, int height)
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 6abe2ac971..c6672ce6c9 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -1,15 +1,17 @@
-using System;
-using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.RenderHelpers;
 using SkiaSharp;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using Avalonia.RenderHelpers;
 
 namespace Avalonia.Skia
 {
     internal class DrawingContextImpl : IDrawingContextImpl
     {
+        private Stack<PaintWrapper> maskStack = new Stack<PaintWrapper>();
+        
         public SKCanvas Canvas { get; private set; }
 
         public DrawingContextImpl(SKCanvas canvas)
@@ -23,7 +25,11 @@ namespace Avalonia.Skia
             var impl = (BitmapImpl)source.PlatformImpl;
             var s = sourceRect.ToSKRect();
             var d = destRect.ToSKRect();
-            Canvas.DrawBitmap(impl.Bitmap, s, d);
+            using (var paint = new SKPaint()
+                    { Color = new SKColor(255, 255, 255, (byte)(255 * opacity)) })
+            {
+                Canvas.DrawBitmap(impl.Bitmap, s, d, paint);
+            }
         }
 
         public void DrawLine(Pen pen, Point p1, Point p2)
@@ -53,14 +59,44 @@ namespace Avalonia.Skia
             }
         }
 
-        struct PaintWrapper : IDisposable
+        private struct PaintState : IDisposable
+        {
+            private readonly SKColor _color;
+            private readonly SKShader _shader;
+            private readonly SKPaint _paint;
+
+            public PaintState(SKPaint paint, SKColor color, SKShader shader)
+            {
+                _paint = paint;
+                _color = color;
+                _shader = shader;
+            }
+
+            public void Dispose()
+            {
+                _paint.Color = _color;
+                _paint.Shader = _shader;
+            }
+        }
+
+        internal struct PaintWrapper : IDisposable
         {
             //We are saving memory allocations there
             //TODO: add more disposable fields if needed
-
             public readonly SKPaint Paint;
+
             private IDisposable _disposable1;
 
+            public IDisposable ApplyTo(SKPaint paint)
+            {
+                var state = new PaintState(paint, paint.Color, paint.Shader);
+
+                paint.Color = Paint.Color;
+                paint.Shader = Paint.Shader;
+
+                return state;
+            }
+
             public void AddDisposable(IDisposable disposable)
             {
                 if (_disposable1 == null)
@@ -82,7 +118,7 @@ namespace Avalonia.Skia
             }
         }
 
-        private PaintWrapper CreatePaint(IBrush brush, Size targetSize)
+        internal PaintWrapper CreatePaint(IBrush brush, Size targetSize)
         {
             SKPaint paint = new SKPaint();
             var rv = new PaintWrapper(paint);
@@ -95,14 +131,16 @@ namespace Avalonia.Skia
 
             SKColor color = new SKColor(255, 255, 255, 255);
 
-            var solid = brush as SolidColorBrush;
+            var solid = brush as ISolidColorBrush;
             if (solid != null)
                 color = solid.Color.ToSKColor();
 
-            paint.Color = (new SKColor(color.Red, color.Green, color.Blue, (byte) (color.Alpha*opacity)));
+            paint.Color = (new SKColor(color.Red, color.Green, color.Blue, (byte)(color.Alpha * opacity)));
+
             if (solid != null)
+            {
                 return rv;
-
+            }
 
             var gradient = brush as GradientBrush;
             if (gradient != null)
@@ -150,7 +188,7 @@ namespace Avalonia.Skia
                 var bitmap = new BitmapImpl((int)helper.IntermediateSize.Width, (int)helper.IntermediateSize.Height);
                 rv.AddDisposable(bitmap);
                 using (var ctx = bitmap.CreateDrawingContext())
-                	helper.DrawIntermediate(ctx);
+                    helper.DrawIntermediate(ctx);
                 SKMatrix translation = SKMatrix.MakeTranslation(-(float)helper.DestinationRect.X, -(float)helper.DestinationRect.Y);
                 SKShaderTileMode tileX =
                     tileBrush.TileMode == TileMode.None
@@ -255,7 +293,7 @@ namespace Avalonia.Skia
             using (var paint = CreatePaint(foreground, text.Measure()))
             {
                 var textImpl = text.PlatformImpl as FormattedTextImpl;
-                textImpl.Draw(this.Canvas, origin.ToSKPoint());
+                textImpl.Draw(this, Canvas, origin.ToSKPoint(), paint);
             }
         }
 
@@ -270,7 +308,7 @@ namespace Avalonia.Skia
             Canvas.Restore();
         }
 
-        double _currentOpacity = 1.0f;
+        private double _currentOpacity = 1.0f;
         private readonly Stack<double> _opacityStack = new Stack<double>();
 
         public void PushOpacity(double opacity)
@@ -288,6 +326,34 @@ namespace Avalonia.Skia
         {
         }
 
+        public void PushGeometryClip(Geometry clip)
+        {
+            Canvas.Save();
+            Canvas.ClipPath(((StreamGeometryImpl)clip.PlatformImpl).EffectivePath);
+        }
+
+        public void PopGeometryClip()
+        {
+            Canvas.Restore();
+        }
+
+        public void PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            Canvas.SaveLayer(new SKPaint());
+            maskStack.Push(CreatePaint(mask, bounds.Size));
+        }
+
+        public void PopOpacityMask()
+        {
+            Canvas.SaveLayer(new SKPaint { XferMode = SKXferMode.DstIn });
+            using (var paintWrapper = maskStack.Pop())
+            {
+                Canvas.DrawPaint(paintWrapper.Paint);
+            }
+            Canvas.Restore();
+            Canvas.Restore();
+        }
+
         private Matrix _currentTransform = Matrix.Identity;
 
         public Matrix Transform
diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
index d56d765578..dc1c93819c 100644
--- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
+++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
@@ -1,66 +1,60 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+// 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.Platform;
 using SkiaSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Avalonia.Skia
 {
-    unsafe class FormattedTextImpl : IFormattedTextImpl
+    public class FormattedTextImpl : IFormattedTextImpl
     {
-        public SKPaint Paint { get; private set; }
-
-        public FormattedTextImpl(string text)
+        public FormattedTextImpl(string text, string fontFamilyName, double fontSize, FontStyle fontStyle,
+                    TextAlignment textAlignment, FontWeight fontWeight, TextWrapping wrapping)
         {
-            _text = text;
-            Paint = new SKPaint();
-
-            Paint.TextEncoding = SKTextEncoding.Utf16;
-            Paint.IsStroke = false;
-            Paint.IsAntialias = true;
-            LineOffset = 0;
+            _text = text ?? string.Empty;
 
             // Replace 0 characters with zero-width spaces (200B)
             _text = _text.Replace((char)0, (char)0x200B);
-        }
 
-        public static FormattedTextImpl Create(string text, string fontFamilyName, double fontSize, FontStyle fontStyle,
-            TextAlignment textAlignment, FontWeight fontWeight)
-        {
             var typeface = TypefaceCache.GetTypeface(fontFamilyName, fontStyle, fontWeight);
 
-            FormattedTextImpl instance = new FormattedTextImpl(text);
-            instance.Paint.Typeface = typeface;
-            instance.Paint.TextSize = (float)fontSize;
-            instance.Paint.TextAlign = textAlignment.ToSKTextAlign();
-            instance.Rebuild();
-            return instance;
-        }
+            _paint = new SKPaint();
 
-        private readonly string _text;
+            //currently Skia does not measure properly with Utf8 !!!
+            //Paint.TextEncoding = SKTextEncoding.Utf8;
+            _paint.TextEncoding = SKTextEncoding.Utf16;
+            _paint.IsStroke = false;
+            _paint.IsAntialias = true;
+            _paint.Typeface = typeface;
+            _paint.TextSize = (float)fontSize;
+            _paint.TextAlign = textAlignment.ToSKTextAlign();
 
-        readonly List<FormattedTextLine> _lines = new List<FormattedTextLine>();
-        readonly List<Rect> _rects = new List<Rect>();
+            _wrapping = wrapping;
 
-        List<AvaloniaFormattedTextLine> _skiaLines;
-        SKRect[] _skiaRects;
+            Rebuild();
+        }
 
-        Size _size;
+        public Size Constraint
+        {
+            get { return _constraint; }
+            set
+            {
+                if (_constraint == value)
+                    return;
 
-        const float MAX_LINE_WIDTH = 10000;
-        float LineOffset;
-        float WidthConstraint = -1;
+                _constraint = value;
 
-        struct AvaloniaFormattedTextLine
+                Rebuild();
+            }
+        }
+
+        public void Dispose()
         {
-            public float Top;
-            public int Start;
-            public int Length;
-            public float Height;
-            public float Width;
-        };
+        }
 
         public IEnumerable<FormattedTextLine> GetLines()
         {
@@ -69,36 +63,98 @@ namespace Avalonia.Skia
 
         public TextHitTestResult HitTestPoint(Point point)
         {
-            for (int c = 0; c < _rects.Count; c++)
+            float y = (float)point.Y;
+            var line = _skiaLines.Find(l => l.Top <= y && (l.Top + l.Height) > y);
+
+            if (!line.Equals(default(AvaloniaFormattedTextLine)))
             {
-                //TODO: Detect line first
-                var rc = _rects[c];
-                if (rc.Contains(point))
+                var rects = GetRects();
+
+                for (int c = line.Start; c < line.Start + line.TextLength; c++)
                 {
-                    return new TextHitTestResult
+                    var rc = rects[c];
+                    if (rc.Contains(point))
                     {
-                        IsInside = true,
-                        TextPosition = c,
-                        IsTrailing = (point.X - rc.X) > rc.Width / 2
-                    };
+                        return new TextHitTestResult
+                        {
+                            IsInside = !(line.TextLength > line.Length),
+                            TextPosition = c,
+                            IsTrailing = (point.X - rc.X) > rc.Width / 2
+                        };
+                    }
+                }
 
+                int offset = 0;
+
+                if (point.X >= (rects[line.Start].X + line.Width) / 2 && line.Length > 0)
+                {
+                    offset = line.TextLength > line.Length ?
+                                    line.Length : (line.Length - 1);
                 }
+
+                return new TextHitTestResult
+                {
+                    IsInside = false,
+                    TextPosition = line.Start + offset,
+                    IsTrailing = _text.Length == (line.Start + offset + 1)
+                };
             }
-            bool end = point.X > _size.Width || point.Y > _size.Height;
-            return new TextHitTestResult() { IsTrailing = end, TextPosition = end ? _text.Length - 1 : 0 };
+
+            bool end = point.X > _size.Width || point.Y > _lines.Sum(l => l.Height);
+
+            return new TextHitTestResult()
+            {
+                IsInside = false,
+                IsTrailing = end,
+                TextPosition = end ? _text.Length - 1 : 0
+            };
         }
 
         public Rect HitTestTextPosition(int index)
         {
-            if (index < 0 || index >= _rects.Count)
-                return new Rect();
-            return _rects[index];
+            var rects = GetRects();
+
+            if (index < 0 || index >= rects.Count)
+            {
+                var r = rects.LastOrDefault();
+                return new Rect(r.X + r.Width, r.Y, 0, _lineHeight);
+            }
+
+            if (rects.Count == 0)
+            {
+                return new Rect(0, 0, 1, _lineHeight);
+            }
+
+            if (index == rects.Count)
+            {
+                var lr = rects[rects.Count - 1];
+                return new Rect(new Point(lr.X + lr.Width, lr.Y), rects[index - 1].Size);
+            }
+
+            return rects[index];
         }
 
         public IEnumerable<Rect> HitTestTextRange(int index, int length)
         {
-            for (var c = 0; c < length; c++)
-                yield return _rects[c + index];
+            List<Rect> result = new List<Rect>();
+
+            var rects = GetRects();
+
+            int lastIndex = index + length - 1;
+
+            foreach (var line in _skiaLines.Where(l =>
+                                                    (l.Start + l.Length) > index &&
+                                                    lastIndex >= l.Start))
+            {
+                int lineEndIndex = line.Start + (line.Length > 0 ? line.Length - 1 : 0);
+
+                double left = rects[line.Start > index ? line.Start : index].X;
+                double right = rects[lineEndIndex > lastIndex ? lastIndex : lineEndIndex].Right;
+
+                result.Add(new Rect(left, line.Top, right - left, line.Height));
+            }
+
+            return result;
         }
 
         public Size Measure()
@@ -108,135 +164,400 @@ namespace Avalonia.Skia
 
         public void SetForegroundBrush(IBrush brush, int startIndex, int length)
         {
-            // TODO: we need an implementation here to properly support FormattedText
+            var key = new FBrushRange(startIndex, length);
+            if (brush == null)
+            {
+                if (_foregroundBrushes.ContainsKey(key))
+                    _foregroundBrushes.Remove(key);
+            }
+            else
+            {
+                _foregroundBrushes[key] = brush;
+            }
         }
 
-        void Rebuild()
+        public override string ToString()
         {
-            var length = _text.Length;
+            return _text;
+        }
 
-            _lines.Clear();
+        internal void Draw(DrawingContextImpl context,
+                           SKCanvas canvas, SKPoint origin,
+                           DrawingContextImpl.PaintWrapper foreground)
+        {
+            /* TODO: This originated from Native code, it might be useful for debugging character positions as
+             * we improve the FormattedText support. Will need to port this to C# obviously. Rmove when
+             * not needed anymore.
 
-            _skiaRects = new SKRect[length];
-            _skiaLines = new List<AvaloniaFormattedTextLine>();
+                SkPaint dpaint;
+                ctx->Canvas->save();
+                ctx->Canvas->translate(origin.fX, origin.fY);
+                for (int c = 0; c < Lines.size(); c++)
+                {
+                    dpaint.setARGB(255, 0, 0, 0);
+                    SkRect rc;
+                    rc.fLeft = 0;
+                    rc.fTop = Lines[c].Top;
+                    rc.fRight = Lines[c].Width;
+                    rc.fBottom = rc.fTop + LineOffset;
+                    ctx->Canvas->drawRect(rc, dpaint);
+                }
+                for (int c = 0; c < Length; c++)
+                {
+                    dpaint.setARGB(255, c % 10 * 125 / 10 + 125, (c * 7) % 10 * 250 / 10, (c * 13) % 10 * 250 / 10);
+                    dpaint.setStyle(SkPaint::kFill_Style);
+                    ctx->Canvas->drawRect(Rects[c], dpaint);
+                }
+                ctx->Canvas->restore();
+            */
+            SKPaint paint = _paint;
+            IDisposable currd = null;
+            var currentWrapper = foreground;
 
-            int curOff = 0;
-            float curY = 0;
+            try
+            {
+                SKPaint currFGPaint = ApplyWrapperTo(ref foreground, ref currd, paint);
+                bool hasCusomFGBrushes = _foregroundBrushes.Any();
 
-            var metrics = Paint.FontMetrics;
-            var mTop = metrics.Top;  // The greatest distance above the baseline for any glyph (will be <= 0).
-            var mBottom = metrics.Bottom;  // The greatest distance below the baseline for any glyph (will be >= 0). 
-            var mLeading = metrics.Leading;  // The recommended distance to add between lines of text (will be >= 0). 
+                for (int c = 0; c < _skiaLines.Count; c++)
+                {
+                    AvaloniaFormattedTextLine line = _skiaLines[c];
 
-            // This seems like the best measure of full vertical extent
-            float lineHeight = mBottom - mTop;
+                    float x = TransformX(origin.X, 0, paint.TextAlign);
 
-            // Rendering is relative to baseline
-            LineOffset = -metrics.Top;
+                    if (!hasCusomFGBrushes)
+                    {
+                        var subString = _text.Substring(line.Start, line.Length);
+                        canvas.DrawText(subString, x, origin.Y + line.Top + _lineOffset, paint);
+                    }
+                    else
+                    {
+                        float currX = x;
+                        string subStr;
+                        int len;
 
-            string subString;
+                        for (int i = line.Start; i < line.Start + line.Length;)
+                        {
+                            var fb = GetNextForegroundBrush(ref line, i, out len);
 
-            byte[] bytes;
-            GCHandle pinnedArray;
-            IntPtr pointer;
+                            if (fb != null)
+                            {
+                                //TODO: figure out how to get the brush size
+                                currentWrapper = context.CreatePaint(fb, new Size());
+                            }
+                            else
+                            {
+                                if (!currentWrapper.Equals(foreground)) currentWrapper.Dispose();
+                                currentWrapper = foreground;
+                            }
 
-            for (int c = 0; curOff < length; c++)
+                            subStr = _text.Substring(i, len);
+
+                            if (currFGPaint != currentWrapper.Paint)
+                            {
+                                currFGPaint = ApplyWrapperTo(ref currentWrapper, ref currd, paint);
+                            }
+
+                            canvas.DrawText(subStr, currX, origin.Y + line.Top + _lineOffset, paint);
+
+                            i += len;
+                            currX += paint.MeasureText(subStr);
+                        }
+                    }
+                }
+            }
+            finally
             {
-                float lineWidth = -1;
-                int measured;
-                int extraSkip = 0;
-                if (WidthConstraint <= 0)
+                if (!currentWrapper.Equals(foreground)) currentWrapper.Dispose();
+                currd?.Dispose();
+            }
+        }
+
+        private const float MAX_LINE_WIDTH = 10000;
+
+        private readonly Dictionary<FBrushRange, IBrush> _foregroundBrushes =
+                                                new Dictionary<FBrushRange, IBrush>();
+        private readonly List<FormattedTextLine> _lines = new List<FormattedTextLine>();
+        private readonly SKPaint _paint;
+        private readonly List<Rect> _rects = new List<Rect>();
+        private readonly string _text;
+        private readonly TextWrapping _wrapping;
+        private Size _constraint = new Size(double.PositiveInfinity, double.PositiveInfinity);
+        private float _lineHeight = 0;
+        private float _lineOffset = 0;
+        private Size _size;
+        private List<AvaloniaFormattedTextLine> _skiaLines;
+
+        private static SKPaint ApplyWrapperTo(ref DrawingContextImpl.PaintWrapper wrapper,
+                                                ref IDisposable curr, SKPaint paint)
+        {
+            curr?.Dispose();
+            curr = wrapper.ApplyTo(paint);
+            return wrapper.Paint;
+        }
+
+        private static bool IsBreakChar(char c)
+        {
+            //white space or zero space whitespace
+            return char.IsWhiteSpace(c) || c == '\u200B';
+        }
+
+        private static int LineBreak(string textInput, int textIndex, int stop,
+                                     SKPaint paint, float maxWidth,
+                                     out int trailingCount)
+        {
+            int lengthBreak;
+            if (maxWidth == -1)
+            {
+                lengthBreak = stop - textIndex;
+            }
+            else
+            {
+                float measuredWidth;
+                string subText = textInput.Substring(textIndex, stop - textIndex);
+                lengthBreak = (int)paint.BreakText(subText, maxWidth, out measuredWidth) / 2;
+            }
+
+            //Check for white space or line breakers before the lengthBreak
+            int startIndex = textIndex;
+            int index = textIndex;
+            int word_start = textIndex;
+            bool prevBreak = true;
+
+            trailingCount = 0;
+
+            while (index < stop)
+            {
+                int prevText = index;
+                char currChar = textInput[index++];
+                bool currBreak = IsBreakChar(currChar);
+
+                if (!currBreak && prevBreak)
                 {
-                    measured = length;
+                    word_start = prevText;
                 }
-                else
-                {
-                    float constraint = WidthConstraint;
-                    if (constraint > MAX_LINE_WIDTH)
-                        constraint = MAX_LINE_WIDTH;
 
-                    subString = _text.Substring(curOff);
+                prevBreak = currBreak;
+
+                if (index > startIndex + lengthBreak)
+                {
+                    if (currBreak)
+                    {
+                        // eat the rest of the whitespace
+                        while (index < stop && IsBreakChar(textInput[index]))
+                        {
+                            index++;
+                        }
 
-                    // TODO: This method is not linking into SkiaSharp so we must use the RAW buffer version for now
-                    //measured = (int)Paint.BreakText(subString, constraint, out lineWidth) / 2;
-                    bytes = Encoding.UTF8.GetBytes(subString);
-                    pinnedArray = GCHandle.Alloc(bytes, GCHandleType.Pinned);
-                    pointer = pinnedArray.AddrOfPinnedObject();
-                    // for some reason I have to pass nBytes * 2. I assume under the hood it expects Unicode/WChar??
-                    measured = (int)Paint.BreakText(pointer, (IntPtr)(bytes.Length * 2), constraint, out lineWidth) / 2;
-                    pinnedArray.Free();
+                        trailingCount = index - prevText;
+                    }
+                    else
+                    {
+                        // backup until a whitespace (or 1 char)
+                        if (word_start == startIndex)
+                        {
+                            if (prevText > startIndex)
+                            {
+                                index = prevText;
+                            }
+                        }
+                        else
+                        {
+                            index = word_start;
+                        }
+                    }
+                    break;
+                }
 
-                    if (measured == 0)
+                if ('\n' == currChar)
+                {
+                    int ret = index - startIndex;
+                    int lineBreakSize = 1;
+                    if (index < stop)
                     {
-                        measured = 1;
-                        lineWidth = -1;
+                        currChar = textInput[index++];
+                        if ('\r' == currChar)
+                        {
+                            ret = index - startIndex;
+                            ++lineBreakSize;
+                        }
                     }
 
-                    char nextChar = ' ';
-                    if (curOff + measured < length)
-                        nextChar = _text[curOff + measured];
+                    trailingCount = lineBreakSize;
 
-                    if (nextChar != ' ')
+                    return ret;
+                }
+
+                if ('\r' == currChar)
+                {
+                    int ret = index - startIndex;
+                    int lineBreakSize = 1;
+                    if (index < stop)
                     {
-                        // Perform scan for the last space and end the line there
-                        for (int si = curOff + measured - 1; si > curOff; si--)
+                        currChar = textInput[index++];
+                        if ('\n' == currChar)
                         {
-                            if (_text[si] == ' ')
-                            {
-                                measured = si - curOff;
-                                extraSkip = 1;
-                                break;
-                            }
+                            ret = index - startIndex;
+                            ++lineBreakSize;
                         }
                     }
+
+                    trailingCount = lineBreakSize;
+
+                    return ret;
                 }
+            }
 
-                AvaloniaFormattedTextLine line = new AvaloniaFormattedTextLine();
-                line.Start = curOff;
-                line.Length = measured;
-                line.Width = lineWidth;
-                line.Height = lineHeight;
-                line.Top = curY;
+            return index - startIndex;
+        }
+
+        private void BuildRects()
+        {
+            // Build character rects
+            var fm = _paint.FontMetrics;
+            SKTextAlign align = _paint.TextAlign;
+
+            for (int li = 0; li < _skiaLines.Count; li++)
+            {
+                var line = _skiaLines[li];
+                float prevRight = TransformX(0, line.Width, align);
+                double nextTop = line.Top + line.Height;
+
+                if (li + 1 < _skiaLines.Count)
+                {
+                    nextTop = _skiaLines[li + 1].Top;
+                }
+
+                for (int i = line.Start; i < line.Start + line.TextLength; i++)
+                {
+                    float w = _paint.MeasureText(_text[i].ToString());
+
+                    _rects.Add(new Rect(
+                        prevRight,
+                        line.Top,
+                        w,
+                        nextTop - line.Top));
+                    prevRight += w;
+                }
+            }
+        }
+
+        private IBrush GetNextForegroundBrush(ref AvaloniaFormattedTextLine line, int index, out int length)
+        {
+            IBrush result = null;
+            int len = length = line.Start + line.Length - index;
+
+            if (_foregroundBrushes.Any())
+            {
+                var cbi = _foregroundBrushes.FirstOrDefault(b => b.Key.Intersects(index, len));
+
+                if (cbi.Value != null)
+                {
+                    var r = cbi.Key;
+
+                    if (r.StartIndex > index)
+                    {
+                        len = r.StartIndex - index;
+                    }
+                    else
+                    {
+                        len = r.EndIndex - index + 1;
+                        result = cbi.Value;
+                    }
+
+                    if (len > 0 && len < length)
+                    {
+                        length = len;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private List<Rect> GetRects()
+        {
+            if (_text.Length > _rects.Count)
+            {
+                BuildRects();
+            }
+
+            return _rects;
+        }
+
+        private void Rebuild()
+        {
+            var length = _text.Length;
+
+            _lines.Clear();
+            _rects.Clear();
+            _skiaLines = new List<AvaloniaFormattedTextLine>();
+
+            int curOff = 0;
+            float curY = 0;
+
+            var metrics = _paint.FontMetrics;
+            var mTop = metrics.Top;  // The greatest distance above the baseline for any glyph (will be <= 0).
+            var mBottom = metrics.Bottom;  // The greatest distance below the baseline for any glyph (will be >= 0).
+            var mLeading = metrics.Leading;  // The recommended distance to add between lines of text (will be >= 0).
+            var mDescent = metrics.Descent;  //The recommended distance below the baseline. Will be >= 0.
+            var mAscent = metrics.Ascent;    //The recommended distance above the baseline. Will be <= 0.
+            var lastLineDescent = mBottom - mDescent;
+
+            // This seems like the best measure of full vertical extent
+            // matches Direct2D line height
+            _lineHeight = mDescent - mAscent;
+
+            // Rendering is relative to baseline
+            _lineOffset = -metrics.Top;
+
+            string subString;
+
+            float widthConstraint = (_constraint.Width != double.PositiveInfinity)
+                                        ? (float)_constraint.Width
+                                        : -1;
+
+            for (int c = 0; curOff < length; c++)
+            {
+                float lineWidth = -1;
+                int measured;
+                int trailingnumber = 0;
+
+                subString = _text.Substring(curOff);
 
-                if (line.Width < 0)
-                    line.Width = _skiaRects[line.Start + line.Length - 1].Right;
+                float constraint = -1;
 
-                // Build character rects
-                for (int i = line.Start; i < line.Start + line.Length; i++)
+                if (_wrapping == TextWrapping.Wrap)
                 {
-                    float prevRight = 0;
-                    if (i != line.Start)
-                        prevRight = _skiaRects[i - 1].Right;
-
-                    subString = _text.Substring(line.Start, i - line.Start + 1);
-                    float w = Paint.MeasureText(subString);
-
-                    SKRect rc;
-                    rc.Left = prevRight;
-                    rc.Right = w;
-                    rc.Top = line.Top;
-                    rc.Bottom = line.Top + line.Height;
-                    _skiaRects[i] = rc;
+                    constraint = widthConstraint <= 0 ? MAX_LINE_WIDTH : widthConstraint;
+                    if (constraint > MAX_LINE_WIDTH)
+                        constraint = MAX_LINE_WIDTH;
                 }
 
-                subString = _text.Substring(line.Start, line.Length);
-                line.Width = Paint.MeasureText(subString);
+                measured = LineBreak(_text, curOff, length, _paint, constraint, out trailingnumber);
+
+                AvaloniaFormattedTextLine line = new AvaloniaFormattedTextLine();
+                line.TextLength = measured;
+
+                subString = _text.Substring(line.Start, line.TextLength);
+                lineWidth = _paint.MeasureText(subString);
+                line.Start = curOff;
+                line.Length = measured - trailingnumber;
+                line.Width = lineWidth;
+                line.Height = _lineHeight;
+                line.Top = curY;
 
                 _skiaLines.Add(line);
 
-                curY += lineHeight;
+                curY += _lineHeight;
 
-                // TODO: We may want to consider adding Leading to the vertical line spacing but for now
-                // it appears to make no difference. Revisit as part of FormattedText improvements.
-                //
-                //curY += mLeading;
+                curY += mLeading;
 
-                curOff += measured + extraSkip;
+                curOff += measured;
             }
 
             // Now convert to Avalonia data formats
             _lines.Clear();
-            _rects.Clear();
             float maxX = 0;
 
             for (var c = 0; c < _skiaLines.Count; c++)
@@ -245,89 +566,72 @@ namespace Avalonia.Skia
                 if (maxX < w)
                     maxX = w;
 
-                _lines.Add(new FormattedTextLine(_skiaLines[c].Length, _skiaLines[c].Height));
-            }
-
-            for (var c = 0; c < _text.Length; c++)
-            {
-                _rects.Add(_skiaRects[c].ToAvaloniaRect());
+                _lines.Add(new FormattedTextLine(_skiaLines[c].TextLength, _skiaLines[c].Height));
             }
 
             if (_skiaLines.Count == 0)
             {
-                _size = new Size();
+                _lines.Add(new FormattedTextLine(0, _lineHeight));
+                _size = new Size(0, _lineHeight + lastLineDescent);
             }
             else
             {
                 var lastLine = _skiaLines[_skiaLines.Count - 1];
-                _size = new Size(maxX, lastLine.Top + lastLine.Height);
+                _size = new Size(maxX, lastLine.Top + lastLine.Height + lastLineDescent);
             }
         }
 
-        internal void Draw(SKCanvas canvas, SKPoint origin)
+        private float TransformX(float originX, float lineWidth, SKTextAlign align)
         {
-            SKPaint paint = Paint;
+            float x = 0;
 
-            /* TODO: This originated from Native code, it might be useful for debugging character positions as
-             * we improve the FormattedText support. Will need to port this to C# obviously. Rmove when
-             * not needed anymore.
-             
-                SkPaint dpaint;
-                ctx->Canvas->save();
-                ctx->Canvas->translate(origin.fX, origin.fY);
-                for (int c = 0; c < Lines.size(); c++)
-                {
-                    dpaint.setARGB(255, 0, 0, 0);
-                    SkRect rc;
-                    rc.fLeft = 0;
-                    rc.fTop = Lines[c].Top;
-                    rc.fRight = Lines[c].Width;
-                    rc.fBottom = rc.fTop + LineOffset;
-                    ctx->Canvas->drawRect(rc, dpaint);
-                }
-                for (int c = 0; c < Length; c++)
+            if (align == SKTextAlign.Left)
+            {
+                x = originX;
+            }
+            else
+            {
+                double width = Constraint.Width > 0 && !double.IsPositiveInfinity(Constraint.Width) ?
+                                Constraint.Width :
+                                _size.Width;
+
+                switch (align)
                 {
-                    dpaint.setARGB(255, c % 10 * 125 / 10 + 125, (c * 7) % 10 * 250 / 10, (c * 13) % 10 * 250 / 10);
-                    dpaint.setStyle(SkPaint::kFill_Style);
-                    ctx->Canvas->drawRect(Rects[c], dpaint);
+                    case SKTextAlign.Center: x = originX + (float)(width - lineWidth) / 2; break;
+                    case SKTextAlign.Right: x = originX + (float)(width - lineWidth); break;
                 }
-                ctx->Canvas->restore();
-            */
-
-            for (int c = 0; c < _skiaLines.Count; c++)
-            {
-                AvaloniaFormattedTextLine line = _skiaLines[c];
-                var subString = _text.Substring(line.Start, line.Length);
-                canvas.DrawText(subString, origin.X, origin.Y + line.Top + LineOffset, paint);
             }
+
+            return x;
         }
 
-        Size _constraint = new Size(double.PositiveInfinity, double.PositiveInfinity);
+        private struct AvaloniaFormattedTextLine
+        {
+            public float Height;
+            public int Length;
+            public int Start;
+            public int TextLength;
+            public float Top;
+            public float Width;
+        };
 
-        public Size Constraint
+        private struct FBrushRange
         {
-            get { return _constraint; }
-            set
+            public FBrushRange(int startIndex, int length)
             {
-                if (_constraint == value)
-                    return;
+                StartIndex = startIndex;
+                Length = length;
+            }
 
-                _constraint = value;
-                WidthConstraint = (_constraint.Width != double.PositiveInfinity)
-                    ? (float)_constraint.Width
-                    : -1;
+            public int EndIndex => StartIndex + Length - 1;
 
-                Rebuild();
-            }
-        }
+            public int Length { get; private set; }
 
-        public override string ToString()
-        {
-            return _text;
-        }
+            public int StartIndex { get; private set; }
 
-        public void Dispose()
-        {
+            public bool Intersects(int index, int len) =>
+                (index + len) > StartIndex &&
+                (StartIndex + Length) > index;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index ec61aea552..b1a0579e7d 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Skia
         public IFormattedTextImpl CreateFormattedText(string text, string fontFamilyName, double fontSize, FontStyle fontStyle,
             TextAlignment textAlignment, FontWeight fontWeight, TextWrapping wrapping)
         {
-            return FormattedTextImpl.Create(text, fontFamilyName, fontSize, fontStyle, textAlignment, fontWeight);
+            return new FormattedTextImpl(text, fontFamilyName, fontSize, fontStyle, textAlignment, fontWeight, wrapping);
         }
 
         public IStreamGeometryImpl CreateStreamGeometry()
diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
index 04b325ff81..071c45c477 100644
--- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
@@ -75,6 +75,13 @@ namespace Avalonia.Skia
             return new StreamContext(this);
         }
 
+        public bool FillContains(Point point)
+        {
+            // TODO: Not supported by SkiaSharp yet, so use expanded Rect
+            // return EffectivePath.Contains(point.X, point.Y);
+            return GetRenderBounds(0).Contains(point);
+        }
+
         class StreamContext : IStreamGeometryContextImpl
         {
             private readonly StreamGeometryImpl _geometryImpl;
diff --git a/src/Skia/Avalonia.Skia/readme.md b/src/Skia/Avalonia.Skia/readme.md
index eec5df79f1..3defe9c58c 100644
--- a/src/Skia/Avalonia.Skia/readme.md
+++ b/src/Skia/Avalonia.Skia/readme.md
@@ -4,6 +4,9 @@ BitmapImpl
 - constructor from Width/Height
 - Save
 
+StreamGeometryImpl
+- Hit testing in Geometry missing as SkiaSharp does not expose this
+
 DrawingContextImpl
 - Alpha support missing as SkiaSharp does not expose this
 - Gradient Shader caching?
diff --git a/src/Windows/Avalonia.Designer/AppHost/AvaloniaAppHost.cs b/src/Windows/Avalonia.Designer/AppHost/AvaloniaAppHost.cs
index 442499c783..d06e4929fa 100644
--- a/src/Windows/Avalonia.Designer/AppHost/AvaloniaAppHost.cs
+++ b/src/Windows/Avalonia.Designer/AppHost/AvaloniaAppHost.cs
@@ -10,7 +10,6 @@ using System.Windows.Forms.Integration;
 using System.Xml;
 using Avalonia.Designer.Comm;
 using Avalonia.Designer.InProcDesigner;
-using Avalonia.Designer.Metadata;
 using Timer = System.Windows.Forms.Timer;
 using Avalonia.DesignerSupport;
 
@@ -22,6 +21,7 @@ namespace Avalonia.Designer.AppHost
         private readonly CommChannel _comm;
         private string _lastXaml;
         private string _currentXaml;
+        private string _currentSourceAssembly;
         private bool _initSuccess;
         private readonly HostedAppModel _appModel;
         private Control _window;
@@ -48,7 +48,10 @@ namespace Avalonia.Designer.AppHost
             }
             var updateXaml = obj as UpdateXamlMessage;
             if (updateXaml != null)
+            {
                 _currentXaml = updateXaml.Xaml;
+                _currentSourceAssembly = updateXaml.AssemblyPath;
+            }
         }
 
         void UpdateState(string state)
@@ -91,88 +94,7 @@ namespace Avalonia.Designer.AppHost
             }
         }
 
-        AvaloniaDesignerMetadata BuildMetadata(List<Assembly> asms, Type xmlNsAttr)
-        {
-            var rv = new AvaloniaDesignerMetadata()
-            {
-                
-                NamespaceAliases = new List<MetadataNamespaceAlias>(),
-                Types = new List<MetadataType>()
-            };
-
-
-            foreach (var asm in asms)
-            {
-                foreach (dynamic xmlns in asm.GetCustomAttributes().Where(a => a.GetType() == xmlNsAttr))
-                {
-                    rv.NamespaceAliases.Add(new MetadataNamespaceAlias
-                    {
-                        Namespace = (string)xmlns.ClrNamespace,
-                        XmlNamespace = (string)xmlns.XmlNamespace
-                    });
-                }
-
-                try
-                {
-                    foreach (var type in asm.GetTypes())
-                    {
-                        try
-                        {
-                            if (!type.IsPublic || type.IsAbstract)
-                                continue;
-                            var t = new MetadataType()
-                            {
-                                Name = type.Name,
-                                Namespace = type.Namespace,
-                                Properties = new List<MetadataProperty>()
-                            };
-                            rv.Types.Add(t);
-                            foreach (var prop in type.GetProperties())
-                            {
-                                if (prop.GetMethod?.IsPublic != true)
-                                    continue;
-                                var p = new MetadataProperty()
-                                {
-                                    Name = prop.Name,
-                                    Type =
-                                        prop.PropertyType == typeof (string) ||
-                                        (prop.PropertyType.IsValueType &&
-                                         prop.PropertyType.Assembly == typeof (int).Assembly)
-                                            ? MetadataPropertyType.BasicType
-                                            : prop.PropertyType.IsEnum
-                                                ? MetadataPropertyType.Enum
-                                                : MetadataPropertyType.MetadataType
-
-                                };
-                                if (p.Type == MetadataPropertyType.Enum)
-                                    p.EnumValues = Enum.GetNames(prop.PropertyType);
-                                if (p.Type == MetadataPropertyType.MetadataType)
-                                    p.MetadataFullTypeName = prop.PropertyType.Namespace + "." + prop.PropertyType.Name;
-                                t.Properties.Add(p);
-                            }
-                        }
-                        catch
-                        {
-                            //
-                        }
-                    }
-                }
-                catch
-                {
-                    //
-                }
-            }
-            return rv;
-        }
-
-        void BuildMetadataAndSendMessageAsync(List<Assembly> asms)
-        {
-            var xmlNsAttr = LookupType("Avalonia.Metadata.XmlnsDefinitionAttribute");
-            new Thread(() =>
-            {
-                _comm.SendMessage(new UpdateMetadataMessage(BuildMetadata(asms, xmlNsAttr)));
-            }).Start();
-        }
+        
 
         private void DoInit(string targetExe, StringBuilder logger)
         {
@@ -196,9 +118,6 @@ namespace Avalonia.Designer.AppHost
                     logger.AppendLine(e.ToString());
                 }
             
-            log("Looking up Avalonia types");
-            BuildMetadataAndSendMessageAsync(asms);
-
             log("Initializing built-in designer");
             var dic = new Dictionary<string, object>();
             Api = new DesignerApi(dic) {OnResize = OnResize, OnWindowCreated = OnWindowCreated};
@@ -268,7 +187,16 @@ namespace Avalonia.Designer.AppHost
             }
             try
             {
-                Api.UpdateXaml(_currentXaml);
+                if (Api.UpdateXaml2 != null)
+                {
+                    Api.UpdateXaml2(new DesignerApiXamlFileInfo
+                    {
+                        AssemblyPath = _currentSourceAssembly,
+                        Xaml = _currentXaml
+                    }.Dictionary);
+                }
+                else
+                    Api.UpdateXaml(_currentXaml);
 
                 _appModel.SetError(null);
             }
diff --git a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj
index 5ab3b2e78d..a84cec6e5a 100644
--- a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj
+++ b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -82,7 +82,6 @@
     <Compile Include="Comm\InitMessage.cs" />
     <Compile Include="Comm\ProcessHost.cs" />
     <Compile Include="Comm\StateMessage.cs" />
-    <Compile Include="Comm\UpdateMetadata.cs" />
     <Compile Include="Comm\UpdateXamlMessage.cs" />
     <Compile Include="Comm\WindowCreatedMessage.cs" />
     <Compile Include="DemoWindow.xaml.cs">
@@ -91,7 +90,6 @@
     <Compile Include="InProcDesigner\InProcDesignerView.xaml.cs">
       <DependentUpon>InProcDesignerView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Metadata\AvaloniaDesignerMetadata.cs" />
     <Compile Include="AvaloniaDesigner.xaml.cs">
       <DependentUpon>AvaloniaDesigner.xaml</DependentUpon>
     </Compile>
@@ -126,6 +124,9 @@
   <ItemGroup>
     <Content Include="README.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Metadata\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Windows/Avalonia.Designer/AvaloniaDesigner.xaml.cs b/src/Windows/Avalonia.Designer/AvaloniaDesigner.xaml.cs
index ac27ec6471..e61ba01a96 100644
--- a/src/Windows/Avalonia.Designer/AvaloniaDesigner.xaml.cs
+++ b/src/Windows/Avalonia.Designer/AvaloniaDesigner.xaml.cs
@@ -18,7 +18,6 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Avalonia.Designer.AppHost;
 using Avalonia.Designer.Comm;
-using Avalonia.Designer.Metadata;
 
 namespace Avalonia.Designer
 {
@@ -54,7 +53,14 @@ namespace Avalonia.Designer
             set { SetValue(XamlProperty, value); }
         }
 
-        public AvaloniaDesignerMetadata Metadata { get; private set; }
+        public static readonly DependencyProperty SourceAssemblyProperty = DependencyProperty.Register(
+            "SourceAssembly", typeof (string), typeof (AvaloniaDesigner), new FrameworkPropertyMetadata(XamlChanged));
+
+        public string SourceAssembly
+        {
+            get { return (string) GetValue(SourceAssemblyProperty); }
+            set { SetValue(SourceAssemblyProperty, value); }
+        }
         
         private readonly ProcessHost _host = new ProcessHost();
         
@@ -66,24 +72,28 @@ namespace Avalonia.Designer
                 new Binding(nameof(ProcessHost.State)) {Source = _host, Mode = BindingMode.OneWay});
 
             _host.PropertyChanged += _host_PropertyChanged;
-            _host.MetadataArrived += data => Metadata = data;
         }
 
         private void _host_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(ProcessHost.WindowHandle))
             {
-                if (NativeContainer.Child != null)
-                {
-                    var child = NativeContainer.Child;
-                    NativeContainer.Child = null;
-                    child.Dispose();
-                }
+                ResetNativeContainer();
+                if(_host.WindowHandle == IntPtr.Zero)
+                    return;
                 NativeContainer.Child = new WindowHost(false);
                 var wndHost = ((WindowHost) NativeContainer.Child);
                 wndHost.SetWindow(_host.WindowHandle);
+            }
+        }
 
-
+        void ResetNativeContainer()
+        {
+            if (NativeContainer.Child != null)
+            {
+                var child = NativeContainer.Child;
+                NativeContainer.Child = null;
+                child.Dispose();
             }
         }
 
@@ -91,6 +101,7 @@ namespace Avalonia.Designer
         public void KillProcess()
         {
             _host.Kill();
+            ResetNativeContainer();
         }
 
         bool CheckTargetExeOrSetError()
@@ -114,7 +125,7 @@ namespace Avalonia.Designer
                 return;
             if(string.IsNullOrEmpty(Xaml))
                 return;
-            _host.Start(TargetExe, Xaml);
+            _host.Start(TargetExe, Xaml, SourceAssembly);
         }
 
         private void OnXamlChanged()
@@ -122,9 +133,9 @@ namespace Avalonia.Designer
             if (!CheckTargetExeOrSetError())
                 return;
             if (!_host.IsAlive)
-                _host.Start(TargetExe, Xaml);
+                _host.Start(TargetExe, Xaml, SourceAssembly);
             else
-                _host.UpdateXaml(Xaml ?? "");
+                _host.UpdateXaml(Xaml ?? "", SourceAssembly);
         }
 
     }
diff --git a/src/Windows/Avalonia.Designer/Comm/InitMessage.cs b/src/Windows/Avalonia.Designer/Comm/InitMessage.cs
index 46b448edaa..1f44e6e1b4 100644
--- a/src/Windows/Avalonia.Designer/Comm/InitMessage.cs
+++ b/src/Windows/Avalonia.Designer/Comm/InitMessage.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Designer.Comm
     class InitMessage : UpdateXamlMessage
     {
         public string TargetExe { get; private set; }
-        public InitMessage(string targetExe, string xaml) : base(xaml)
+        public InitMessage(string targetExe, string xaml, string sourceAssembly) : base(xaml, sourceAssembly)
         {
             TargetExe = targetExe;
         }
diff --git a/src/Windows/Avalonia.Designer/Comm/ProcessHost.cs b/src/Windows/Avalonia.Designer/Comm/ProcessHost.cs
index eeb5032452..de7e51e261 100644
--- a/src/Windows/Avalonia.Designer/Comm/ProcessHost.cs
+++ b/src/Windows/Avalonia.Designer/Comm/ProcessHost.cs
@@ -7,9 +7,6 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Threading;
-using Avalonia.Designer.Metadata;
 
 namespace Avalonia.Designer.Comm
 {
@@ -28,9 +25,7 @@ namespace Avalonia.Designer.Comm
                 OnPropertyChanged();
             }
         }
-
-        public event Action<AvaloniaDesignerMetadata> MetadataArrived;
-
+        
         private bool _isAlive;
         private readonly SynchronizationContext _dispatcher;
         private Process _proc;
@@ -67,6 +62,8 @@ namespace Avalonia.Designer.Comm
 
         void OnExited(object sender, EventArgs eventArgs)
         {
+            if(_proc != sender)
+                return;
             _proc = null;
             _dispatcher.Post(_ =>
             {
@@ -83,13 +80,14 @@ namespace Avalonia.Designer.Comm
             State = "Designer process crashed";
         }
 
-        public void Start(string targetExe, string initialXaml)
+        public void Start(string targetExe, string initialXaml, string sourceAssembly)
         {
             if (_proc != null)
             {
                 _proc.Exited -= OnExited;
                 try
                 {
+                    _comm?.Dispose();
                     _proc.Kill();
                 }
                 catch { }
@@ -97,7 +95,7 @@ namespace Avalonia.Designer.Comm
                 State = "Restarting...";
             }
 
-            var msg = new InitMessage(Path.GetFullPath(targetExe), initialXaml);
+            var msg = new InitMessage(Path.GetFullPath(targetExe), initialXaml, sourceAssembly);
             var exe = typeof (ProcessHost).Assembly.GetModules()[0].FullyQualifiedName;
             _proc = new Process()
             {
@@ -130,9 +128,9 @@ namespace Avalonia.Designer.Comm
 
         }
 
-        public void UpdateXaml(string xaml)
+        public void UpdateXaml(string xaml, string sourceAssembly)
         {
-            _comm?.SendMessage(new UpdateXamlMessage(xaml));
+            _comm?.SendMessage(new UpdateXamlMessage(xaml, sourceAssembly));
         }
 
         private void OnMessage(object obj)
@@ -143,9 +141,6 @@ namespace Avalonia.Designer.Comm
             var windowMessage = obj as WindowCreatedMessage;
             if (windowMessage != null)
                 WindowHandle = windowMessage.Handle;
-            var metadata = obj as UpdateMetadataMessage;
-            if (metadata != null)
-                _dispatcher.Post(_ => MetadataArrived?.Invoke(metadata.Metadata), null);
         }
 
         public void Kill()
diff --git a/src/Windows/Avalonia.Designer/Comm/UpdateMetadata.cs b/src/Windows/Avalonia.Designer/Comm/UpdateMetadata.cs
deleted file mode 100644
index 6ab9b0d0a8..0000000000
--- a/src/Windows/Avalonia.Designer/Comm/UpdateMetadata.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Designer.Metadata;
-
-namespace Avalonia.Designer.Comm
-{
-    [Serializable]
-    public class UpdateMetadataMessage
-    {
-        public UpdateMetadataMessage(AvaloniaDesignerMetadata metadata)
-        {
-            Metadata = metadata;
-        }
-
-        public AvaloniaDesignerMetadata Metadata { get; }
-    }
-}
diff --git a/src/Windows/Avalonia.Designer/Comm/UpdateXamlMessage.cs b/src/Windows/Avalonia.Designer/Comm/UpdateXamlMessage.cs
index 1d5132dbf2..2039a131f9 100644
--- a/src/Windows/Avalonia.Designer/Comm/UpdateXamlMessage.cs
+++ b/src/Windows/Avalonia.Designer/Comm/UpdateXamlMessage.cs
@@ -9,11 +9,13 @@ namespace Avalonia.Designer.Comm
     [Serializable]
     class UpdateXamlMessage
     {
-        public UpdateXamlMessage(string xaml)
+        public UpdateXamlMessage(string xaml, string assemblyPath)
         {
             Xaml = xaml;
+            AssemblyPath = assemblyPath;
         }
 
         public string Xaml { get; private set; }
+        public string AssemblyPath { get; private set; }
     }
 }
diff --git a/src/Windows/Avalonia.Designer/DemoWindow.xaml b/src/Windows/Avalonia.Designer/DemoWindow.xaml
index 85e6cfde48..1d7c710853 100644
--- a/src/Windows/Avalonia.Designer/DemoWindow.xaml
+++ b/src/Windows/Avalonia.Designer/DemoWindow.xaml
@@ -10,13 +10,20 @@
         <DockPanel Dock="Bottom" LastChildFill="True">
             <TextBlock Margin="5,0">Target Exe: </TextBlock>
             <Button DockPanel.Dock="Right">Load XAML</Button>
-            <Button Margin="5,0"  DockPanel.Dock="Right">Select EXE</Button>
+            <Button Margin="5,0"  DockPanel.Dock="Right" Click="SelectExeClicked">Select EXE</Button>
+            <Button Margin="5,0" DockPanel.Dock="Right" Click="RestartClicked">Restart</Button>
             <TextBlock x:Name="TargetExe"/>
         </DockPanel>
+        <DockPanel Dock="Bottom" LastChildFill="True" Margin="0,5">
+            <TextBlock Margin="5,0">Source Assembly:</TextBlock>
+            <Button DockPanel.Dock="Right" Click="SelectSourceClicked">Select Source Assembly</Button>
+            <TextBlock x:Name="SourceAssembly"/>
+        </DockPanel>
         <UniformGrid Columns="1" Rows="2">
-            <local:AvaloniaDesigner 
+            <local:AvaloniaDesigner x:Name="Designer"
                 TargetExe="{Binding ElementName=TargetExe, Path=Text, Mode=OneWay}"
-                Xaml="{Binding ElementName=Xaml, Path=Text, Mode=OneWay}"/>
+                Xaml="{Binding ElementName=Xaml, Path=Text, Mode=OneWay}"
+                                    SourceAssembly="{Binding ElementName=SourceAssembly, Path=Text, Mode=OneWay}"/>
             <TextBox x:Name="Xaml"/>
         </UniformGrid>
     </DockPanel>
diff --git a/src/Windows/Avalonia.Designer/DemoWindow.xaml.cs b/src/Windows/Avalonia.Designer/DemoWindow.xaml.cs
index f5d9388f37..fd42473ec8 100644
--- a/src/Windows/Avalonia.Designer/DemoWindow.xaml.cs
+++ b/src/Windows/Avalonia.Designer/DemoWindow.xaml.cs
@@ -13,6 +13,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Microsoft.Win32;
 
 namespace Avalonia.Designer
 {
@@ -24,11 +25,42 @@ namespace Avalonia.Designer
             InitializeComponent();
         }
 
-        public DemoWindow(string targetExe, string targetPath) : this()
+        public DemoWindow(string targetExe, string targetPath, string sourceAssembly) : this()
         {
-            TargetExe.Text = targetExe;
-            if (targetExe != null)
+            
+            if (targetPath != null)
+            {
                 Xaml.Text = File.ReadAllText(targetPath);
+            }
+            SourceAssembly.Text = sourceAssembly ?? targetExe;
+            TargetExe.Text = targetExe;
+        }
+
+        static string OpenFile(string filter)
+        {
+            var dlg = new OpenFileDialog {Filter = filter};
+            if (dlg.ShowDialog() == true)
+                return dlg.FileName;
+            return null;
+        }
+
+        private void SelectExeClicked(object sender, RoutedEventArgs e)
+        {
+            var exe = OpenFile("exe|*.exe");
+            if (exe != null)
+                TargetExe.Text = exe;
+        }
+
+        private void RestartClicked(object sender, RoutedEventArgs e)
+        {
+            Designer.RestartProcess();
+        }
+
+        private void SelectSourceClicked(object sender, RoutedEventArgs e)
+        {
+            var exe = OpenFile("assembly|*.exe,*.dll");
+            if (exe != null)
+                SourceAssembly.Text = exe;
         }
     }
 }
diff --git a/src/Windows/Avalonia.Designer/Metadata/AvaloniaDesignerMetadata.cs b/src/Windows/Avalonia.Designer/Metadata/AvaloniaDesignerMetadata.cs
deleted file mode 100644
index cc08482482..0000000000
--- a/src/Windows/Avalonia.Designer/Metadata/AvaloniaDesignerMetadata.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Avalonia.Designer.Metadata
-{
-    [Serializable]
-    public class AvaloniaDesignerMetadata
-    {
-        public List<MetadataType> Types { get; set; }
-        public List<MetadataNamespaceAlias> NamespaceAliases { get; set; }
-    }
-
-
-    [Serializable]
-    public class MetadataType
-    {
-        public string Namespace { get; set; }
-        public string Name { get; set; }
-        public List<MetadataProperty> Properties { get; set; }
-        public string FullName => Namespace + "." + Name;
-    }
-
-    [Serializable]
-    public class MetadataNamespaceAlias
-    {
-        public string Namespace { get; set; }
-        public string XmlNamespace { get; set; }
-    }
-
-    [Serializable]
-    public class MetadataProperty
-    {
-        public string Name { get; set; }
-        public MetadataPropertyType Type { get; set; }
-        public string MetadataFullTypeName { get; set; }
-        public string[] EnumValues { get; set; }
-    }
-
-
-
-    [Serializable]
-    public enum MetadataPropertyType
-    {
-        BasicType,
-        MetadataType,
-        Enum
-    }
-}
diff --git a/src/Windows/Avalonia.Designer/Program.cs b/src/Windows/Avalonia.Designer/Program.cs
index 16110b6aa9..6c0dcdf372 100644
--- a/src/Windows/Avalonia.Designer/Program.cs
+++ b/src/Windows/Avalonia.Designer/Program.cs
@@ -58,10 +58,12 @@ namespace Avalonia.Designer
             var app =  new App();
             const string targetExe = "--exe=";
             const string xaml = "--xaml=";
-            
+            const string source = "--source=";
+
             app.Run(new DemoWindow(
                 args.Where(a => a.StartsWith(targetExe)).Select(a => a.Substring(targetExe.Length)).FirstOrDefault(),
-                args.Where(a => a.StartsWith(xaml)).Select(a => a.Substring(xaml.Length)).FirstOrDefault()));
+                args.Where(a => a.StartsWith(xaml)).Select(a => a.Substring(xaml.Length)).FirstOrDefault(),
+                args.Where(a => a.StartsWith(source)).Select(a => a.Substring(source.Length)).FirstOrDefault()));
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContext.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContext.cs
index add11e3cff..e0c75b44e1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContext.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContext.cs
@@ -276,6 +276,11 @@ namespace Avalonia.Direct2D1.Media
         }
 
         public void PopOpacity()
+        {
+            PopLayer();
+        }
+
+        private void PopLayer()
         {
             var layer = _layers.Pop();
             if (layer != null)
@@ -324,5 +329,46 @@ namespace Avalonia.Direct2D1.Media
                 return new SolidColorBrushImpl((Avalonia.Media.SolidColorBrush)null, _renderTarget);
             }
         }
+
+        public void PushGeometryClip(Avalonia.Media.Geometry clip)
+        {
+            var parameters = new LayerParameters
+            {
+                ContentBounds = PrimitiveExtensions.RectangleInfinite,
+                MaskTransform = PrimitiveExtensions.Matrix3x2Identity,
+                Opacity = 1,
+                GeometricMask = ((GeometryImpl)clip.PlatformImpl).Geometry
+            };
+            var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_renderTarget);
+            _renderTarget.PushLayer(ref parameters, layer);
+
+            _layers.Push(layer);
+
+        }
+
+        public void PopGeometryClip()
+        {
+            PopLayer();
+        }
+
+        public void PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            var parameters = new LayerParameters
+            {
+                ContentBounds = PrimitiveExtensions.RectangleInfinite,
+                MaskTransform = PrimitiveExtensions.Matrix3x2Identity,
+                Opacity = 1,
+                OpacityBrush = CreateBrush(mask, bounds.Size).PlatformBrush
+            };
+            var layer = _layerPool.Count != 0 ? _layerPool.Pop() : new Layer(_renderTarget);
+            _renderTarget.PushLayer(ref parameters, layer);
+
+            _layers.Push(layer);
+        }
+
+        public void PopOpacityMask()
+        {
+            PopLayer();
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 4c34c031c4..b98c944c7d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -84,5 +84,12 @@ namespace Avalonia.Direct2D1.Media
                 return DefiningGeometry.GetWidenedBounds((float)strokeThickness).ToAvalonia();
             }
         }
+
+
+        public bool FillContains(Point point)
+        {
+            return Geometry.FillContainsPoint(point.ToSharpDX());
+        }
+
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index 141c2e4653..6635882d4a 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -75,6 +75,15 @@ namespace Avalonia.Win32.Interop
             SWP_RESIZE = SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER
         }
 
+        public enum SizeCommand
+        {
+            Restored,
+            Minimized,
+            Maximized,
+            MaxShow,
+            MaxHide,
+        }
+
         public enum ShowWindowCommand
         {
             Hide = 0,
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 483de0d000..55c6048b1f 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -500,6 +500,15 @@ namespace Avalonia.Win32
                         new Vector(0, ((int)wParam >> 16) / wheelDelta), GetMouseModifiers(wParam));
                     break;
 
+                case UnmanagedMethods.WindowsMessage.WM_MOUSEHWHEEL:
+                    e = new RawMouseWheelEventArgs(
+                        WindowsMouseDevice.Instance,
+                        timestamp,
+                        _owner,
+                        ScreenToClient(DipFromLParam(lParam)),
+                        new Vector(-((int)wParam >> 16) / wheelDelta,0), GetMouseModifiers(wParam));
+                    break;
+
                 case UnmanagedMethods.WindowsMessage.WM_MOUSELEAVE:
                     _trackingMouse = false;
                     e = new RawMouseEventArgs(
@@ -543,7 +552,9 @@ namespace Avalonia.Win32
                     return IntPtr.Zero;
 
                 case UnmanagedMethods.WindowsMessage.WM_SIZE:
-                    if (Resized != null)
+                    if (Resized != null &&
+                        (wParam == (IntPtr)UnmanagedMethods.SizeCommand.Restored ||
+                         wParam == (IntPtr)UnmanagedMethods.SizeCommand.Maximized))
                     {
                         var clientSize = new Size((int)lParam & 0xffff, (int)lParam >> 16);
                         Resized(clientSize / Scaling);
diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
index d3a48c02b0..3732f13769 100644
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@@ -109,7 +109,7 @@
     <Compile Include="ListBoxTests_Single.cs" />
     <Compile Include="NameScopeTests.cs" />
     <Compile Include="Primitives\SelectingItemsControlTests_Multiple.cs" />
-    <Compile Include="Presenters\ScrollContentPresenterTests_IScrollable.cs" />
+    <Compile Include="Presenters\ScrollContentPresenterTests_ILogicalScrollable.cs" />
     <Compile Include="TextBoxTests.cs" />
     <Compile Include="TextBlockTests.cs" />
     <Compile Include="WindowingPlatformMock.cs" />
diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
index 5d2269e73c..01b550fb3b 100644
--- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
@@ -3,8 +3,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Presenters;
+using Avalonia.Data;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Generators
@@ -111,6 +113,40 @@ namespace Avalonia.Controls.UnitTests.Generators
             Assert.Equal(new[] { 0, 1 }, target.Containers.Select(x => x.Index));
         }
 
+        [Fact]
+        public void Style_Binding_Should_Be_Able_To_Override_Content()
+        {
+            var owner = new Decorator();
+            var target = new ItemContainerGenerator(owner);
+            var container = (ContentPresenter)target.Materialize(0, "foo", null).ContainerControl;
+
+            Assert.Equal("foo", container.Content);
+
+            container.Bind(
+                ContentPresenter.ContentProperty,
+                Observable.Never<object>().StartWith("bar"),
+                BindingPriority.Style);
+
+            Assert.Equal("bar", container.Content);
+        }
+
+        [Fact]
+        public void Style_Binding_Should_Be_Able_To_Override_Content_Typed()
+        {
+            var owner = new Decorator();
+            var target = new ItemContainerGenerator<ListBoxItem>(owner, ListBoxItem.ContentProperty, null);
+            var container = (ListBoxItem)target.Materialize(0, "foo", null).ContainerControl;
+
+            Assert.Equal("foo", container.Content);
+
+            container.Bind(
+                ContentPresenter.ContentProperty,
+                Observable.Never<object>().StartWith("bar"),
+                BindingPriority.Style);
+
+            Assert.Equal("bar", container.Content);
+        }
+
         private IList<ItemContainerInfo> Materialize(
             IItemContainerGenerator generator,
             int index,
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index d1443fb2ae..7e1347daf5 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -194,6 +194,10 @@ namespace Avalonia.Controls.UnitTests
 
         private void Prepare(ListBox target)
         {
+            // The ListBox needs to be part of a rooted visual tree.
+            var root = new TestRoot();
+            root.Child = target;
+
             // Apply the template to the ListBox itself.
             target.ApplyTemplate();
 
@@ -224,7 +228,7 @@ namespace Avalonia.Controls.UnitTests
             // and re-arrange everything.
             foreach (IControl i in target.GetSelfAndVisualDescendents())
             {
-                i.InvalidateArrange();
+                i.InvalidateMeasure();
             }
 
             target.Arrange(new Rect(0, 0, 100, 100));
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests.cs
index 5c26ba5a5e..a54ff022ac 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests.cs
@@ -1,15 +1,17 @@
 // 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 Moq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
-using Xunit;
+using Moq;
 using System;
+using System.Linq;
+using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Presenters
 {
@@ -107,6 +109,20 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Same(target, content.Parent);
         }
 
+        [Fact]
+        public void Should_Add_Child_To_Own_LogicalChildren_Outside_Template()
+        {
+            var content = new Border();
+            var target = new ContentPresenter { Content = content };
+
+            target.UpdateChild();
+
+            var logicalChildren = target.GetLogicalChildren();
+
+            Assert.Equal(1, logicalChildren.Count());
+            Assert.Equal(content, logicalChildren.First());
+        }
+
         [Fact]
         public void Adding_To_Logical_Tree_Should_Reevaluate_DataTemplates()
         {
@@ -178,9 +194,162 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Same(control, target.Child);
         }
 
+        [Fact]
+        public void Should_Raise_DetachedFromLogicalTree_On_Content_Changed_OutsideTemplate()
+        {
+            var target = new ContentPresenter
+            {
+                ContentTemplate =
+                    new FuncDataTemplate<string>(t => new ContentControl() { Content = t }, false)
+            };
+
+            var parentMock = new Mock<Control>();
+            parentMock.As<IContentPresenterHost>();
+            parentMock.As<IStyleRoot>();
+
+            (target as ISetLogicalParent).SetParent(parentMock.Object);
+
+            target.Content = "foo";
+
+            target.UpdateChild();
+
+            var foo = target.Child as ContentControl;
+
+            bool foodetached = false;
+
+            Assert.NotNull(foo);
+            Assert.Equal("foo", foo.Content);
+
+            foo.DetachedFromLogicalTree += delegate { foodetached = true; };
+
+            target.Content = "bar";
+            target.UpdateChild();
+
+            var bar = target.Child as ContentControl;
+
+            Assert.NotNull(bar);
+            Assert.True(bar != foo);
+            Assert.False((foo as IControl).IsAttachedToLogicalTree);
+            Assert.True(foodetached);
+        }
+
+        [Fact]
+        public void Should_Raise_DetachedFromLogicalTree_In_ContentControl_On_Content_Changed_OutsideTemplate()
+        {
+            var contentControl = new ContentControl
+            {
+                Template = new FuncControlTemplate<ContentControl>(c => new ContentPresenter()
+                {
+                    Name = "PART_ContentPresenter",
+                    [~ContentPresenter.ContentProperty] = c[~ContentControl.ContentProperty],
+                    [~ContentPresenter.ContentTemplateProperty] = c[~ContentControl.ContentTemplateProperty]
+                }),
+                ContentTemplate =
+                    new FuncDataTemplate<string>(t => new ContentControl() { Content = t }, false)
+            };
+
+            var parentMock = new Mock<Control>();
+            parentMock.As<IStyleRoot>();
+            parentMock.As<ILogical>().SetupGet(l => l.IsAttachedToLogicalTree).Returns(true);
+
+            (contentControl as ISetLogicalParent).SetParent(parentMock.Object);
+
+            contentControl.ApplyTemplate();
+            var target = contentControl.Presenter as ContentPresenter;
+
+            contentControl.Content = "foo";
+
+            target.UpdateChild();
+
+            var tbfoo = target.Child as ContentControl;
+
+            bool foodetached = false;
+
+            Assert.NotNull(tbfoo);
+            Assert.Equal("foo", tbfoo.Content);
+
+            tbfoo.DetachedFromLogicalTree += delegate { foodetached = true; };
+
+            contentControl.Content = "bar";
+            target.UpdateChild();
+
+            var tbbar = target.Child as ContentControl;
+
+            Assert.NotNull(tbbar);
+            Assert.True(tbbar != tbfoo);
+            Assert.False((tbfoo as IControl).IsAttachedToLogicalTree);
+            Assert.True(foodetached);
+        }
+
+        [Fact]
+        public void Should_Raise_DetachedFromLogicalTree_On_Detached_OutsideTemplate()
+        {
+            var target = new ContentPresenter
+            {
+                ContentTemplate =
+                    new FuncDataTemplate<string>(t => new ContentControl() { Content = t }, false)
+            };
+
+            var parentMock = new Mock<Control>();
+            parentMock.As<IContentPresenterHost>();
+            parentMock.As<IStyleRoot>();
+
+            (target as ISetLogicalParent).SetParent(parentMock.Object);
+
+            target.Content = "foo";
+
+            target.UpdateChild();
+
+            var foo = target.Child as ContentControl;
+
+            bool foodetached = false;
+
+            Assert.NotNull(foo);
+            Assert.Equal("foo", foo.Content);
+
+            foo.DetachedFromLogicalTree += delegate { foodetached = true; };
+
+            (target as ISetLogicalParent).SetParent(null);
+
+            Assert.False((foo as IControl).IsAttachedToLogicalTree);
+            Assert.True(foodetached);
+        }
+
+        [Fact]
+        public void Should_Remove_Old_Child_From_LogicalChildren_On_ContentChanged_OutsideTemplate()
+        {
+            var target = new ContentPresenter
+            {
+                ContentTemplate =
+                    new FuncDataTemplate<string>(t => new ContentControl() { Content = t }, false)
+            };
+
+            target.Content = "foo";
+
+            target.UpdateChild();
+
+            var foo = target.Child as ContentControl;
+
+            Assert.NotNull(foo);
+
+            var logicalChildren = target.GetLogicalChildren();
+
+            Assert.Equal(1, logicalChildren.Count());
+
+            target.Content = "bar";
+            target.UpdateChild();
+
+            Assert.Equal(null, foo.Parent);
+
+            logicalChildren = target.GetLogicalChildren();
+
+            Assert.Equal(1, logicalChildren.Count());
+            Assert.NotEqual(foo, logicalChildren.First());
+        }
+
         private class TestContentControl : ContentControl
         {
             public IControl Child { get; set; }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
index 72ec2e6618..2f6361a867 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
@@ -1,18 +1,59 @@
 // 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.Controls.Generators;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Layout;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Presenters
 {
     public class ItemsPresenterTests_Virtualization
     {
+        [Fact]
+        public void Should_Not_Create_Items_Before_Added_To_Visual_Tree()
+        {
+            var items = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
+            var target = new TestItemsPresenter(true)
+            {
+                Items = items,
+                ItemsPanel = VirtualizingPanelTemplate(Orientation.Vertical),
+                ItemTemplate = ItemTemplate(),
+                VirtualizationMode = ItemVirtualizationMode.Simple,
+            };
+
+            var scroller = new ScrollContentPresenter
+            {
+                Content = target,
+            };
+
+            scroller.UpdateChild();
+            target.ApplyTemplate();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Empty(target.Panel.Children);
+
+            var root = new TestRoot
+            {
+                Child = scroller,
+            };
+
+            target.InvalidateMeasure();
+            target.Panel.InvalidateMeasure();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(10, target.Panel.Children.Count);
+        }
+
         [Fact]
         public void Should_Return_IsLogicalScrollEnabled_False_When_Has_No_Virtualizing_Panel()
         {
@@ -60,7 +101,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         }
 
         [Fact]
-        public void Should_Fill_Panel_With_Containers()
+        public void Parent_ScrollContentPresenter_Properties_Should_Be_Set()
         {
             var target = CreateTarget();
 
@@ -68,6 +109,22 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
+            var scroll = (ScrollContentPresenter)target.Parent;
+            Assert.Equal(new Size(0, 20), scroll.Extent);
+            Assert.Equal(new Size(0, 10), scroll.Viewport);
+        }
+
+        [Fact]
+        public void Should_Fill_Panel_With_Containers()
+        {
+            var target = CreateTarget();
+
+            target.ApplyTemplate();
+
+            target.Measure(new Size(100, 100));
+            Assert.Equal(10, target.Panel.Children.Count);
+
+            target.Arrange(new Rect(0, 0, 100, 100));
             Assert.Equal(10, target.Panel.Children.Count);
         }
 
@@ -83,6 +140,20 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(2, target.Panel.Children.Count);
         }
 
+        [Fact]
+        public void Should_Expand_To_Fit_Containers_When_Flexible_Size()
+        {
+            var target = CreateTarget();
+
+            target.ApplyTemplate();
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(10, 200), target.DesiredSize);
+            Assert.Equal(new Size(10, 200), target.Bounds.Size);
+            Assert.Equal(20, target.Panel.Children.Count);
+        }
+
         [Fact]
         public void Initial_Item_DataContexts_Should_Be_Correct()
         {
@@ -122,6 +193,82 @@ namespace Avalonia.Controls.UnitTests.Presenters
             }
         }
 
+        [Fact]
+        public void Changing_VirtualizationMode_None_To_Simple_Should_Update_Control()
+        {
+            var target = CreateTarget(mode: ItemVirtualizationMode.None);
+            var scroll = (ScrollContentPresenter)target.Parent;
+
+            scroll.Measure(new Size(100, 100));
+            scroll.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(20, target.Panel.Children.Count);
+            Assert.Equal(new Size(10, 200), scroll.Extent);
+            Assert.Equal(new Size(100, 100), scroll.Viewport);
+
+            target.VirtualizationMode = ItemVirtualizationMode.Simple;
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(10, target.Panel.Children.Count);
+            Assert.Equal(new Size(0, 20), scroll.Extent);
+            Assert.Equal(new Size(0, 10), scroll.Viewport);
+        }
+
+        [Fact]
+        public void Changing_VirtualizationMode_None_To_Simple_Should_Add_Correct_Number_Of_Controls()
+        {
+            using (UnitTestApplication.Start(TestServices.RealLayoutManager))
+            {
+                var target = CreateTarget(mode: ItemVirtualizationMode.None);
+                var scroll = (ScrollContentPresenter)target.Parent;
+
+                scroll.Measure(new Size(100, 100));
+                scroll.Arrange(new Rect(0, 0, 100, 100));
+
+                // Ensure than an intermediate measure pass doesn't add more controls than it
+                // should. This can happen if target gets measured with Size.Infinity which
+                // is what the available size should be when VirtualizationMode == None but not
+                // what it should after VirtualizationMode is changed to Simple.
+                target.Panel.Children.CollectionChanged += (s, e) =>
+                {
+                    Assert.InRange(target.Panel.Children.Count, 0, 10);
+                };
+
+                target.VirtualizationMode = ItemVirtualizationMode.Simple;
+                LayoutManager.Instance.ExecuteLayoutPass();
+
+                Assert.Equal(10, target.Panel.Children.Count);
+            }
+        }
+
+        [Fact]
+        public void Changing_VirtualizationMode_Simple_To_None_Should_Update_Control()
+        {
+            var target = CreateTarget();
+            var scroll = (ScrollContentPresenter)target.Parent;
+
+            scroll.Measure(new Size(100, 100));
+            scroll.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(10, target.Panel.Children.Count);
+            Assert.Equal(new Size(0, 20), scroll.Extent);
+            Assert.Equal(new Size(0, 10), scroll.Viewport);
+
+            target.VirtualizationMode = ItemVirtualizationMode.None;
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            // Here - unlike changing the other way - we need to do a layout pass on the scroll
+            // content presenter as non-logical scroll values are only updated on arrange.
+            scroll.Measure(new Size(100, 100));
+            scroll.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(20, target.Panel.Children.Count);
+            Assert.Equal(new Size(10, 200), scroll.Extent);
+            Assert.Equal(new Size(100, 100), scroll.Viewport);
+        }
+
         private static ItemsPresenter CreateTarget(
             ItemVirtualizationMode mode = ItemVirtualizationMode.Simple,
             Orientation orientation = Orientation.Vertical,
@@ -131,7 +278,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             ItemsPresenter result;
             var items = Enumerable.Range(0, itemCount).Select(x => $"Item {x}").ToList();
 
-            var scroller = new ScrollContentPresenter
+            var scroller = new TestScroller
             {
                 Content = result = new TestItemsPresenter(useContainers)
                 {
@@ -165,6 +312,21 @@ namespace Avalonia.Controls.UnitTests.Presenters
             });
         }
 
+        private class TestScroller : ScrollContentPresenter, IRenderRoot
+        {
+            public IRenderQueueManager RenderQueueManager { get; }
+
+            public Point PointToClient(Point point)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Point PointToScreen(Point point)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
         private class TestItemsPresenter : ItemsPresenter
         {
             private bool _useContainers;
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
index 1c7a08bdb4..34b074d185 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.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 System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -10,6 +11,9 @@ using Avalonia.Controls.Generators;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Presenters
@@ -60,6 +64,23 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(new Size(10, 0), ((ILogicalScrollable)target).Viewport);
         }
 
+        [Fact]
+        public void Should_Add_Containers_When_Panel_Is_Not_Full()
+        {
+            var target = CreateTarget(itemCount: 5);
+            var items = (IList<string>)target.Items;
+
+            target.ApplyTemplate();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(5, target.Panel.Children.Count);
+
+            items.Add("New Item");
+
+            Assert.Equal(6, target.Panel.Children.Count);
+        }
+
         [Fact]
         public void Should_Remove_Items_When_Control_Is_Shrank()
         {
@@ -131,7 +152,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Moving_To_And_From_The_End_With_Partial_Item_Should_Set_Panel_PixelOffset()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 95));
@@ -142,7 +163,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var minIndex = target.ItemContainerGenerator.Containers.Min(x => x.Index);
             Assert.Equal(new Vector(0, 11), ((ILogicalScrollable)target).Offset);
             Assert.Equal(10, minIndex);
-            Assert.Equal(5, ((IVirtualizingPanel)target.Panel).PixelOffset);
+            Assert.Equal(10, ((IVirtualizingPanel)target.Panel).PixelOffset);
 
             ((ILogicalScrollable)target).Offset = new Vector(0, 10);
 
@@ -156,13 +177,13 @@ namespace Avalonia.Controls.UnitTests.Presenters
             minIndex = target.ItemContainerGenerator.Containers.Min(x => x.Index);
             Assert.Equal(new Vector(0, 11), ((ILogicalScrollable)target).Offset);
             Assert.Equal(10, minIndex);
-            Assert.Equal(5, ((IVirtualizingPanel)target.Panel).PixelOffset);
+            Assert.Equal(10, ((IVirtualizingPanel)target.Panel).PixelOffset);
         }
 
         [Fact]
         public void Inserting_Items_Should_Update_Containers()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 100));
@@ -187,7 +208,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Removing_First_Materialized_Item_Should_Update_Containers()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 100));
@@ -209,7 +230,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Removing_Items_From_Middle_Should_Update_Containers_When_All_Items_Visible()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 200));
@@ -234,7 +255,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Removing_Last_Item_Should_Update_Containers_When_All_Items_Visible()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 200));
@@ -258,7 +279,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Removing_Items_When_Scrolled_To_End_Should_Recyle_Containers_At_Top()
         {
-            var target = CreateTarget(itemCount: 20, useAvaloniaList: true);
+            var target = CreateTarget(useAvaloniaList: true);
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 100));
@@ -282,7 +303,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Removing_Items_When_Scrolled_To_Near_End_Should_Recycle_Containers_At_Bottom_And_Top()
         {
-            var target = CreateTarget(itemCount: 20, useAvaloniaList: true);
+            var target = CreateTarget(useAvaloniaList: true);
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 100));
@@ -308,7 +329,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Replacing_Items_Should_Update_Containers()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 100));
@@ -329,7 +350,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Moving_Items_Should_Update_Containers()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 100));
@@ -353,7 +374,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void Setting_Items_To_Null_Should_Remove_Containers()
         {
-            var target = CreateTarget(itemCount: 20);
+            var target = CreateTarget();
 
             target.ApplyTemplate();
             target.Measure(new Size(100, 100));
@@ -370,6 +391,258 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Empty(target.Panel.Children);
         }
 
+        [Fact]
+        public void Reassigning_Items_Should_Create_Containers()
+        {
+            var target = CreateTarget(itemCount: 5);
+
+            target.ApplyTemplate();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            var expected = Enumerable.Range(0, 5).Select(x => $"Item {x}").ToList();
+            var items = (ObservableCollection<string>)target.Items;
+            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+
+            Assert.Equal(expected, actual);
+
+            expected = Enumerable.Range(0, 6).Select(x => $"Item {x}").ToList();
+            target.Items = expected;
+
+            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void Reassigning_Items_Should_Remove_Containers()
+        {
+            var target = CreateTarget(itemCount: 6);
+
+            target.ApplyTemplate();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            var expected = Enumerable.Range(0, 6).Select(x => $"Item {x}").ToList();
+            var items = (ObservableCollection<string>)target.Items;
+            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+
+            Assert.Equal(expected, actual);
+
+            expected = Enumerable.Range(0, 5).Select(x => $"Item {x}").ToList();
+            target.Items = expected;
+
+            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void Clearing_Items_And_ReAdding_Should_Remove_Containers()
+        {
+            var target = CreateTarget(itemCount: 6);
+
+            target.ApplyTemplate();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            var expected = Enumerable.Range(0, 6).Select(x => $"Item {x}").ToList();
+            var items = (ObservableCollection<string>)target.Items;
+            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+
+            Assert.Equal(expected, actual);
+
+            expected = Enumerable.Range(0, 5).Select(x => $"Item {x}").ToList();
+            target.Items = null;
+            target.Items = expected;
+
+            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void Scrolling_To_Partial_Last_Item_Then_Adding_Item_Updates_Containers()
+        {
+            var target = CreateTarget(itemCount: 10);
+            var items = (IList<string>)target.Items;
+
+            target.ApplyTemplate();
+            target.Measure(new Size(100, 95));
+            target.Arrange(new Rect(0, 0, 100, 95));
+
+            ((ILogicalScrollable)target).Offset = new Vector(0, 1);
+            Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
+
+            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
+            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+            Assert.Equal(expected, actual);
+            Assert.Equal(10, ((IVirtualizingPanel)target.Panel).PixelOffset);
+
+            items.Add("Item 10");
+
+            expected = Enumerable.Range(1, 10).Select(x => $"Item {x}").ToList();
+            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
+            Assert.Equal(expected, actual);
+            Assert.Equal(0, ((IVirtualizingPanel)target.Panel).PixelOffset);
+        }
+
+        public class Vertical
+        {
+            [Fact]
+            public void GetControlInDirection_Down_Should_Return_Existing_Container_If_Materialized()
+            {
+                var target = CreateTarget();
+
+                target.ApplyTemplate();
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(0, 0, 100, 100));
+
+                var from = target.Panel.Children[5];
+                var result = ((ILogicalScrollable)target).GetControlInDirection(
+                    NavigationDirection.Down,
+                    from);
+
+                Assert.Same(target.Panel.Children[6], result);
+            }
+
+            [Fact]
+            public void GetControlInDirection_Down_Should_Scroll_If_Necessary()
+            {
+                var target = CreateTarget();
+
+                target.ApplyTemplate();
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(0, 0, 100, 100));
+
+                var from = target.Panel.Children[9];
+                var result = ((ILogicalScrollable)target).GetControlInDirection(
+                    NavigationDirection.Down,
+                    from);
+
+                Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
+                Assert.Same(target.Panel.Children[9], result);
+            }
+
+            [Fact]
+            public void GetControlInDirection_Down_Should_Scroll_If_Partially_Visible()
+            {
+                using (UnitTestApplication.Start(TestServices.RealLayoutManager))
+                {
+                    var target = CreateTarget();
+                    var scroller = (ScrollContentPresenter)target.Parent;
+
+                    scroller.Measure(new Size(100, 95));
+                    scroller.Arrange(new Rect(0, 0, 100, 95));
+
+                    var from = target.Panel.Children[8];
+                    var result = ((ILogicalScrollable)target).GetControlInDirection(
+                        NavigationDirection.Down,
+                        from);
+
+                    Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
+                    Assert.Same(target.Panel.Children[8], result);
+                }
+            }
+
+            [Fact]
+            public void GetControlInDirection_Up_Should_Scroll_If_Partially_Visible_Item_Is_Currently_Shown()
+            {
+                using (UnitTestApplication.Start(TestServices.RealLayoutManager))
+                {
+                    var target = CreateTarget();
+                    var scroller = (ScrollContentPresenter)target.Parent;
+
+                    scroller.Measure(new Size(100, 95));
+                    scroller.Arrange(new Rect(0, 0, 100, 95));
+                    ((ILogicalScrollable)target).Offset = new Vector(0, 11);
+
+                    var from = target.Panel.Children[1];
+                    var result = ((ILogicalScrollable)target).GetControlInDirection(
+                        NavigationDirection.Up,
+                        from);
+
+                    Assert.Equal(new Vector(0, 10), ((ILogicalScrollable)target).Offset);
+                    Assert.Same(target.Panel.Children[0], result);
+                }
+            }
+        }
+
+        public class Horizontal
+        {
+            [Fact]
+            public void GetControlInDirection_Right_Should_Return_Existing_Container_If_Materialized()
+            {
+                var target = CreateTarget(orientation: Orientation.Horizontal);
+
+                target.ApplyTemplate();
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(0, 0, 100, 100));
+
+                var from = target.Panel.Children[5];
+                var result = ((ILogicalScrollable)target).GetControlInDirection(
+                    NavigationDirection.Right,
+                    from);
+
+                Assert.Same(target.Panel.Children[6], result);
+            }
+
+            [Fact]
+            public void GetControlInDirection_Right_Should_Scroll_If_Necessary()
+            {
+                var target = CreateTarget(orientation: Orientation.Horizontal);
+
+                target.ApplyTemplate();
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(0, 0, 100, 100));
+
+                var from = target.Panel.Children[9];
+                var result = ((ILogicalScrollable)target).GetControlInDirection(
+                    NavigationDirection.Right,
+                    from);
+
+                Assert.Equal(new Vector(1, 0), ((ILogicalScrollable)target).Offset);
+                Assert.Same(target.Panel.Children[9], result);
+            }
+
+            [Fact]
+            public void GetControlInDirection_Right_Should_Scroll_If_Partially_Visible()
+            {
+                using (UnitTestApplication.Start(TestServices.RealLayoutManager))
+                {
+                    var target = CreateTarget(orientation: Orientation.Horizontal);
+                    var scroller = (ScrollContentPresenter)target.Parent;
+
+                    scroller.Measure(new Size(95, 100));
+                    scroller.Arrange(new Rect(0, 0, 95, 100));
+
+                    var from = target.Panel.Children[8];
+                    var result = ((ILogicalScrollable)target).GetControlInDirection(
+                        NavigationDirection.Right,
+                        from);
+
+                    Assert.Equal(new Vector(1, 0), ((ILogicalScrollable)target).Offset);
+                    Assert.Same(target.Panel.Children[8], result);
+                }
+            }
+
+            [Fact]
+            public void GetControlInDirection_Left_Should_Scroll_If_Partially_Visible_Item_Is_Currently_Shown()
+            {
+                var target = CreateTarget(orientation: Orientation.Horizontal);
+
+                target.ApplyTemplate();
+                target.Measure(new Size(95, 100));
+                target.Arrange(new Rect(0, 0, 95, 100));
+                ((ILogicalScrollable)target).Offset = new Vector(11, 0);
+
+                var from = target.Panel.Children[1];
+                var result = ((ILogicalScrollable)target).GetControlInDirection(
+                    NavigationDirection.Left,
+                    from);
+
+                Assert.Equal(new Vector(10, 0), ((ILogicalScrollable)target).Offset);
+                Assert.Same(target.Panel.Children[0], result);
+            }
+        }
+
         public class WithContainers
         {
             [Fact]
@@ -459,7 +732,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 (IEnumerable)new AvaloniaList<string>(itemsSource) :
                 (IEnumerable)new ObservableCollection<string>(itemsSource);
 
-            var scroller = new ScrollContentPresenter
+            var scroller = new TestScroller
             {
                 Content = result = new TestItemsPresenter(useContainers)
                 {
@@ -493,6 +766,21 @@ namespace Avalonia.Controls.UnitTests.Presenters
             });
         }
 
+        private class TestScroller : ScrollContentPresenter, IRenderRoot
+        {
+            public IRenderQueueManager RenderQueueManager { get; }
+
+            public Point PointToClient(Point point)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Point PointToScreen(Point point)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
         private class TestItemsPresenter : ItemsPresenter
         {
             private bool _useContainers;
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_IScrollable.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
similarity index 80%
rename from tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_IScrollable.cs
rename to tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
index d0c6a386ac..1258a26d6a 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_IScrollable.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
@@ -5,13 +5,12 @@ using System;
 using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
-using Avalonia.Layout;
-using Avalonia.VisualTree;
+using Avalonia.Input;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
-    public class ScrollContentPresenterTests_IScrollable
+    public class ScrollContentPresenterTests_ILogicalScrollable
     {
         [Fact]
         public void Measure_Should_Pass_Unchanged_Bounds_To_IScrollable()
@@ -237,6 +236,56 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Rect(0, 0, 100, 100), scrollable.Bounds);
         }
 
+        [Fact]
+        public void Changing_Content_Should_Update_State()
+        {
+            var logicalScrollable = new TestScrollable
+            {
+                Extent = new Size(100, 100),
+                Offset = new Vector(50, 50),
+                Viewport = new Size(25, 25),
+            };
+
+            var nonLogicalScrollable = new TestScrollable
+            {
+                IsLogicalScrollEnabled = false,
+            };
+
+            var target = new ScrollContentPresenter
+            {
+                Content = logicalScrollable,
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(logicalScrollable.Extent, target.Extent);
+            Assert.Equal(logicalScrollable.Offset, target.Offset);
+            Assert.Equal(logicalScrollable.Viewport, target.Viewport);
+            Assert.Equal(new Rect(0, 0, 100, 100), logicalScrollable.Bounds);
+
+            target.Content = nonLogicalScrollable;
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(150, 150), target.Extent);
+            Assert.Equal(new Vector(0, 0), target.Offset);
+            Assert.Equal(new Size(100, 100), target.Viewport);
+            Assert.Equal(new Rect(0, 0, 150, 150), nonLogicalScrollable.Bounds);
+
+            target.Content = logicalScrollable;
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(logicalScrollable.Extent, target.Extent);
+            Assert.Equal(logicalScrollable.Offset, target.Offset);
+            Assert.Equal(logicalScrollable.Viewport, target.Viewport);
+            Assert.Equal(new Rect(0, 0, 100, 100), logicalScrollable.Bounds);
+        }
+
         private class TestScrollable : Control, ILogicalScrollable
         {
             private Size _extent;
@@ -293,7 +342,7 @@ namespace Avalonia.Controls.UnitTests
                 }
             }
 
-            public bool BringIntoView(IVisual target, Rect targetRect)
+            public bool BringIntoView(IControl target, Rect targetRect)
             {
                 throw new NotImplementedException();
             }
@@ -303,6 +352,11 @@ namespace Avalonia.Controls.UnitTests
                 AvailableSize = availableSize;
                 return new Size(150, 150);
             }
+
+            public IControl GetControlInDirection(NavigationDirection direction, IControl from)
+            {
+                throw new NotImplementedException();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
index 900f098198..b8cd868252 100644
--- a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.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.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -9,25 +13,53 @@ namespace Avalonia.Controls.UnitTests
     {
         public class Vertical
         {
+            [Fact]
+            public void Measure_Invokes_Controller_UpdateControls()
+            {
+                var target = (IVirtualizingPanel)new VirtualizingStackPanel();
+                var controller = new Mock<IVirtualizingController>();
+
+                target.Controller = controller.Object;
+                target.Measure(new Size(100, 100));
+
+                controller.Verify(x => x.UpdateControls());
+            }
+
+            [Fact]
+            public void Arrange_Invokes_Controller_UpdateControls()
+            {
+                var target = (IVirtualizingPanel)new VirtualizingStackPanel();
+                var controller = new Mock<IVirtualizingController>();
+
+                target.Controller = controller.Object;
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(0, 0, 110, 110));
+
+                controller.Verify(x => x.UpdateControls());
+            }
+
             [Fact]
             public void Reports_IsFull_False_Until_Measure_Height_Is_Reached()
             {
                 var target = (IVirtualizingPanel)new VirtualizingStackPanel();
 
                 target.Measure(new Size(100, 100));
-                target.Arrange(new Rect(target.DesiredSize));
 
+                Assert.Equal(new Size(0, 0), target.DesiredSize);
                 Assert.Equal(new Size(0, 0), target.Bounds.Size);
 
                 Assert.False(target.IsFull);
+                Assert.Equal(0, target.OverflowCount);
                 target.Children.Add(new Canvas { Width = 50, Height = 50 });
                 Assert.False(target.IsFull);
+                Assert.Equal(0, target.OverflowCount);
                 target.Children.Add(new Canvas { Width = 50, Height = 50 });
                 Assert.True(target.IsFull);
+                Assert.Equal(0, target.OverflowCount);
             }
 
             [Fact]
-            public void Reports_Overflow_Only_After_Arrange()
+            public void Reports_Overflow_After_Arrange()
             {
                 var target = (IVirtualizingPanel)new VirtualizingStackPanel();
 
@@ -47,6 +79,92 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.Equal(2, target.OverflowCount);
             }
+
+            [Fact]
+            public void Reports_Correct_Overflow_During_Arrange()
+            {
+                var target = (IVirtualizingPanel)new VirtualizingStackPanel();
+                var controller = new Mock<IVirtualizingController>();
+                var called = false;
+
+                target.Children.Add(new Canvas { Width = 50, Height = 50 });
+                target.Children.Add(new Canvas { Width = 50, Height = 52 });
+                target.Measure(new Size(100, 100));
+
+                controller.Setup(x => x.UpdateControls()).Callback(() =>
+                {
+                    Assert.Equal(2, target.PixelOverflow);
+                    Assert.Equal(0, target.OverflowCount);
+                    called = true;
+                });
+
+                target.Controller = controller.Object;
+                target.Arrange(new Rect(target.DesiredSize));
+
+                Assert.True(called);
+            }
+
+            [Fact]
+            public void Reports_PixelOverflow_After_Arrange()
+            {
+                var target = (IVirtualizingPanel)new VirtualizingStackPanel();
+
+                target.Children.Add(new Canvas { Width = 50, Height = 50 });
+                target.Children.Add(new Canvas { Width = 50, Height = 52 });
+
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(target.DesiredSize));
+
+                Assert.Equal(2, target.PixelOverflow);
+            }
+
+            [Fact]
+            public void Reports_PixelOverflow_With_PixelOffset()
+            {
+                var target = (IVirtualizingPanel)new VirtualizingStackPanel();
+
+                target.Children.Add(new Canvas { Width = 50, Height = 50 });
+                target.Children.Add(new Canvas { Width = 50, Height = 52 });
+                target.PixelOffset = 2;
+
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(target.DesiredSize));
+
+                Assert.Equal(2, target.PixelOverflow);
+            }
+
+            [Fact]
+            public void PixelOffset_Can_Be_More_Than_Child_Without_Affecting_IsFull()
+            {
+                var target = (IVirtualizingPanel)new VirtualizingStackPanel();
+
+                target.Children.Add(new Canvas { Width = 50, Height = 50 });
+                target.Children.Add(new Canvas { Width = 50, Height = 52 });
+                target.PixelOffset = 55;
+
+                target.Measure(new Size(100, 100));
+                target.Arrange(new Rect(target.DesiredSize));
+
+                Assert.Equal(55, target.PixelOffset);
+                Assert.Equal(2, target.PixelOverflow);
+                Assert.True(target.IsFull);
+            }
+
+            [Fact]
+            public void Passes_Navigation_Request_To_ILogicalScrollable_Parent()
+            {
+                var presenter = new Mock<ILogical>().As<IControl>();
+                var scrollable = presenter.As<ILogicalScrollable>();
+                var target = (IVirtualizingPanel)new VirtualizingStackPanel();
+                var from = new Canvas();
+
+                scrollable.Setup(x => x.IsLogicalScrollEnabled).Returns(true);
+
+                ((ISetLogicalParent)target).SetParent(presenter.Object);
+                ((INavigableContainer)target).GetControl(NavigationDirection.Next, from);
+
+                scrollable.Verify(x => x.GetControlInDirection(NavigationDirection.Next, from));
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
index a7144c7246..d0a81d5db9 100644
--- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
+++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -35,8 +35,28 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/tests/Avalonia.Input.UnitTests/InputElement_HitTesting.cs b/tests/Avalonia.Input.UnitTests/InputElement_HitTesting.cs
index 2f984ddce7..f4cca0c684 100644
--- a/tests/Avalonia.Input.UnitTests/InputElement_HitTesting.cs
+++ b/tests/Avalonia.Input.UnitTests/InputElement_HitTesting.cs
@@ -2,7 +2,16 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
 using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using Xunit;
 
 namespace Avalonia.Input.UnitTests
@@ -12,59 +21,73 @@ namespace Avalonia.Input.UnitTests
         [Fact]
         public void InputHitTest_Should_Find_Control_At_Point()
         {
-            var container = new Decorator
+            using (var application = UnitTestApplication.Start(new TestServices(renderInterface: new MockRenderInterface())))
             {
-                Width = 200,
-                Height = 200,
-                Child = new Border
+                var container = new Decorator
                 {
-                    Width = 100,
-                    Height = 100,
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    VerticalAlignment = VerticalAlignment.Center
-                }
-            };
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
 
-            container.Measure(Size.Infinity);
-            container.Arrange(new Rect(container.DesiredSize));
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
 
-            var result = container.InputHitTest(new Point(100, 100));
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+                context.Render(container);
 
-            Assert.Equal(container.Child, result);
+                var result = container.InputHitTest(new Point(100, 100));
+
+                Assert.Equal(container.Child, result);
+            }
         }
 
         [Fact]
         public void InputHitTest_Should_Not_Find_Control_Outside_Point()
         {
-            var container = new Decorator
+            using (UnitTestApplication.Start(new TestServices(renderInterface: new MockRenderInterface())))
             {
-                Width = 200,
-                Height = 200,
-                Child = new Border
+                var container = new Decorator
                 {
-                    Width = 100,
-                    Height = 100,
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    VerticalAlignment = VerticalAlignment.Center
-                }
-            };
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
 
-            container.Measure(Size.Infinity);
-            container.Arrange(new Rect(container.DesiredSize));
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
 
-            var result = container.InputHitTest(new Point(10, 10));
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+                context.Render(container);
 
-            Assert.Equal(container, result);
+                var result = container.InputHitTest(new Point(10, 10));
+
+                Assert.Equal(container, result);
+            }
         }
 
         [Fact]
         public void InputHitTest_Should_Find_Top_Control_At_Point()
         {
-            var container = new Panel
+            using (UnitTestApplication.Start(new TestServices(renderInterface: new MockRenderInterface())))
             {
-                Width = 200,
-                Height = 200,
-                Children = new Controls.Controls
+                var container = new Panel
+                {
+                    Width = 200,
+                    Height = 200,
+                    Children = new Controls.Controls
                 {
                     new Border
                     {
@@ -81,24 +104,30 @@ namespace Avalonia.Input.UnitTests
                         VerticalAlignment = VerticalAlignment.Center
                     }
                 }
-            };
+                };
 
-            container.Measure(Size.Infinity);
-            container.Arrange(new Rect(container.DesiredSize));
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
 
-            var result = container.InputHitTest(new Point(100, 100));
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+                context.Render(container);
 
-            Assert.Equal(container.Children[1], result);
+                var result = container.InputHitTest(new Point(100, 100));
+
+                Assert.Equal(container.Children[1], result);
+            }
         }
 
         [Fact]
         public void InputHitTest_Should_Find_Top_Control_At_Point_With_ZOrder()
         {
-            var container = new Panel
+            using (UnitTestApplication.Start(new TestServices(renderInterface: new MockRenderInterface())))
             {
-                Width = 200,
-                Height = 200,
-                Children = new Controls.Controls
+                var container = new Panel
+                {
+                    Width = 200,
+                    Height = 200,
+                    Children = new Controls.Controls
                 {
                     new Border
                     {
@@ -116,14 +145,340 @@ namespace Avalonia.Input.UnitTests
                         VerticalAlignment = VerticalAlignment.Center
                     }
                 }
-            };
+                };
+
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+                context.Render(container);
+
+                var result = container.InputHitTest(new Point(100, 100));
+
+                Assert.Equal(container.Children[0], result);
+            }
+        }
+
+        [Fact]
+        public void InputHitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
+        {
+            using (UnitTestApplication.Start(new TestServices(renderInterface: new MockRenderInterface())))
+            {
+                Border target;
+                var container = new Panel
+                {
+                    Width = 200,
+                    Height = 200,
+                    ClipToBounds = false,
+                    Children = new Controls.Controls
+                    {
+                        new Border
+                        {
+                            Width = 100,
+                            Height = 100,
+                            ZIndex = 1,
+                            HorizontalAlignment = HorizontalAlignment.Left,
+                            VerticalAlignment = VerticalAlignment.Top,
+                            Child = target = new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Top,
+                                RenderTransform = new TranslateTransform(110, 110),
+                            }
+                        },
+                    }
+                };
 
-            container.Measure(Size.Infinity);
-            container.Arrange(new Rect(container.DesiredSize));
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
 
-            var result = container.InputHitTest(new Point(100, 100));
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+                context.Render(container);
 
-            Assert.Equal(container.Children[0], result);
+                var result = container.InputHitTest(new Point(120, 120));
+
+                Assert.Equal(target, result);
+            }
+        }
+
+        [Fact]
+        public void InputHitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
+        {
+            using (UnitTestApplication.Start(new TestServices(renderInterface: new MockRenderInterface())))
+            {
+                Border target;
+
+                var container = new Panel
+                {
+                    Width = 100,
+                    Height = 200,
+                    Children = new Controls.Controls
+                    {
+                        new Panel()
+                        {
+                            Width = 100,
+                            Height = 100,
+                            Margin = new Thickness(0, 100, 0, 0),
+                            ClipToBounds = true,
+                            Children = new Controls.Controls
+                            {
+                                (target = new Border()
+                                {
+                                    Width = 100,
+                                    Height = 100,
+                                    Margin = new Thickness(0, -100, 0, 0)
+                                })
+                            }
+                        }
+                    }
+                };
+
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+                context.Render(container);
+
+                var result = container.InputHitTest(new Point(50, 50));
+
+                Assert.NotEqual(target, result);
+                Assert.Equal(container, result);
+            }
+        }
+
+        [Fact]
+        public void InputHitTest_Should_Not_Find_Control_Outside_Scroll_ViewPort()
+        {
+            using (UnitTestApplication.Start(new TestServices(renderInterface: new MockRenderInterface())))
+            {
+                Border target;
+                Border item1;
+                Border item2;
+                ScrollContentPresenter scroll;
+
+                var container = new Panel
+                {
+                    Width = 100,
+                    Height = 200,
+                    Children = new Controls.Controls
+                    {
+                        (target = new Border()
+                        {
+                            Width = 100,
+                            Height = 100
+                        }),
+                        new Border()
+                        {
+                            Width = 100,
+                            Height = 100,
+                            Margin = new Thickness(0, 100, 0, 0),
+                            Child = scroll = new ScrollContentPresenter()
+                            {
+                                Content = new StackPanel()
+                                {
+                                    Children = new Controls.Controls
+                                    {
+                                        (item1 = new Border()
+                                        {
+                                            Width = 100,
+                                            Height = 100,
+                                        }),
+                                        (item2 = new Border()
+                                        {
+                                            Width = 100,
+                                            Height = 100,
+                                        }),
+                                    }
+                                }
+                            }
+                        }
+                    }
+                };
+
+                scroll.UpdateChild();
+
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+                context.Render(container);
+
+                var result = container.InputHitTest(new Point(50, 150));
+
+                Assert.Equal(item1, result);
+
+                result = container.InputHitTest(new Point(50, 50));
+
+                Assert.Equal(target, result);
+
+                scroll.Offset = new Vector(0, 100);
+
+                //we don't have setup LayoutManager so we will make it manually
+                scroll.Parent.InvalidateArrange();
+                container.InvalidateArrange();
+
+                container.Arrange(new Rect(container.DesiredSize));
+                context.Render(container);
+
+                result = container.InputHitTest(new Point(50, 150));
+
+                Assert.Equal(item2, result);
+
+                result = container.InputHitTest(new Point(50, 50));
+
+                Assert.NotEqual(item1, result);
+                Assert.Equal(target, result);
+            }
+        }
+
+        class MockRenderInterface : IPlatformRenderInterface
+        {
+            public IFormattedTextImpl CreateFormattedText(string text, string fontFamilyName, double fontSize, FontStyle fontStyle, TextAlignment textAlignment, FontWeight fontWeight, TextWrapping wrapping)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IRenderTarget CreateRenderer(IPlatformHandle handle)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IRenderTargetBitmapImpl CreateRenderTargetBitmap(int width, int height)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IStreamGeometryImpl CreateStreamGeometry()
+            {
+                return new MockStreamGeometry();
+            }
+
+            public IBitmapImpl LoadBitmap(Stream stream)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IBitmapImpl LoadBitmap(string fileName)
+            {
+                throw new NotImplementedException();
+            }
+
+            class MockStreamGeometry : Avalonia.Platform.IStreamGeometryImpl
+            {
+                private MockStreamGeometryContext _impl = new MockStreamGeometryContext();
+                public Rect Bounds
+                {
+                    get
+                    {
+                        throw new NotImplementedException();
+                    }
+                }
+
+                public Matrix Transform
+                {
+                    get
+                    {
+                        throw new NotImplementedException();
+                    }
+
+                    set
+                    {
+                        throw new NotImplementedException();
+                    }
+                }
+
+                public IStreamGeometryImpl Clone()
+                {
+                    return this;
+                }
+
+                public bool FillContains(Point point)
+                {
+                    return _impl.FillContains(point);
+                }
+
+                public Rect GetRenderBounds(double strokeThickness)
+                {
+                    throw new NotImplementedException();
+                }
+
+                public IStreamGeometryContextImpl Open()
+                {
+                    return _impl;
+                }
+
+                class MockStreamGeometryContext : IStreamGeometryContextImpl
+                {
+                    private List<Point> points = new List<Point>();
+                    public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+                    {
+                        throw new NotImplementedException();
+                    }
+
+                    public void BeginFigure(Point startPoint, bool isFilled)
+                    {
+                        points.Add(startPoint);
+                    }
+
+                    public void CubicBezierTo(Point point1, Point point2, Point point3)
+                    {
+                        throw new NotImplementedException();
+                    }
+
+                    public void Dispose()
+                    {
+                    }
+
+                    public void EndFigure(bool isClosed)
+                    {
+                    }
+
+                    public void LineTo(Point point)
+                    {
+                        points.Add(point);
+                    }
+
+                    public void QuadraticBezierTo(Point control, Point endPoint)
+                    {
+                        throw new NotImplementedException();
+                    }
+
+                    public void SetFillRule(FillRule fillRule)
+                    {
+                    }
+
+                    public bool FillContains(Point point)
+                    {
+                        // Use the algorithm from http://www.blackpawn.com/texts/pointinpoly/default.html
+                        // to determine if the point is in the geometry (since it will always be convex in this situation)
+                        for (int i = 0; i < points.Count; i++)
+                        {
+                            var a = points[i];
+                            var b = points[(i + 1) % points.Count];
+                            var c = points[(i + 2) % points.Count];
+
+                            Vector v0 = c - a;
+                            Vector v1 = b - a;
+                            Vector v2 = point - a;
+
+                            var dot00 = v0 * v0;
+                            var dot01 = v0 * v1;
+                            var dot02 = v0 * v2;
+                            var dot11 = v1 * v1;
+                            var dot12 = v1 * v2;
+
+
+                            var invDenom = 1 / (dot00 * dot11 - dot01 * dot01);
+                            var u = (dot11 * dot02 - dot01 * dot12) * invDenom;
+                            var v = (dot00 * dot12 - dot01 * dot02) * invDenom;
+                            if ((u >= 0) && (v >= 0) && (u + v < 1)) return true;
+                        }
+                        return false;
+                    }
+                }
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs
index c41162ffed..dddb120f26 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -83,7 +83,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -113,7 +113,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -158,7 +158,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -177,7 +177,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(top, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -224,7 +224,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -262,7 +262,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -300,7 +300,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -339,7 +339,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -378,7 +378,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Null(result);
         }
@@ -416,7 +416,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Null(result);
         }
@@ -455,7 +455,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -494,7 +494,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -525,7 +525,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -570,7 +570,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -615,7 +615,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -635,7 +635,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(top, result);
         }
@@ -674,7 +674,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -713,7 +713,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -752,7 +752,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -790,7 +790,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Null(result);
         }
@@ -813,7 +813,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Null(result);
         }
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
index cc77dba1fc..efc9abedbb 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -79,7 +79,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -123,7 +123,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -152,7 +152,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -195,7 +195,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -213,7 +213,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(top, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -256,7 +256,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -294,7 +294,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -332,7 +332,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -370,7 +370,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -408,7 +408,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Null(result);
         }
@@ -446,7 +446,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -486,7 +486,7 @@ namespace Avalonia.Input.UnitTests
 
             KeyboardNavigation.SetTabOnceActiveElement(container, next);
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -524,7 +524,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -564,7 +564,7 @@ namespace Avalonia.Input.UnitTests
 
             KeyboardNavigation.SetTabOnceActiveElement(container, next);
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -601,7 +601,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -638,7 +638,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -667,7 +667,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -710,7 +710,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -753,7 +753,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -772,7 +772,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(top, result);
         }
@@ -810,7 +810,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -848,7 +848,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -886,7 +886,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -924,7 +924,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Null(result);
         }
@@ -962,7 +962,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -1002,7 +1002,7 @@ namespace Avalonia.Input.UnitTests
 
             KeyboardNavigation.SetTabOnceActiveElement(container, next);
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -1040,7 +1040,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -1063,7 +1063,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Null(result);
         }
diff --git a/tests/Avalonia.Input.UnitTests/packages.config b/tests/Avalonia.Input.UnitTests/packages.config
index dcbf45edf0..5095468c35 100644
--- a/tests/Avalonia.Input.UnitTests/packages.config
+++ b/tests/Avalonia.Input.UnitTests/packages.config
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
   <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
diff --git a/tests/Avalonia.Layout.UnitTests/MeasureTests.cs b/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
index 71a38c14db..b5a3539da9 100644
--- a/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
@@ -44,6 +44,23 @@ namespace Avalonia.Layout.UnitTests
             Assert.Equal(new Size(0, 0), panel.DesiredSize);
         }
 
+        [Fact]
+        public void Removing_From_Parent_Should_Invalidate_Measure_Of_Control_And_Descendents()
+        {
+            var panel = new StackPanel();
+            var child2 = new Border();
+            var child1 = new Border { Child = child2 };
+            panel.Children.Add(child1);
+
+            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            Assert.True(child1.IsMeasureValid);
+            Assert.True(child2.IsMeasureValid);
+
+            panel.Children.Remove(child1);
+            Assert.False(child1.IsMeasureValid);
+            Assert.False(child2.IsMeasureValid);
+        }
+
         [Fact]
         public void Negative_Margin_Larger_Than_Constraint_Should_Request_Width_0()
         {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionSubjectTests.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionSubjectTests.cs
index 9ee32149e0..0b6a507274 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionSubjectTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionSubjectTests.cs
@@ -9,6 +9,7 @@ using Moq;
 using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Xunit;
+using System.Threading;
 
 namespace Avalonia.Markup.UnitTests.Data
 {
@@ -38,7 +39,7 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public async void Should_Convert_Get_String_To_Double()
         {
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
             var data = new Class1 { StringValue = "5.6" };
             var target = new ExpressionSubject(new ExpressionObserver(data, "StringValue"), typeof(double));
@@ -70,7 +71,7 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Convert_Set_String_To_Double()
         {
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
             var data = new Class1 { StringValue = (5.6).ToString() };
             var target = new ExpressionSubject(new ExpressionObserver(data, "StringValue"), typeof(double));
@@ -83,7 +84,7 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public async void Should_Convert_Get_Double_To_String()
         {
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
             var data = new Class1 { DoubleValue = 5.6 };
             var target = new ExpressionSubject(new ExpressionObserver(data, "DoubleValue"), typeof(string));
@@ -95,7 +96,7 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Convert_Set_Double_To_String()
         {
-            CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
             var data = new Class1 { DoubleValue = 5.6 };
             var target = new ExpressionSubject(new ExpressionObserver(data, "DoubleValue"), typeof(string));
@@ -123,8 +124,8 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new ExpressionSubject(
                 new ExpressionObserver(data, "DoubleValue"),
                 typeof(string),
-                DefaultValueConverter.Instance,
-                fallbackValue: "9.8");
+                "9.8",
+                DefaultValueConverter.Instance);
 
             target.OnNext("foo");
 
@@ -162,7 +163,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 new ExpressionObserver(data, "DoubleValue"),
                 typeof(string),
                 converter.Object,
-                "foo");
+                converterParameter: "foo");
 
             target.Subscribe(_ => { });
 
@@ -178,7 +179,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 new ExpressionObserver(data, "DoubleValue"), 
                 typeof(string),
                 converter.Object,
-                "foo");
+                converterParameter: "foo");
 
             target.OnNext("bar");
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index ca65b763f5..1174b4ceb5 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -1,11 +1,13 @@
 // 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 Moq;
+using System;
+using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Data;
+using Moq;
 using ReactiveUI;
 using Xunit;
 
@@ -159,6 +161,26 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             Assert.Equal("foo", child.DataContext);
         }
 
+        [Fact]
+        public void DataContext_Binding_Should_Produce_Correct_Results()
+        {
+            var root = new Decorator
+            {
+                DataContext = new { Foo = "bar" },
+            };
+
+            var child = new Control();
+            var dataContextBinding = new Binding("Foo");
+            var values = new List<object>();
+
+            child.GetObservable(Border.DataContextProperty).Subscribe(x => values.Add(x));
+            child.Bind(ContentControl.DataContextProperty, dataContextBinding);
+
+            root.Child = child;
+
+            Assert.Equal(new[] { null, "bar" }, values);
+        }
+
         [Fact]
         public void Should_Use_DefaultValueConverter_When_No_Converter_Specified()
         {
@@ -337,5 +359,17 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
                 Bind(BarProperty, this.GetObservable(FooProperty));
             }
         }
+
+        private class InheritanceTest : Decorator
+        {
+            public static readonly StyledProperty<int> BazProperty =
+                AvaloniaProperty.Register<InheritanceTest, int>("Baz", defaultValue: 6, inherits: true);
+
+            public int Baz
+            {
+                get { return GetValue(BazProperty); }
+                set { SetValue(BazProperty, value); }
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
index 4903ca7b35..7082863c0d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
@@ -157,6 +157,23 @@ namespace Avalonia.Markup.Xaml.UnitTests.Templates
             Assert.Equal(1, selector.Select(data));
         }
 
+        [Fact]
+        public void Should_Support_Change_Of_Target_Value()
+        {
+            var selector = new MemberSelector() { MemberName = "StringValue" };
+
+            var data = new Item()
+            {
+                StringValue = "Value1"
+            };
+
+            Assert.Same("Value1", selector.Select(data));
+
+            data.StringValue = "Value2";
+
+            Assert.Same("Value2", selector.Select(data));
+        }
+
         private class Item
         {
             public Item Child { get; set; }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
index e4f95dfe99..b0451c951f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
@@ -224,5 +224,35 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(0xffff0000, borderBrush.Color.ToUint32());
             }
         }
+
+        [Fact]
+        public void Setter_Can_Contain_Template()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='ContentControl'>
+            <Setter Property='Content'>
+                <Template>
+                    <TextBlock>Hello World!</TextBlock>
+                </Template>
+            </Setter>
+        </Style>
+    </Window.Styles>
+
+    <ContentControl Name='target'/>    
+</Window>";
+
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var target = window.Find<ContentControl>("target");
+
+                Assert.IsType<TextBlock>(target.Content);
+                Assert.Equal("Hello World!", ((TextBlock)target.Content).Text);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj
index e9937dc566..a9b5c40a17 100644
--- a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj
+++ b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
@@ -43,6 +43,22 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
@@ -68,21 +84,6 @@
     </When>
     <Otherwise />
   </Choose>
-  <ItemGroup>
-    <Compile Include="Controls\ImageTests.cs" />
-    <Compile Include="Controls\BorderTests.cs" />
-    <Compile Include="Media\ImageBrushTests.cs" />
-    <Compile Include="Media\LinearGradientBrushTests.cs" />
-    <Compile Include="Media\VisualBrushTests.cs" />
-    <Compile Include="Shapes\LineTests.cs" />
-    <Compile Include="Shapes\PathTests.cs" />
-    <Compile Include="Shapes\EllipseTests.cs" />
-    <Compile Include="Shapes\PolygonTests.cs" />
-    <Compile Include="Shapes\PolylineTests.cs" />
-    <Compile Include="Shapes\RectangleTests.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Gtk\Avalonia.Cairo\Avalonia.Cairo.csproj">
       <Project>{FB05AC90-89BA-4F2F-A924-F37875FB547C}</Project>
@@ -128,6 +129,7 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index fbc639e335..b81ff06e87 100644
--- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -72,22 +72,6 @@
     </When>
     <Otherwise />
   </Choose>
-  <ItemGroup>
-    <Compile Include="Controls\TextBlockTests.cs" />
-    <Compile Include="Media\ImageBrushTests.cs" />
-    <Compile Include="Media\VisualBrushTests.cs" />
-    <Compile Include="Controls\ImageTests.cs" />
-    <Compile Include="Controls\BorderTests.cs" />
-    <Compile Include="Media\LinearGradientBrushTests.cs" />
-    <Compile Include="Shapes\LineTests.cs" />
-    <Compile Include="Shapes\PathTests.cs" />
-    <Compile Include="Shapes\EllipseTests.cs" />
-    <Compile Include="Shapes\PolygonTests.cs" />
-    <Compile Include="Shapes\PolylineTests.cs" />
-    <Compile Include="Shapes\RectangleTests.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
       <Project>{D211E587-D8BC-45B9-95A4-F297C8FA5200}</Project>
@@ -133,6 +117,7 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems b/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
new file mode 100644
index 0000000000..ad3b182bdf
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>48840edd-24bf-495d-911e-2eb12ae75d3b</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Avalonia.RenderTests</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)GeometryClippingTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)OpacityMaskTests.cs" />
+    <Compile Include="Media\FormattedTextImplTests.cs" />
+    <Compile Include="Controls\ImageTests.cs" />
+    <Compile Include="Controls\BorderTests.cs" />
+    <Compile Include="Media\ImageBrushTests.cs" />
+    <Compile Include="Media\LinearGradientBrushTests.cs" />
+    <Compile Include="Media\VisualBrushTests.cs" />
+    <Compile Include="Shapes\LineTests.cs" />
+    <Compile Include="Shapes\PathTests.cs" />
+    <Compile Include="Shapes\EllipseTests.cs" />
+    <Compile Include="Shapes\PolygonTests.cs" />
+    <Compile Include="Shapes\PolylineTests.cs" />
+    <Compile Include="Shapes\RectangleTests.cs" />
+    <Compile Include="TestBase.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/Avalonia.RenderTests.shproj b/tests/Avalonia.RenderTests/Avalonia.RenderTests.shproj
new file mode 100644
index 0000000000..e3bed80491
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Avalonia.RenderTests.shproj
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>48840edd-24bf-495d-911e-2eb12ae75d3b</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj
index c649d58139..579e84874c 100644
--- a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -68,20 +68,6 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Controls\BorderTests.cs" />
-    <Compile Include="Controls\ImageTests.cs" />
-    <Compile Include="Media\ImageBrushTests.cs" />
-    <Compile Include="Media\LinearGradientBrushTests.cs" />
-    <Compile Include="Media\VisualBrushTests.cs" />
-    <Compile Include="Shapes\EllipseTests.cs" />
-    <Compile Include="Shapes\LineTests.cs" />
-    <Compile Include="Shapes\PathTests.cs" />
-    <Compile Include="Shapes\PolygonTests.cs" />
-    <Compile Include="Shapes\PolylineTests.cs" />
-    <Compile Include="Shapes\RectangleTests.cs" />
-    <Compile Include="TestBase.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
@@ -126,6 +112,7 @@
   <ItemGroup>
     <None Include="packages.Avalonia.Skia.RenderTests.config" />
   </ItemGroup>
+  <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/tests/Avalonia.RenderTests/GeometryClippingTests.cs b/tests/Avalonia.RenderTests/GeometryClippingTests.cs
new file mode 100644
index 0000000000..355606bb43
--- /dev/null
+++ b/tests/Avalonia.RenderTests/GeometryClippingTests.cs
@@ -0,0 +1,51 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+#if AVALONIA_CAIRO
+namespace Avalonia.Cairo.RenderTests
+#elif AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests
+#endif
+{
+    public class GeometryClippingTests : TestBase
+    {
+        public GeometryClippingTests()
+            :base("GeometryClipping")
+        {
+        }
+
+        [Fact]
+        public void Geometry_Clip_Clips_Path()
+        {
+            var target = new Canvas
+            {
+                Clip = StreamGeometry.Parse("F1 M 0,0  H 76 V 76 Z"),
+                Width = 76,
+                Height = 76,
+                Children = new Avalonia.Controls.Controls
+                {
+                    new Path
+                    {
+                        Width = 32,
+                        Height = 40,
+                        [Canvas.LeftProperty] = 23,
+                        [Canvas.TopProperty] = 18,
+                        Stretch = Stretch.Fill,
+                        Fill = Brushes.Black,
+                        Data = StreamGeometry.Parse("F1 M 27,18L 23,26L 33,30L 24,38L 33,46L 23,50L 27,58L 45,58L 55,38L 45,18L 27,18 Z")
+                    }
+                }
+            };
+
+            RenderToFile(target);
+            CompareImages();
+        }
+    }
+}
diff --git a/tests/Avalonia.RenderTests/Media/FormattedTextImplTests.cs b/tests/Avalonia.RenderTests/Media/FormattedTextImplTests.cs
new file mode 100644
index 0000000000..395e6f8fd8
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/FormattedTextImplTests.cs
@@ -0,0 +1,321 @@
+// 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.Platform;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+#if AVALONIA_CAIRO
+namespace Avalonia.Cairo.RenderTests.Media
+#elif AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+
+using Avalonia.Direct2D1.RenderTests;
+
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class FormattedTextImplTests : TestBase
+    {
+        private const string FontName = "Courier New";
+        private const double FontSize = 12;
+        private const double MediumFontSize = 18;
+        private const double BigFontSize = 32;
+        private const double FontSizeHeight = 13.594;//real value 13.59375
+        private const string stringword = "word";
+        private const string stringmiddle = "The quick brown fox jumps over the lazy dog";
+        private const string stringmiddle2lines = "The quick brown fox\njumps over the lazy dog";
+        private const string stringmiddle3lines = "01234567\n\n0123456789";
+        private const string stringmiddlenewlines = "012345678\r 1234567\r\n 12345678\n0123456789";
+
+        private const string stringlong =
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis " +
+"aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero" +
+" at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus " +
+"pretium ornare est.";
+
+        public FormattedTextImplTests()
+            : base(@"Media\FormattedText")
+        {
+        }
+
+        private IFormattedTextImpl Create(string text,
+            string fontFamily,
+            double fontSize,
+            FontStyle fontStyle,
+            TextAlignment textAlignment,
+            FontWeight fontWeight,
+            TextWrapping wrapping)
+        {
+            var r = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            return r.CreateFormattedText(text,
+                fontFamily,
+                fontSize,
+                fontStyle,
+                textAlignment,
+                fontWeight,
+                wrapping);
+        }
+
+        private IFormattedTextImpl Create(string text, double fontSize)
+        {
+            return Create(text, FontName, fontSize,
+                FontStyle.Normal, TextAlignment.Left,
+                FontWeight.Normal, TextWrapping.NoWrap);
+        }
+
+        private IFormattedTextImpl Create(string text, double fontSize, TextAlignment alignment)
+        {
+            return Create(text, FontName, fontSize,
+                FontStyle.Normal, alignment,
+                FontWeight.Normal, TextWrapping.NoWrap);
+        }
+
+        private IFormattedTextImpl Create(string text, double fontSize, TextWrapping wrap)
+        {
+            return Create(text, FontName, fontSize,
+                FontStyle.Normal, TextAlignment.Left,
+                FontWeight.Normal, wrap);
+        }
+
+#if AVALONIA_CAIRO
+        [Theory(Skip = "TODO: Font scaling currently broken on cairo")]
+#else
+        [Theory]
+#endif
+        [InlineData("", FontSize, 0, FontSizeHeight)]
+        [InlineData("x", FontSize, 7.20, FontSizeHeight)]
+        [InlineData(stringword, FontSize, 28.80, FontSizeHeight)]
+        [InlineData(stringmiddle, FontSize, 309.65, FontSizeHeight)]
+        [InlineData(stringmiddle, MediumFontSize, 464.48, 20.391)]
+        [InlineData(stringmiddle, BigFontSize, 825.73, 36.25)]
+        [InlineData(stringmiddle2lines, FontSize, 165.63, 2 * FontSizeHeight)]
+        [InlineData(stringmiddle2lines, MediumFontSize, 248.44, 2 * 20.391)]
+        [InlineData(stringmiddle2lines, BigFontSize, 441.67, 2 * 36.25)]
+        [InlineData(stringlong, FontSize, 2160.35, FontSizeHeight)]
+        [InlineData(stringmiddlenewlines, FontSize, 72.01, 4 * FontSizeHeight)]
+        public void Should_Measure_String_Correctly(string input, double fontSize, double expWidth, double expHeight)
+        {
+#if !AVALONIA_SKIA
+            double heightCorr = 0;
+#else
+            //In skia there is a small descent added to last line,
+            //otherwise some letters are clipped at bottom
+            //4.55273438 for font 12 size
+            double heightCorr = 0.3793945*fontSize;
+#endif
+            using (var fmt = Create(input, fontSize))
+            {
+                var size = fmt.Measure();
+
+                Assert.Equal(expWidth, size.Width, 2);
+                Assert.Equal(expHeight + heightCorr, size.Height, 2);
+
+                var linesHeight = fmt.GetLines().Sum(l => l.Height);
+
+                Assert.Equal(expHeight, linesHeight, 2);
+            }
+        }
+
+#if AVALONIA_CAIRO
+        [Theory(Skip = "TODO: Font scaling currently broken on cairo")]
+#else
+        [Theory]
+#endif
+        [InlineData("", 1, -1, TextWrapping.NoWrap)]
+        [InlineData("x", 1, -1, TextWrapping.NoWrap)]
+        [InlineData(stringword, 1, -1, TextWrapping.NoWrap)]
+        [InlineData(stringmiddle, 1, -1, TextWrapping.NoWrap)]
+        [InlineData(stringmiddle, 3, 150, TextWrapping.Wrap)]
+        [InlineData(stringmiddle2lines, 2, -1, TextWrapping.NoWrap)]
+        [InlineData(stringmiddle2lines, 3, 150, TextWrapping.Wrap)]
+        [InlineData(stringlong, 1, -1, TextWrapping.NoWrap)]
+        [InlineData(stringlong, 18, 150, TextWrapping.Wrap)]
+        [InlineData(stringmiddlenewlines, 4, -1, TextWrapping.NoWrap)]
+        [InlineData(stringmiddlenewlines, 4, 150, TextWrapping.Wrap)]
+        public void Should_Break_Lines_String_Correctly(string input,
+                                                            int linesCount,
+                                                            double widthConstraint,
+                                                            TextWrapping wrap)
+        {
+            using (var fmt = Create(input, FontSize, wrap))
+            {
+                if (widthConstraint != -1)
+                {
+                    fmt.Constraint = new Size(widthConstraint, 10000);
+                }
+
+                var lines = fmt.GetLines().ToArray();
+                Assert.Equal(linesCount, lines.Count());
+            }
+        }
+
+#if AVALONIA_CAIRO
+        [Theory(Skip = "TODO: Font scaling currently broken on cairo")]
+#else
+        [Theory]
+#endif
+        [InlineData("x", 0, 0, true, false, 0)]
+        [InlineData(stringword, -1, -1, false, false, 0)]
+        [InlineData(stringword, 25, 13, true, false, 3)]
+        [InlineData(stringword, 28.70, 13.5, true, true, 3)]
+        [InlineData(stringword, 30, 13, false, true, 3)]
+        [InlineData(stringword + "\r\n", 30, 13, false, false, 4)]
+        [InlineData(stringword + "\r\nnext", 30, 13, false, false, 4)]
+        [InlineData(stringword, 300, 13, false, true, 3)]
+        [InlineData(stringword + "\r\n", 300, 13, false, false, 4)]
+        [InlineData(stringword + "\r\nnext", 300, 13, false, false, 4)]
+        [InlineData(stringword, 300, 300, false, true, 3)]
+        //TODO: Direct2D implementation return textposition 6
+        //but the text is 6 length, can't find the logic for me it should be 5
+        //[InlineData(stringword + "\r\n", 300, 300, false, false, 6)]
+        [InlineData(stringword + "\r\nnext", 300, 300, false, true, 9)]
+        [InlineData(stringword + "\r\nnext", 300, 25, false, true, 9)]
+        [InlineData(stringword, 28, 15, false, true, 3)]
+        [InlineData(stringword, 30, 15, false, true, 3)]
+        [InlineData(stringmiddle3lines, 30, 15, false, false, 9)]
+        [InlineData(stringmiddle3lines, 500, 13, false, false, 8)]
+        [InlineData(stringmiddle3lines, 30, 25, false, false, 9)]
+        [InlineData(stringmiddle3lines, -1, 30, false, false, 10)]
+        public void Should_HitTestPoint_Correctly(string input,
+                                    double x, double y,
+                                    bool isInside, bool isTrailing, int pos)
+        {
+            using (var fmt = Create(input, FontSize))
+            {
+                var htRes = fmt.HitTestPoint(new Point(x, y));
+
+                Assert.Equal(pos, htRes.TextPosition);
+                Assert.Equal(isInside, htRes.IsInside);
+                Assert.Equal(isTrailing, htRes.IsTrailing);
+            }
+        }
+
+#if AVALONIA_CAIRO
+        [Theory(Skip = "TODO: Font scaling currently broken on cairo")]
+#else
+        [Theory]
+#endif
+        [InlineData("", 0, 0, 0, 0, FontSizeHeight)]
+        [InlineData("x", 0, 0, 0, 7.20, FontSizeHeight)]
+        [InlineData("x", -1, 7.20, 0, 0, FontSizeHeight)]
+        [InlineData(stringword, 3, 21.60, 0, 7.20, FontSizeHeight)]
+        [InlineData(stringword, 4, 21.60 + 7.20, 0, 0, FontSizeHeight)]
+        [InlineData(stringmiddlenewlines, 10, 0, FontSizeHeight, 7.20, FontSizeHeight)]
+        [InlineData(stringmiddlenewlines, 15, 36.01, FontSizeHeight, 7.20, FontSizeHeight)]
+        [InlineData(stringmiddlenewlines, 20, 0, 2 * FontSizeHeight, 7.20, FontSizeHeight)]
+        [InlineData(stringmiddlenewlines, -1, 72.01, 3 * FontSizeHeight, 0, FontSizeHeight)]
+        public void Should_HitTestPosition_Correctly(string input,
+                    int index, double x, double y, double width, double height)
+        {
+            using (var fmt = Create(input, FontSize))
+            {
+                var r = fmt.HitTestTextPosition(index);
+
+                Assert.Equal(x, r.X, 2);
+                Assert.Equal(y, r.Y, 2);
+                Assert.Equal(width, r.Width, 2);
+                Assert.Equal(height, r.Height, 2);
+            }
+        }
+
+#if AVALONIA_CAIRO
+        [Theory(Skip = "TODO: Font scaling currently broken on cairo")]
+#else
+        [Theory]
+#endif
+        [InlineData("x", 0, 200, 200 - 7.20, 0, 7.20, FontSizeHeight)]
+        [InlineData(stringword, 0, 200, 171.20, 0, 7.20, FontSizeHeight)]
+        [InlineData(stringword, 3, 200, 200 - 7.20, 0, 7.20, FontSizeHeight)]
+        public void Should_HitTestPosition_RigthAlign_Correctly(
+                                                    string input, int index, double widthConstraint,
+                                                    double x, double y, double width, double height)
+        {
+            //parse expected
+            using (var fmt = Create(input, FontSize, TextAlignment.Right))
+            {
+                fmt.Constraint = new Size(widthConstraint, 100);
+
+                var r = fmt.HitTestTextPosition(index);
+
+                Assert.Equal(x, r.X, 2);
+                Assert.Equal(y, r.Y, 2);
+                Assert.Equal(width, r.Width, 2);
+                Assert.Equal(height, r.Height, 2);
+            }
+        }
+
+#if AVALONIA_CAIRO
+        [Theory(Skip = "TODO: Font scaling currently broken on cairo")]
+#else
+        [Theory]
+#endif
+        [InlineData("x", 0, 200, 100 - 7.20 / 2, 0, 7.20, FontSizeHeight)]
+        [InlineData(stringword, 0, 200, 85.6, 0, 7.20, FontSizeHeight)]
+        [InlineData(stringword, 3, 200, 100 + 7.20, 0, 7.20, FontSizeHeight)]
+        public void Should_HitTestPosition_CenterAlign_Correctly(
+                                                    string input, int index, double widthConstraint,
+                                                    double x, double y, double width, double height)
+        {
+            //parse expected
+            using (var fmt = Create(input, FontSize, TextAlignment.Center))
+            {
+                fmt.Constraint = new Size(widthConstraint, 100);
+
+                var r = fmt.HitTestTextPosition(index);
+
+                Assert.Equal(x, r.X, 2);
+                Assert.Equal(y, r.Y, 2);
+                Assert.Equal(width, r.Width, 2);
+                Assert.Equal(height, r.Height, 2);
+            }
+        }
+
+#if AVALONIA_CAIRO
+        [Theory(Skip = "TODO: Font scaling currently broken on cairo")]
+#else
+        [Theory]
+#endif
+        [InlineData("x", 0, 1, "0,0,7.20,13.59")]
+        [InlineData(stringword, 0, 4, "0,0,28.80,13.59")]
+        [InlineData(stringmiddlenewlines, 10, 10, "0,13.59,57.61,13.59")]
+        [InlineData(stringmiddlenewlines, 10, 20, "0,13.59,57.61,13.59;0,27.19,64.81,13.59")]
+        [InlineData(stringmiddlenewlines, 10, 15, "0,13.59,57.61,13.59;0,27.19,36.01,13.59")]
+        [InlineData(stringmiddlenewlines, 15, 15, "36.01,13.59,21.60,13.59;0,27.19,64.81,13.59")]
+        public void Should_HitTestRange_Correctly(string input,
+                            int index, int length,
+                            string expectedRects)
+        {
+            //parse expected result
+            var rects = expectedRects.Split(';').Select(s =>
+            {
+                double[] v = s.Split(',')
+                .Select(sd => double.Parse(sd, CultureInfo.InvariantCulture)).ToArray();
+                return new Rect(v[0], v[1], v[2], v[3]);
+            }).ToArray();
+
+            using (var fmt = Create(input, FontSize))
+            {
+                var htRes = fmt.HitTestTextRange(index, length).ToArray();
+
+                Assert.Equal(rects.Length, htRes.Length);
+
+                for (int i = 0; i < rects.Length; i++)
+                {
+                    var exr = rects[i];
+                    var r = htRes[i];
+
+                    Assert.Equal(exr.X, r.X, 2);
+                    Assert.Equal(exr.Y, r.Y, 2);
+                    Assert.Equal(exr.Width, r.Width, 2);
+                    Assert.Equal(exr.Height, r.Height, 2);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/OpacityMaskTests.cs b/tests/Avalonia.RenderTests/OpacityMaskTests.cs
new file mode 100644
index 0000000000..b23f231f2e
--- /dev/null
+++ b/tests/Avalonia.RenderTests/OpacityMaskTests.cs
@@ -0,0 +1,60 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+#if AVALONIA_CAIRO
+namespace Avalonia.Cairo.RenderTests
+#elif AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests
+#endif
+{
+    public class OpacityMaskTests : TestBase
+    {
+        public OpacityMaskTests()
+            : base("OpacityMask")
+        {
+        }
+
+        [Fact]
+        public void Opacity_Mask_Masks_Element()
+        {
+            var target = new Canvas
+            {
+                OpacityMask = new LinearGradientBrush
+                {
+                    StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+                    EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+                    GradientStops = new List<GradientStop>
+                    {
+                        new GradientStop(Color.FromUInt32(0xffffffff), 0),
+                        new GradientStop(Color.FromUInt32(0x00ffffff), 1)
+                    }
+                },
+                Width = 76,
+                Height = 76,
+                Children = new Avalonia.Controls.Controls
+                {
+                    new Path
+                    {
+                        Width = 32,
+                        Height = 40,
+                        [Canvas.LeftProperty] = 23,
+                        [Canvas.TopProperty] = 18,
+                        Stretch = Stretch.Fill,
+                        Fill = Brushes.Red,
+                        Data = StreamGeometry.Parse("F1 M 27,18L 23,26L 33,30L 24,38L 33,46L 23,50L 27,58L 45,58L 55,38L 45,18L 27,18 Z")
+                    }
+                }
+            };
+
+            RenderToFile(target);
+            CompareImages();
+        }
+    }
+}
diff --git a/tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config b/tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config
index 07a670d200..c8811ef05d 100644
--- a/tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config
+++ b/tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0101" targetFramework="net45" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
   <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
diff --git a/tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.csproj b/tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.csproj
index 46eae92c4d..baf4959fe7 100644
--- a/tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.csproj
+++ b/tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
@@ -81,6 +81,7 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
+    <Compile Include="Media\PathMarkupParserTests.cs" />
     <Compile Include="RelativeRectComparer.cs" />
     <Compile Include="RelativeRectTests.cs" />
     <Compile Include="ThicknessTests.cs" />
@@ -127,6 +128,10 @@
       <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
       <Name>Avalonia.Styling</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj">
+      <Project>{88060192-33D5-4932-B0F9-8BD2763E857D}</Project>
+      <Name>Avalonia.UnitTests</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs
new file mode 100644
index 0000000000..cb8fccb7a1
--- /dev/null
+++ b/tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs
@@ -0,0 +1,99 @@
+// 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.Platform;
+using Moq;
+using Xunit;
+
+namespace Avalonia.SceneGraph.UnitTests.Media
+{
+    public class PathMarkupParserTests
+    {
+        [Fact]
+        public void Parses_Move()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var result = new Mock<IStreamGeometryContextImpl>();
+
+                var parser = PrepareParser(result);
+
+                parser.Parse("M10 10");
+
+                result.Verify(x => x.BeginFigure(new Point(10, 10), true));
+            }
+        }
+
+        [Fact]
+        public void Parses_Line()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var result = new Mock<IStreamGeometryContextImpl>();
+
+                var parser = PrepareParser(result);
+
+                parser.Parse("M0 0L10 10");
+
+                result.Verify(x => x.LineTo(new Point(10, 10)));
+            }
+        }
+
+        [Fact]
+        public void Parses_Close()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var result = new Mock<IStreamGeometryContextImpl>();
+
+                var parser = PrepareParser(result);
+
+                parser.Parse("M0 0L10 10z");
+
+                result.Verify(x => x.EndFigure(true));
+            }
+        }
+
+        [Theory]
+        [InlineData("M0 0L10 10z")]
+        [InlineData("M50 50 L100 100 L150 50")]
+        [InlineData("M50 50L100 100L150 50")]
+        [InlineData("M50,50 L100,100 L150,50")]
+        [InlineData("M50 50 L-10 -10 L10 50")]
+        [InlineData("M50 50L-10-10L10 50")]
+        [InlineData("M50 50 L100 100 L150 50zM50 50 L70 70 L120 50z")]
+        [InlineData("M 50 50 L 100 100 L 150 50")]
+        [InlineData("M50 50 L100 100 L150 50 H200 V100Z")]
+        [InlineData("M 80 200 A 100 50 45 1 0 100 50")]
+        [InlineData(
+            "F1 M 16.6309 18.6563C 17.1309 8.15625 29.8809 14.1563 29.8809 14.1563C 30.8809 11.1563 34.1308 11.4063" +
+            " 34.1308 11.4063C 33.5 12 34.6309 13.1563 34.6309 13.1563C 32.1309 13.1562 31.1309 14.9062 31.1309 14.9" +
+            "062C 41.1309 23.9062 32.6309 27.9063 32.6309 27.9062C 24.6309 24.9063 21.1309 22.1562 16.6309 18.6563 Z" +
+            " M 16.6309 19.9063C 21.6309 24.1563 25.1309 26.1562 31.6309 28.6562C 31.6309 28.6562 26.3809 39.1562 18" +
+            ".3809 36.1563C 18.3809 36.1563 18 38 16.3809 36.9063C 15 36 16.3809 34.9063 16.3809 34.9063C 16.3809 34" +
+            ".9063 10.1309 30.9062 16.6309 19.9063 Z ")]
+        public void Should_Parse(string pathData)
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var parser = PrepareParser();
+
+                parser.Parse(pathData);
+
+                Assert.True(true);
+            }
+        }
+
+        private static PathMarkupParser PrepareParser(Mock<IStreamGeometryContextImpl> implMock = null)
+        {
+            AvaloniaLocator.CurrentMutable
+                    .Bind<IPlatformRenderInterface>()
+                    .ToConstant(Mock.Of<IPlatformRenderInterface>());
+
+            return new PathMarkupParser(
+                new StreamGeometry(),
+                new StreamGeometryContext(implMock != null ? implMock.Object : Mock.Of<IStreamGeometryContextImpl>()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs b/tests/Avalonia.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs
index c4f3611f26..75eb9c3a50 100644
--- a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs
+++ b/tests/Avalonia.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs
@@ -8,7 +8,11 @@ using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
 using Avalonia.VisualTree;
+using Avalonia.Rendering;
 using Xunit;
+using Avalonia.Media;
+using Moq;
+using Avalonia.UnitTests;
 
 namespace Avalonia.SceneGraph.UnitTests.VisualTree
 {
@@ -17,36 +21,37 @@ namespace Avalonia.SceneGraph.UnitTests.VisualTree
         [Fact]
         public void Should_Track_Bounds()
         {
-            var target = new BoundsTracker();
-            var control = default(Rectangle);
-            var tree = new Decorator
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Padding = new Thickness(10),
-                Child = new Decorator
+                var target = new BoundsTracker();
+                var control = default(Rectangle);
+                var tree = new Decorator
                 {
-                    Padding = new Thickness(5),
-                    Child = control = new Rectangle
+                    Padding = new Thickness(10),
+                    Child = new Decorator
                     {
-                        Width = 15,
-                        Height = 15,
-                    },
-                }
-            };
+                        Padding = new Thickness(5),
+                        Child = control = new Rectangle
+                        {
+                            Width = 15,
+                            Height = 15,
+                        },
+                    }
+                };
 
-            tree.Measure(Size.Infinity);
-            tree.Arrange(new Rect(0, 0, 100, 100));
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
 
-            var track = target.Track(control, tree);
-            var results = new List<TransformedBounds>();
-            track.Subscribe(results.Add);
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(0, 0, 100, 100));
+                context.Render(tree);
 
-            Assert.Equal(new Rect(42, 42, 15, 15), results[0].Bounds);
+                var track = target.Track(control);
+                var results = new List<TransformedBounds>();
+                track.Subscribe(results.Add);
 
-            tree.Padding = new Thickness(15);
-            tree.Measure(Size.Infinity);
-            tree.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Rect(37, 37, 15, 15), results[1].Bounds);
+                Assert.Equal(new Rect(0, 0, 15, 15), results[0].Bounds);
+                Assert.Equal(Matrix.CreateTranslation(42, 42), results[0].Transform);
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
index 708be0a0a5..4de90b7790 100644
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
@@ -6,11 +6,21 @@ using Moq;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Xunit;
+using System;
+using Avalonia.Controls.Templates;
 
 namespace Avalonia.Styling.UnitTests
 {
     public class SetterTests
     {
+        [Fact]
+        public void Cannot_Assign_Control_To_Value()
+        {
+            var target = new Setter();
+
+            Assert.Throws<ArgumentException>(() => target.Value = new Border());
+        }
+
         [Fact]
         public void Setter_Should_Apply_Binding_To_Property()
         {
@@ -25,5 +35,31 @@ namespace Avalonia.Styling.UnitTests
 
             Assert.Equal("foo", control.Text);
         }
+
+        [Fact]
+        public void Setter_Should_Materialize_Template_To_Property()
+        {
+            var control = new Decorator();
+            var template = new FuncTemplate<Canvas>(() => new Canvas());
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(Decorator.ChildProperty, template);
+
+            setter.Apply(style, control, null);
+
+            Assert.IsType<Canvas>(control.Child);
+        }
+
+        [Fact]
+        public void Materializes_Template_Should_Be_NameScope()
+        {
+            var control = new Decorator();
+            var template = new FuncTemplate<Canvas>(() => new Canvas());
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(Decorator.ChildProperty, template);
+
+            setter.Apply(style, control, null);
+
+            Assert.NotNull(NameScope.GetNameScope((Control)control.Child));
+        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index 9ea13e07ff..c4a0c98908 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -44,6 +44,9 @@ namespace Avalonia.UnitTests
             keyboardDevice: () => new KeyboardDevice(),
             inputManager: new InputManager());
 
+        public static readonly TestServices RealLayoutManager = new TestServices(
+            layoutManager: new LayoutManager());
+
         public static readonly TestServices RealStyler = new TestServices(
             styler: new Styler());
 
diff --git a/tests/TestFiles/Cairo/GeometryClipping/Geometry_Clip_Clips_Path.expected.png b/tests/TestFiles/Cairo/GeometryClipping/Geometry_Clip_Clips_Path.expected.png
new file mode 100644
index 0000000000..892899507b
Binary files /dev/null and b/tests/TestFiles/Cairo/GeometryClipping/Geometry_Clip_Clips_Path.expected.png differ
diff --git a/tests/TestFiles/Cairo/OpacityMask/Opacity_Mask_Masks_Element.expected.png b/tests/TestFiles/Cairo/OpacityMask/Opacity_Mask_Masks_Element.expected.png
new file mode 100644
index 0000000000..f57c675b7a
Binary files /dev/null and b/tests/TestFiles/Cairo/OpacityMask/Opacity_Mask_Masks_Element.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/GeometryClipping/Geometry_Clip_Clips_Path.expected.png b/tests/TestFiles/Direct2D1/GeometryClipping/Geometry_Clip_Clips_Path.expected.png
new file mode 100644
index 0000000000..892899507b
Binary files /dev/null and b/tests/TestFiles/Direct2D1/GeometryClipping/Geometry_Clip_Clips_Path.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/OpacityMask/Opacity_Mask_Masks_Element.expected.png b/tests/TestFiles/Direct2D1/OpacityMask/Opacity_Mask_Masks_Element.expected.png
new file mode 100644
index 0000000000..ba8312accf
Binary files /dev/null and b/tests/TestFiles/Direct2D1/OpacityMask/Opacity_Mask_Masks_Element.expected.png differ
diff --git a/tests/TestFiles/Skia/GeometryClipping/Geometry_Clip_Clips_Path.expected.png b/tests/TestFiles/Skia/GeometryClipping/Geometry_Clip_Clips_Path.expected.png
new file mode 100644
index 0000000000..892899507b
Binary files /dev/null and b/tests/TestFiles/Skia/GeometryClipping/Geometry_Clip_Clips_Path.expected.png differ
diff --git a/tests/TestFiles/Skia/OpacityMask/Opacity_Mask_Masks_Element.expected.png b/tests/TestFiles/Skia/OpacityMask/Opacity_Mask_Masks_Element.expected.png
new file mode 100644
index 0000000000..935ba57aff
Binary files /dev/null and b/tests/TestFiles/Skia/OpacityMask/Opacity_Mask_Masks_Element.expected.png differ