diff --git a/Installer/InstallItems/Nuget/MvvmLight.5.2.0.0.nupkg b/Installer/InstallItems/Nuget/MvvmLight.5.2.0.0.nupkg
deleted file mode 100644
index 4505b4f..0000000
Binary files a/Installer/InstallItems/Nuget/MvvmLight.5.2.0.0.nupkg and /dev/null differ
diff --git a/Installer/InstallItems/Nuget/MvvmLightLibs.5.2.0.0.nupkg b/Installer/InstallItems/Nuget/MvvmLightLibs.5.2.0.0.nupkg
deleted file mode 100644
index 603ae54..0000000
Binary files a/Installer/InstallItems/Nuget/MvvmLightLibs.5.2.0.0.nupkg and /dev/null differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Droid.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Droid.zip
index 1a4380f..c412fd7 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Droid.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Droid.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.SL5.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.SL5.zip
index f274369..7428fb9 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.SL5.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.SL5.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP8.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP8.zip
index 5b8742a..b5a21e3 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP8.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP8.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP81.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP81.zip
index 34e8779..214cfb3 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP81.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WP81.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPA81.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPA81.zip
index e2e9aa7..5d5f17c 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPA81.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPA81.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPF451.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPF451.zip
index 758a9e0..15aa241 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPF451.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.WPF451.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win10Univ.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win10Univ.zip
index 5b01672..ab69887 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win10Univ.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win10Univ.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win81.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win81.zip
index 2eea85f..384d951 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win81.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.Win81.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.iPhone.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.iPhone.zip
index f0c64b2..0a2283f 100644
Binary files a/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.iPhone.zip and b/Installer/InstallItems/Templates/ProjectTemplates/VS2015/Mvvm.iPhone.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.Droid.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.Droid.zip
new file mode 100644
index 0000000..348c613
Binary files /dev/null and b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.Droid.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.WPF451.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.WPF451.zip
new file mode 100644
index 0000000..994e10e
Binary files /dev/null and b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.WPF451.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.Win10Univ.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.Win10Univ.zip
new file mode 100644
index 0000000..5caff06
Binary files /dev/null and b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.Win10Univ.zip differ
diff --git a/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.iPhone.zip b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.iPhone.zip
new file mode 100644
index 0000000..b4cd5fe
Binary files /dev/null and b/Installer/InstallItems/Templates/ProjectTemplates/VS2017/Mvvm.iPhone.zip differ
diff --git a/Installer/StandardVSIX/MvvmLight.VS2015/MvvmLight.VS2015.csproj b/Installer/StandardVSIX/MvvmLight.VS2015/MvvmLight.VS2015.csproj
index 3320471..66afea9 100644
--- a/Installer/StandardVSIX/MvvmLight.VS2015/MvvmLight.VS2015.csproj
+++ b/Installer/StandardVSIX/MvvmLight.VS2015/MvvmLight.VS2015.csproj
@@ -289,8 +289,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\..\InstallItems\Nuget\MvvmLightLibs.5.2.0.0.nupkg">
-      <Link>Packages\MvvmLightLibs.5.2.0.0.nupkg</Link>
+    <Content Include="..\..\InstallItems\Nuget\MvvmLightLibs.5.3.0.0.nupkg">
+      <Link>Packages\MvvmLightLibs.5.3.0.0.nupkg</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
diff --git a/Installer/StandardVSIX/MvvmLight.VS2015/source.extension.vsixmanifest b/Installer/StandardVSIX/MvvmLight.VS2015/source.extension.vsixmanifest
index 30e8c81..5c5839a 100644
--- a/Installer/StandardVSIX/MvvmLight.VS2015/source.extension.vsixmanifest
+++ b/Installer/StandardVSIX/MvvmLight.VS2015/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="2d913f29-2e2e-4138-a4fb-e9b78d212d7c" Version="5.2.0.0" Language="en-US" Publisher="Laurent Bugnion (GalaSoft)" />
+    <Identity Id="2d913f29-2e2e-4138-a4fb-e9b78d212d7c" Version="5.3.0.0" Language="en-US" Publisher="Laurent Bugnion (GalaSoft)" />
     <DisplayName>MVVM Light for VS2015</DisplayName>
     <Description xml:space="preserve">The MVVM Light Toolkit is a set of components helping people to get started in the Model - View - ViewModel pattern in Windows, Silverlight, WPF, Windows Phone, Xamarin.Android, Xamarin.iOS and Xamarin.Forms. It is a light and pragmatic framework that contains only the essential components needed.</Description>
     <MoreInfo>http://www.mvvmlight.net</MoreInfo>
diff --git a/NuGet/MvvmLightLibs.V5.nuspec b/NuGet/MvvmLightLibs.V5.nuspec
index 5cece1a..b72a830 100644
--- a/NuGet/MvvmLightLibs.V5.nuspec
+++ b/NuGet/MvvmLightLibs.V5.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>MvvmLightLibs</id>
-        <version>5.3.0.0</version>
+        <version>5.4.1-alpha</version>
         <title>MVVM Light libraries only</title>
         <authors>Laurent Bugnion (GalaSoft)</authors>
         <owners>Laurent Bugnion (GalaSoft)</owners>
@@ -10,10 +10,10 @@
         <projectUrl>http://www.mvvmlight.net</projectUrl>
         <iconUrl>http://www.galasoft.ch/mvvm/resources/Logo/icon_100x100_transparent.png</iconUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>The MVVM Light Toolkit is a set of components helping people to get started in the Model-View-ViewModel pattern in Silverlight, WPF, Windows Phone, Windows 10 UWP, Xamarin.Android, Xamarin.iOS, Xamarin.Forms. It is a light and pragmatic framework that allows you to pick which components you want to use. This version contains only the libraries and doesn't add any scaffolding to your application!</description>
-        <summary>The MVVM Light Toolkit is a set of components helping people to get started in the Model-View-ViewModel pattern in Silverlight, WPF, Windows Phone, Windows 10 UWP, Xamarin.Android, Xamarin.iOS, Xamarin.Forms. It is a light and pragmatic framework that allows you to pick which components you want to use. This version contains only the libraries and doesn't add any scaffolding to your application!</summary>
+        <description>V5.4.1.0 ALPHA. The MVVM Light Toolkit is a set of components helping people to get started in the Model-View-ViewModel pattern in Silverlight, WPF, Windows Phone, Windows 10 UWP, Xamarin.Android, Xamarin.iOS, Xamarin.Forms. It is a light and pragmatic framework that allows you to pick which components you want to use. This version contains only the libraries and doesn't add any scaffolding to your application!</description>
+        <summary>V5.4.1.0 ALPHA. The MVVM Light Toolkit is a set of components helping people to get started in the Model-View-ViewModel pattern in Silverlight, WPF, Windows Phone, Windows 10 UWP, Xamarin.Android, Xamarin.iOS, Xamarin.Forms. It is a light and pragmatic framework that allows you to pick which components you want to use. This version contains only the libraries and doesn't add any scaffolding to your application!</summary>
         <releaseNotes>http://www.mvvmlight.net/installing/changes</releaseNotes>
-        <copyright>Copyright 2009-2016 Laurent Bugnion (GalaSoft)</copyright>
+        <copyright>Copyright 2009-2017 Laurent Bugnion (GalaSoft)</copyright>
         <language>en-US</language>
         <tags>mvvm mvvmlight silverlight windowsstore winrt win10 uwp winstore wpf windowsphone windowsphone8 xamarin android iOS xamarinforms pcl</tags>
 
@@ -39,9 +39,6 @@
 			<group targetFramework="sl5">
 				<dependency id="CommonServiceLocator" version="1.3" />
 			</group>
-			<group targetFramework="wp8">
-				<dependency id="CommonServiceLocator" version="1.3" />
-			</group>
 			<group targetFramework="wp81">
 				<dependency id="CommonServiceLocator" version="1.3" />
 			</group>
@@ -51,13 +48,16 @@
 			<group targetFramework="windows81">
 				<dependency id="CommonServiceLocator" version="1.3" />
 			</group>
+			<group targetFramework="uap10.0">
+				<dependency id="CommonServiceLocator" version="1.3" />
+			</group>
 			<group targetFramework="monoandroid1">
 				<dependency id="CommonServiceLocator" version="1.3" />
 			</group>
 			<group targetFramework="xamarin.ios10">
 				<dependency id="CommonServiceLocator" version="1.3" />
 			</group>
-			<group targetFramework="portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10">
+			<group targetFramework="portable-net45+wp81+wpa81+netcore45+monoandroid1+xamarin.ios10+uap10.0">
 				<dependency id="CommonServiceLocator" version="1.3" />
 			</group>
 		</dependencies>
@@ -163,6 +163,17 @@
         <file src="..\GalaSoft.MvvmLight\_Binaries\Release\iOS\GalaSoft.MvvmLight.Platform.dll" target="lib\xamarin.ios10\GalaSoft.MvvmLight.Platform.dll" />
         <file src="..\GalaSoft.MvvmLight\_Binaries\Release\iOS\GalaSoft.MvvmLight.Platform.XML" target="lib\xamarin.ios10\GalaSoft.MvvmLight.Platform.XML" />		
         <file src="..\GalaSoft.MvvmLight\_Binaries\Release\iOS\GalaSoft.MvvmLight.XML" target="lib\xamarin.ios10\GalaSoft.MvvmLight.XML" />
+
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.dll" target="lib\uap10.0\GalaSoft.MvvmLight.dll" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.Extras.dll" target="lib\uap10.0\GalaSoft.MvvmLight.Extras.dll" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.Extras.pdb" target="lib\uap10.0\GalaSoft.MvvmLight.Extras.pdb" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.Extras.xml" target="lib\uap10.0\GalaSoft.MvvmLight.Extras.xml" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.Platform.dll" target="lib\uap10.0\GalaSoft.MvvmLight.Platform.dll" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.Platform.pdb" target="lib\uap10.0\GalaSoft.MvvmLight.Platform.pdb" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.Platform.pri" target="lib\uap10.0\GalaSoft.MvvmLight.Platform.pri" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.Platform.xml" target="lib\uap10.0\GalaSoft.MvvmLight.Platform.xml" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.pdb" target="lib\uap10.0\GalaSoft.MvvmLight.pdb" />
+        <file src="..\GalaSoft.MvvmLight\_Binaries\Release\UWP\GalaSoft.MvvmLight.xml" target="lib\uap10.0\GalaSoft.MvvmLight.xml" />
 		
         <file src="..\GalaSoft.MvvmLight\_Binaries\Release\PCL\GalaSoft.MvvmLight.dll" target="lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.dll" />
         <file src="..\GalaSoft.MvvmLight\_Binaries\Release\PCL\GalaSoft.MvvmLight.Extras.dll" target="lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.Extras.dll" />