diff --git a/Cairo/Perspex.Cairo/Perspex.Cairo.csproj b/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
index c8843d6523..9a6ae92dee 100644
--- a/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
+++ b/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
@@ -43,8 +43,9 @@
gtk-sharp-2.0
-
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+
+ False
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Cairo/Perspex.Cairo/packages.config b/Cairo/Perspex.Cairo/packages.config
index 9f4c14955a..67dd0e8176 100644
--- a/Cairo/Perspex.Cairo/packages.config
+++ b/Cairo/Perspex.Cairo/packages.config
@@ -2,6 +2,6 @@
-
+
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/Perspex.Gtk.csproj b/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
index 1099452bb5..4d38b350df 100644
--- a/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
+++ b/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
@@ -29,10 +29,11 @@
false
-
-
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+
+ False
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
+
gtk-sharp-2.0
diff --git a/Gtk/Perspex.Gtk/packages.config b/Gtk/Perspex.Gtk/packages.config
index fc92db68ae..549c25abbe 100644
--- a/Gtk/Perspex.Gtk/packages.config
+++ b/Gtk/Perspex.Gtk/packages.config
@@ -3,6 +3,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Application/Perspex.Application.csproj b/Perspex.Application/Perspex.Application.csproj
index bd85add2e1..ec6d8ebe2b 100644
--- a/Perspex.Application/Perspex.Application.csproj
+++ b/Perspex.Application/Perspex.Application.csproj
@@ -71,7 +71,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Application/packages.config b/Perspex.Application/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Application/packages.config
+++ b/Perspex.Application/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Base/Perspex.Base.csproj b/Perspex.Base/Perspex.Base.csproj
index e8db7a404d..0ef4c82d26 100644
--- a/Perspex.Base/Perspex.Base.csproj
+++ b/Perspex.Base/Perspex.Base.csproj
@@ -61,7 +61,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Base/packages.config b/Perspex.Base/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Base/packages.config
+++ b/Perspex.Base/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index f03f9d6434..8c2e3025dc 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -115,7 +115,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Controls/packages.config b/Perspex.Controls/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Controls/packages.config
+++ b/Perspex.Controls/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Diagnostics/Perspex.Diagnostics.csproj b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
index 53948a659a..15a04c969e 100644
--- a/Perspex.Diagnostics/Perspex.Diagnostics.csproj
+++ b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
@@ -82,10 +82,10 @@
- ..\packages\reactiveui-core.6.2.1.1\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll
+ ..\packages\reactiveui-core.6.4.0.1\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Diagnostics/packages.config b/Perspex.Diagnostics/packages.config
index 59f5ceccf7..96efcfe767 100644
--- a/Perspex.Diagnostics/packages.config
+++ b/Perspex.Diagnostics/packages.config
@@ -1,12 +1,12 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/Perspex.Input/Perspex.Input.csproj b/Perspex.Input/Perspex.Input.csproj
index 239a4aeedf..3d38054027 100644
--- a/Perspex.Input/Perspex.Input.csproj
+++ b/Perspex.Input/Perspex.Input.csproj
@@ -88,7 +88,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Input/packages.config b/Perspex.Input/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Input/packages.config
+++ b/Perspex.Input/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj b/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
index d76f750f74..a5748d6824 100644
--- a/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
+++ b/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
@@ -32,8 +32,9 @@
4
-
- ..\packages\Splat.1.6.0\lib\Net45\Splat.dll
+
+ False
+ ..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Perspex.Interactive.UnitTests/packages.config b/Perspex.Interactive.UnitTests/packages.config
index b62b116d38..20824306fa 100644
--- a/Perspex.Interactive.UnitTests/packages.config
+++ b/Perspex.Interactive.UnitTests/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Interactivity/Perspex.Interactivity.csproj b/Perspex.Interactivity/Perspex.Interactivity.csproj
index b50018f3a2..0a68ce36e5 100644
--- a/Perspex.Interactivity/Perspex.Interactivity.csproj
+++ b/Perspex.Interactivity/Perspex.Interactivity.csproj
@@ -62,7 +62,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Interactivity/packages.config b/Perspex.Interactivity/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Interactivity/packages.config
+++ b/Perspex.Interactivity/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Layout/Perspex.Layout.csproj b/Perspex.Layout/Perspex.Layout.csproj
index 879599971c..84b3da3407 100644
--- a/Perspex.Layout/Perspex.Layout.csproj
+++ b/Perspex.Layout/Perspex.Layout.csproj
@@ -63,7 +63,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Layout/packages.config b/Perspex.Layout/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Layout/packages.config
+++ b/Perspex.Layout/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/Perspex.SceneGraph/Perspex.SceneGraph.csproj
index 2088183663..39768e98a6 100644
--- a/Perspex.SceneGraph/Perspex.SceneGraph.csproj
+++ b/Perspex.SceneGraph/Perspex.SceneGraph.csproj
@@ -98,7 +98,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.SceneGraph/packages.config b/Perspex.SceneGraph/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.SceneGraph/packages.config
+++ b/Perspex.SceneGraph/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Styling/Perspex.Styling.csproj b/Perspex.Styling/Perspex.Styling.csproj
index d87a4cddce..20a249cce2 100644
--- a/Perspex.Styling/Perspex.Styling.csproj
+++ b/Perspex.Styling/Perspex.Styling.csproj
@@ -54,7 +54,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Styling/packages.config b/Perspex.Styling/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Styling/packages.config
+++ b/Perspex.Styling/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/Perspex.Themes.Default/Perspex.Themes.Default.csproj
index 3cdca71929..be4ec9af91 100644
--- a/Perspex.Themes.Default/Perspex.Themes.Default.csproj
+++ b/Perspex.Themes.Default/Perspex.Themes.Default.csproj
@@ -95,7 +95,7 @@
- ..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.6.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll
..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
diff --git a/Perspex.Themes.Default/packages.config b/Perspex.Themes.Default/packages.config
index 629151ee0a..be1e98158f 100644
--- a/Perspex.Themes.Default/packages.config
+++ b/Perspex.Themes.Default/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/TestApplication/TestApplication.csproj b/TestApplication/TestApplication.csproj
index 6e476abfac..4a60af1c3c 100644
--- a/TestApplication/TestApplication.csproj
+++ b/TestApplication/TestApplication.csproj
@@ -34,6 +34,14 @@
4
+
+ False
+ ..\packages\reactiveui-core.6.4.0.1\lib\Net45\ReactiveUI.dll
+
+
+ False
+ ..\packages\Splat.1.6.1\lib\Net45\Splat.dll
+
@@ -47,12 +55,6 @@
-
- ..\packages\reactiveui-core.6.2.1.1\lib\Net45\ReactiveUI.dll
-
-
- ..\packages\Splat.1.5.1\lib\Net45\Splat.dll
-
..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll
diff --git a/TestApplication/packages.config b/TestApplication/packages.config
index e476a1252d..cf3a479a49 100644
--- a/TestApplication/packages.config
+++ b/TestApplication/packages.config
@@ -1,7 +1,7 @@
-
-
+
+
@@ -11,5 +11,5 @@
-
+
\ No newline at end of file
diff --git a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
index abbb9e8365..8cab65bb05 100644
--- a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
+++ b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
@@ -40,9 +40,9 @@
False
..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll
-
+
False
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Tests/Perspex.Base.UnitTests/packages.config b/Tests/Perspex.Base.UnitTests/packages.config
index 1ce119e827..f8574db9cc 100644
--- a/Tests/Perspex.Base.UnitTests/packages.config
+++ b/Tests/Perspex.Base.UnitTests/packages.config
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
index 917b4c3418..5b4e8f0d20 100644
--- a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
+++ b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
@@ -46,9 +46,9 @@
..\..\packages\AutoFixture.AutoMoq.3.21.1\lib\net40\Ploeh.AutoFixture.AutoMoq.dll
-
+
False
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Tests/Perspex.Controls.UnitTests/packages.config b/Tests/Perspex.Controls.UnitTests/packages.config
index 815bfd2f08..87d7ea962f 100644
--- a/Tests/Perspex.Controls.UnitTests/packages.config
+++ b/Tests/Perspex.Controls.UnitTests/packages.config
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file
diff --git a/Tests/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj b/Tests/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
index c9172e0c32..b097dbcb61 100644
--- a/Tests/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
+++ b/Tests/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
@@ -40,9 +40,9 @@
False
..\..\packages\Magick.NET-Q16-x86.7.0.0.0007\lib\net40-client\Magick.NET-x86.dll
-
+
False
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Tests/Perspex.Direct2D1.RenderTests/packages.config b/Tests/Perspex.Direct2D1.RenderTests/packages.config
index e9f87eee31..c030e93134 100644
--- a/Tests/Perspex.Direct2D1.RenderTests/packages.config
+++ b/Tests/Perspex.Direct2D1.RenderTests/packages.config
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj b/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
index b896fcc253..e84ef66cf9 100644
--- a/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
+++ b/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
@@ -46,8 +46,9 @@
..\..\packages\AutoFixture.AutoMoq.3.21.1\lib\net40\Ploeh.AutoFixture.AutoMoq.dll
-
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+
+ False
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Tests/Perspex.Layout.UnitTests/packages.config b/Tests/Perspex.Layout.UnitTests/packages.config
index 7952b1097c..8a866174c6 100644
--- a/Tests/Perspex.Layout.UnitTests/packages.config
+++ b/Tests/Perspex.Layout.UnitTests/packages.config
@@ -3,7 +3,7 @@
-
+
\ No newline at end of file
diff --git a/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj b/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
index 151ceebca2..44ea8c036c 100644
--- a/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
+++ b/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
@@ -36,9 +36,9 @@
4
-
+
False
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Tests/Perspex.SceneGraph.UnitTests/packages.config b/Tests/Perspex.SceneGraph.UnitTests/packages.config
index a96b1d0385..20824306fa 100644
--- a/Tests/Perspex.SceneGraph.UnitTests/packages.config
+++ b/Tests/Perspex.SceneGraph.UnitTests/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
index 75cfa71f6b..2022669b85 100644
--- a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
+++ b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
@@ -40,9 +40,9 @@
False
..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll
-
+
False
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
diff --git a/Tests/Perspex.Styling.UnitTests/packages.config b/Tests/Perspex.Styling.UnitTests/packages.config
index 58efc28c01..b9ede1f589 100644
--- a/Tests/Perspex.Styling.UnitTests/packages.config
+++ b/Tests/Perspex.Styling.UnitTests/packages.config
@@ -6,7 +6,7 @@
-
+
\ No newline at end of file
diff --git a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
index f7fee0a1d5..93b0731e45 100644
--- a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
+++ b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
@@ -43,6 +43,10 @@
False
$(SharpDXPackageBinDir)\SharpDX.DXGI.dll
+
+ False
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
+
@@ -52,9 +56,6 @@
-
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
-
..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll
diff --git a/Windows/Perspex.Direct2D1/packages.config b/Windows/Perspex.Direct2D1/packages.config
index 5cfa7e2de9..4aeea61314 100644
--- a/Windows/Perspex.Direct2D1/packages.config
+++ b/Windows/Perspex.Direct2D1/packages.config
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/Windows/Perspex.Win32/Perspex.Win32.csproj b/Windows/Perspex.Win32/Perspex.Win32.csproj
index 4e65c66898..bb1f826f8e 100644
--- a/Windows/Perspex.Win32/Perspex.Win32.csproj
+++ b/Windows/Perspex.Win32/Perspex.Win32.csproj
@@ -30,6 +30,10 @@
4
+
+ False
+ ..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll
+
@@ -39,9 +43,6 @@
-
- ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll
-
..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll
diff --git a/Windows/Perspex.Win32/packages.config b/Windows/Perspex.Win32/packages.config
index e81e3cf53c..a0b6a6eb45 100644
--- a/Windows/Perspex.Win32/packages.config
+++ b/Windows/Perspex.Win32/packages.config
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file