From 6f60786af7b765e109f1b89d39d690401c4ef69b Mon Sep 17 00:00:00 2001
From: jasonCodesAway <jhanduber@live.com>
Date: Sat, 15 Oct 2016 10:52:40 -0400
Subject: [PATCH] That was a lot of work. DO NOT update Fody.PropertyChanged
 until this gets fixed: https://github.com/Fody/PropertyChanged/issues/204 Got
 XamJam.Demo working in the iOS simulator on this commit :)

---
 .../FodyWeavers.xml                           |  4 ++++
 ...Plugin.XamJam.BugHound.Abstractions.csproj | 19 +++++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 .../Plugin.XamJam.BugHound.Android.csproj     | 17 +++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 .../Plugin.XamJam.BugHound.UWP.csproj         |  3 +++
 .../Plugin.XamJam.BugHound.UWP/project.json   |  3 ++-
 .../FodyWeavers.xml                           |  4 ++++
 ...lugin.XamJam.BugHound.WindowsPhone8.csproj | 21 +++++++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 ...ugin.XamJam.BugHound.WindowsPhone81.csproj | 21 +++++++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 ...Plugin.XamJam.BugHound.WindowsStore.csproj | 21 +++++++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 .../Plugin.XamJam.BugHound.iOS.csproj         | 19 +++++++++++++++++
 .../packages.config                           |  5 +++++
 .../Plugin.XamJam.BugHound/FodyWeavers.xml    |  4 ++++
 .../Plugin.XamJam.BugHound.csproj             | 19 +++++++++++++++++
 .../Plugin.XamJam.BugHound/packages.config    |  5 +++++
 XamJam.Demo/XamJam.Demo.Droid/FodyWeavers.xml |  2 +-
 .../XamJam.Demo.Droid.csproj                  | 20 +++++++++---------
 XamJam.Demo/XamJam.Demo.Droid/packages.config |  8 +++----
 XamJam.Demo/XamJam.Demo.iOS/FodyWeavers.xml   |  2 +-
 .../XamJam.Demo.iOS/XamJam.Demo.iOS.csproj    | 20 +++++++++---------
 XamJam.Demo/XamJam.Demo.iOS/packages.config   |  6 +++---
 XamJam.Demo/XamJam.Demo/FodyWeavers.xml       |  2 +-
 XamJam.Demo/XamJam.Demo/XamJam.Demo.csproj    | 18 ++++++++--------
 XamJam.Demo/XamJam.Demo/packages.config       |  4 ++--
 XamJam.Nav/XamJam.Nav.csproj                  | 14 ++++++-------
 XamJam.Nav/packages.config                    |  6 +++---
 XamJam.Pic/FodyWeavers.xml                    |  4 ++++
 XamJam.Pic/XamJam.Pic.csproj                  |  9 ++++++++
 XamJam.Pic/packages.config                    |  2 ++
 XamJam.PicSelector/XamJam.PicSelector.csproj  | 16 +++++++-------
 XamJam.PicSelector/packages.config            |  2 +-
 .../XamJam.Ratings/XamJam.Ratings.csproj      | 14 ++++++-------
 XamJam.Ratings/XamJam.Ratings/packages.config |  6 +++---
 .../FodyWeavers.xml                           |  4 ++++
 .../Plugin.XamJam.Screen.Abstractions.csproj  | 19 +++++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 .../Plugin.XamJam.Screen.Android.csproj       | 17 +++++++++++++++
 .../packages.config                           |  5 +++++
 .../Plugin.XamJam.Screen.UWP/FodyWeavers.xml  |  4 ++++
 .../Plugin.XamJam.Screen.UWP.csproj           |  3 +++
 .../Plugin.XamJam.Screen.UWP/project.json     |  3 ++-
 .../FodyWeavers.xml                           |  4 ++++
 .../Plugin.XamJam.Screen.WindowsPhone8.csproj | 21 +++++++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 ...Plugin.XamJam.Screen.WindowsPhone81.csproj | 21 +++++++++++++++++++
 .../packages.config                           |  5 +++++
 .../FodyWeavers.xml                           |  4 ++++
 .../Plugin.XamJam.Screen.WindowsStore.csproj  | 21 +++++++++++++++++++
 .../packages.config                           |  5 +++++
 .../Plugin.XamJam.Screen.iOS/FodyWeavers.xml  |  4 ++++
 .../Plugin.XamJam.Screen.iOS.csproj           | 19 +++++++++++++++++
 .../Plugin.XamJam.Screen.iOS/packages.config  |  5 +++++
 .../Plugin.XamJam.Screen/FodyWeavers.xml      |  4 ++++
 .../Plugin.XamJam.Screen.csproj               | 21 +++++++++++++++++++
 .../Plugin.XamJam.Screen/packages.config      |  5 +++++
 XamJam.Util/FodyWeavers.xml                   |  2 +-
 XamJam.Util/XamJam.Util.csproj                |  7 ++++---
 XamJam.Util/packages.config                   |  2 +-
 XamJam.Wall/FodyWeavers.xml                   |  2 +-
 XamJam.Wall/Plugin.XamJam.Wall.nuspec         |  2 +-
 XamJam.Wall/XamJam.Wall.csproj                |  4 ++--
 XamJam.Wall/packages.config                   |  2 +-
 73 files changed, 516 insertions(+), 82 deletions(-)
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/packages.config
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.Android/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.Android/packages.config
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.UWP/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/packages.config
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/packages.config
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/packages.config
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.iOS/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound.iOS/packages.config
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound/FodyWeavers.xml
 create mode 100644 XamJam.BugHound/Plugin.XamJam.BugHound/packages.config
 create mode 100644 XamJam.Pic/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.Abstractions/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.Abstractions/packages.config
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.Android/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.Android/packages.config
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.UWP/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/packages.config
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/packages.config
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/packages.config
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.iOS/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen.iOS/packages.config
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen/FodyWeavers.xml
 create mode 100644 XamJam.Screen/Plugin.XamJam.Screen/packages.config

diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/Plugin.XamJam.BugHound.Abstractions.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/Plugin.XamJam.BugHound.Abstractions.csproj
index 0b36c1a..55ba4b6 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/Plugin.XamJam.BugHound.Abstractions.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/Plugin.XamJam.BugHound.Abstractions.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,12 +38,29 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
+    <Content Include="FodyWeavers.xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="IBugHoundHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/packages.config b/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/packages.config
new file mode 100644
index 0000000..78f7718
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.Abstractions/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.Android/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound.Android/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.Android/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.Android/Plugin.XamJam.BugHound.Android.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound.Android/Plugin.XamJam.BugHound.Android.csproj
index 9a76d89..bc9470c 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.Android/Plugin.XamJam.BugHound.Android.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.Android/Plugin.XamJam.BugHound.Android.csproj
@@ -17,6 +17,8 @@
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
     <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,6 +41,10 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -53,6 +59,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -65,7 +72,17 @@
       <Name>Plugin.XamJam.BugHound.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.Android/packages.config b/XamJam.BugHound/Plugin.XamJam.BugHound.Android/packages.config
new file mode 100644
index 0000000..7b06b72
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.Android/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="monoandroid70" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="monoandroid70" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/Plugin.XamJam.BugHound.UWP.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/Plugin.XamJam.BugHound.UWP.csproj
index 0119472..bce9818 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/Plugin.XamJam.BugHound.UWP.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/Plugin.XamJam.BugHound.UWP.csproj
@@ -126,6 +126,9 @@
       <Name>Plugin.XamJam.BugHound.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/project.json b/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/project.json
index 32d9274..e2d40da 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/project.json
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.UWP/project.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
+    "PropertyChanged.Fody": "1.51.3"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/Plugin.XamJam.BugHound.WindowsPhone8.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/Plugin.XamJam.BugHound.WindowsPhone8.csproj
index 77da794..ddc99d1 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/Plugin.XamJam.BugHound.WindowsPhone8.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/Plugin.XamJam.BugHound.WindowsPhone8.csproj
@@ -18,6 +18,8 @@
     <ValidateXaml>true</ValidateXaml>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -101,9 +103,28 @@
       <Name>Plugin.XamJam.BugHound.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/packages.config b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/packages.config
new file mode 100644
index 0000000..f6f61ec
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone8/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="wp8" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="wp8" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/Plugin.XamJam.BugHound.WindowsPhone81.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/Plugin.XamJam.BugHound.WindowsPhone81.csproj
index 33a45d5..8decd70 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/Plugin.XamJam.BugHound.WindowsPhone81.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/Plugin.XamJam.BugHound.WindowsPhone81.csproj
@@ -16,6 +16,8 @@
     <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -96,6 +98,18 @@
       <Name>Plugin.XamJam.BugHound.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
@@ -103,6 +117,13 @@
     <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/packages.config b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/packages.config
new file mode 100644
index 0000000..f92f19c
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsPhone81/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="wpa81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="wpa81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/Plugin.XamJam.BugHound.WindowsStore.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/Plugin.XamJam.BugHound.WindowsStore.csproj
index 97beb41..2278e5c 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/Plugin.XamJam.BugHound.WindowsStore.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/Plugin.XamJam.BugHound.WindowsStore.csproj
@@ -16,6 +16,8 @@
     <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -118,10 +120,29 @@
       <Name>Plugin.XamJam.BugHound.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/packages.config b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/packages.config
new file mode 100644
index 0000000..d849b9d
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.WindowsStore/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="win81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="win81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/Plugin.XamJam.BugHound.iOS.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/Plugin.XamJam.BugHound.iOS.csproj
index 97c231a..c181849 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/Plugin.XamJam.BugHound.iOS.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/Plugin.XamJam.BugHound.iOS.csproj
@@ -11,6 +11,8 @@
     <RootNamespace>Plugin.XamJam.BugHound</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>Plugin.XamJam.BugHound</AssemblyName>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +44,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -57,5 +63,18 @@
       <Name>Plugin.XamJam.BugHound.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/packages.config b/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/packages.config
new file mode 100644
index 0000000..372ba42
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound.iOS/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="xamarinios10" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="xamarinios10" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound/FodyWeavers.xml b/XamJam.BugHound/Plugin.XamJam.BugHound/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound/Plugin.XamJam.BugHound.csproj b/XamJam.BugHound/Plugin.XamJam.BugHound/Plugin.XamJam.BugHound.csproj
index 919b748..cfb5869 100644
--- a/XamJam.BugHound/Plugin.XamJam.BugHound/Plugin.XamJam.BugHound.csproj
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound/Plugin.XamJam.BugHound.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +44,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Collections.Concurrent">
       <HintPath>..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5.1\System.Collections.Concurrent.dll</HintPath>
     </Reference>
@@ -56,7 +62,20 @@
       <Name>Plugin.XamJam.BugHound.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.BugHound/Plugin.XamJam.BugHound/packages.config b/XamJam.BugHound/Plugin.XamJam.BugHound/packages.config
new file mode 100644
index 0000000..78f7718
--- /dev/null
+++ b/XamJam.BugHound/Plugin.XamJam.BugHound/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Demo/XamJam.Demo.Droid/FodyWeavers.xml b/XamJam.Demo/XamJam.Demo.Droid/FodyWeavers.xml
index bb0f322..7369928 100644
--- a/XamJam.Demo/XamJam.Demo.Droid/FodyWeavers.xml
+++ b/XamJam.Demo/XamJam.Demo.Droid/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers>
   <PropertyChanged />
 </Weavers>
\ No newline at end of file
diff --git a/XamJam.Demo/XamJam.Demo.Droid/XamJam.Demo.Droid.csproj b/XamJam.Demo/XamJam.Demo.Droid/XamJam.Demo.Droid.csproj
index 41a5324..6a8e783 100644
--- a/XamJam.Demo/XamJam.Demo.Droid/XamJam.Demo.Droid.csproj
+++ b/XamJam.Demo/XamJam.Demo.Droid/XamJam.Demo.Droid.csproj
@@ -135,20 +135,20 @@
       <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.Droid, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\MonoAndroid44\XamSvg.Droid.dll</HintPath>
+    <Reference Include="XamSvg.Droid, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\MonoAndroid44\XamSvg.Droid.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.Shared, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\MonoAndroid44\XamSvg.Shared.dll</HintPath>
+    <Reference Include="XamSvg.Shared, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\MonoAndroid44\XamSvg.Shared.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.XamForms, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\MonoAndroid44\XamSvg.XamForms.dll</HintPath>
+    <Reference Include="XamSvg.XamForms, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\MonoAndroid44\XamSvg.XamForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.XamForms.Droid, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\MonoAndroid44\XamSvg.XamForms.Droid.dll</HintPath>
+    <Reference Include="XamSvg.XamForms.Droid, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\MonoAndroid44\XamSvg.XamForms.Droid.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -201,11 +201,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
-  <Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Demo/XamJam.Demo.Droid/packages.config b/XamJam.Demo/XamJam.Demo.Droid/packages.config
index d33765d..e8e6c3b 100644
--- a/XamJam.Demo/XamJam.Demo.Droid/packages.config
+++ b/XamJam.Demo/XamJam.Demo.Droid/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="monoandroid60" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="monoandroid70" developmentDependency="true" />
   <package id="MR.Gestures" version="1.3.5" targetFramework="monoandroid60" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="monoandroid60" developmentDependency="true" />
-  <package id="Softlion.XamSvg" version="2.3.2.2" targetFramework="monoandroid70" />
-  <package id="Vapolia.XamSvg.Forms" version="2.3.2.2" targetFramework="monoandroid70" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="monoandroid70" developmentDependency="true" />
+  <package id="Softlion.XamSvg" version="2.3.2.4" targetFramework="monoandroid70" />
+  <package id="Vapolia.XamSvg.Forms" version="2.3.2.4" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />
diff --git a/XamJam.Demo/XamJam.Demo.iOS/FodyWeavers.xml b/XamJam.Demo/XamJam.Demo.iOS/FodyWeavers.xml
index bb0f322..7369928 100644
--- a/XamJam.Demo/XamJam.Demo.iOS/FodyWeavers.xml
+++ b/XamJam.Demo/XamJam.Demo.iOS/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers>
   <PropertyChanged />
 </Weavers>
\ No newline at end of file
diff --git a/XamJam.Demo/XamJam.Demo.iOS/XamJam.Demo.iOS.csproj b/XamJam.Demo/XamJam.Demo.iOS/XamJam.Demo.iOS.csproj
index ee5d759..730ead2 100644
--- a/XamJam.Demo/XamJam.Demo.iOS/XamJam.Demo.iOS.csproj
+++ b/XamJam.Demo/XamJam.Demo.iOS/XamJam.Demo.iOS.csproj
@@ -168,20 +168,20 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.iOS" />
-    <Reference Include="XamSvg.Ios, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\Xamarin.iOS\XamSvg.Ios.dll</HintPath>
+    <Reference Include="XamSvg.Ios, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\Xamarin.iOS\XamSvg.Ios.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.Shared, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\Xamarin.iOS\XamSvg.Shared.dll</HintPath>
+    <Reference Include="XamSvg.Shared, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\Xamarin.iOS\XamSvg.Shared.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.XamForms, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\Xamarin.iOS\XamSvg.XamForms.dll</HintPath>
+    <Reference Include="XamSvg.XamForms, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\Xamarin.iOS\XamSvg.XamForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.XamForms.iOS, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\Xamarin.iOS\XamSvg.XamForms.iOS.dll</HintPath>
+    <Reference Include="XamSvg.XamForms.iOS, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\Xamarin.iOS\XamSvg.XamForms.iOS.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -216,8 +216,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
-  <Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" />
 </Project>
\ No newline at end of file
diff --git a/XamJam.Demo/XamJam.Demo.iOS/packages.config b/XamJam.Demo/XamJam.Demo.iOS/packages.config
index 10234b5..67917e2 100644
--- a/XamJam.Demo/XamJam.Demo.iOS/packages.config
+++ b/XamJam.Demo/XamJam.Demo.iOS/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="xamarinios10" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="xamarinios10" developmentDependency="true" />
   <package id="MR.Gestures" version="1.3.5" targetFramework="xamarinios10" />
   <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="xamarinios10" developmentDependency="true" />
-  <package id="Softlion.XamSvg" version="2.3.2.2" targetFramework="xamarinios10" />
-  <package id="Vapolia.XamSvg.Forms" version="2.3.2.2" targetFramework="xamarinios10" />
+  <package id="Softlion.XamSvg" version="2.3.2.4" targetFramework="xamarinios10" />
+  <package id="Vapolia.XamSvg.Forms" version="2.3.2.4" targetFramework="xamarinios10" />
   <package id="WebP.Touch" version="1.0.2" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading" version="2.1.8" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.1.8" targetFramework="xamarinios10" />
diff --git a/XamJam.Demo/XamJam.Demo/FodyWeavers.xml b/XamJam.Demo/XamJam.Demo/FodyWeavers.xml
index bb0f322..7369928 100644
--- a/XamJam.Demo/XamJam.Demo/FodyWeavers.xml
+++ b/XamJam.Demo/XamJam.Demo/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers>
   <PropertyChanged />
 </Weavers>
\ No newline at end of file
diff --git a/XamJam.Demo/XamJam.Demo/XamJam.Demo.csproj b/XamJam.Demo/XamJam.Demo/XamJam.Demo.csproj
index 4d07a23..1ea858a 100644
--- a/XamJam.Demo/XamJam.Demo/XamJam.Demo.csproj
+++ b/XamJam.Demo/XamJam.Demo/XamJam.Demo.csproj
@@ -71,15 +71,15 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Forms.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Xamarin.FFImageLoading.Forms.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MR.Gestures, Version=1.3.5.0, Culture=neutral, processorArchitecture=MSIL">
@@ -102,12 +102,12 @@
       <HintPath>$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.Shared, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\portable-win8+net45+wp8+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.Shared.dll</HintPath>
+    <Reference Include="XamSvg.Shared, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\portable-win8+net45+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.Shared.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.XamForms, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\portable-win8+net45+wp8+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.XamForms.dll</HintPath>
+    <Reference Include="XamSvg.XamForms, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\portable-win8+net45+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.XamForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -176,11 +176,11 @@
     <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('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
-  <Import Project="$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <Import Project="$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Demo/XamJam.Demo/packages.config b/XamJam.Demo/XamJam.Demo/packages.config
index 7356bfb..3f0a06e 100644
--- a/XamJam.Demo/XamJam.Demo/packages.config
+++ b/XamJam.Demo/XamJam.Demo/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="MR.Gestures" version="1.3.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
-  <package id="Vapolia.XamSvg.Forms" version="2.3.2.2" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Vapolia.XamSvg.Forms" version="2.3.2.4" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.FFImageLoading" version="2.1.8" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.1.8" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
diff --git a/XamJam.Nav/XamJam.Nav.csproj b/XamJam.Nav/XamJam.Nav.csproj
index ff6dd10..589e4f2 100644
--- a/XamJam.Nav/XamJam.Nav.csproj
+++ b/XamJam.Nav/XamJam.Nav.csproj
@@ -66,7 +66,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -81,12 +81,12 @@
       <HintPath>$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.Shared, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\portable-win8+net45+wp8+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.Shared.dll</HintPath>
+    <Reference Include="XamSvg.Shared, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\portable-win8+net45+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.Shared.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.XamForms, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\portable-win8+net45+wp8+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.XamForms.dll</HintPath>
+    <Reference Include="XamSvg.XamForms, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\portable-win8+net45+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.XamForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -114,11 +114,11 @@
     <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('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
-  <Import Project="$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <Import Project="$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Nav/packages.config b/XamJam.Nav/packages.config
index 7b94f5d..ff81578 100644
--- a/XamJam.Nav/packages.config
+++ b/XamJam.Nav/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="MR.Gestures" version="1.3.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
-  <package id="Softlion.XamSvg" version="2.3.2.2" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Vapolia.XamSvg.Forms" version="2.3.2.2" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Softlion.XamSvg" version="2.3.2.4" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Vapolia.XamSvg.Forms" version="2.3.2.4" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugins.XamJam.BugHound" version="0.0.1-alpha" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/XamJam.Pic/FodyWeavers.xml b/XamJam.Pic/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Pic/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Pic/XamJam.Pic.csproj b/XamJam.Pic/XamJam.Pic.csproj
index e7aa776..bd5ec88 100644
--- a/XamJam.Pic/XamJam.Pic.csproj
+++ b/XamJam.Pic/XamJam.Pic.csproj
@@ -49,6 +49,10 @@
       <HintPath>..\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
@@ -65,6 +69,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -72,7 +79,9 @@
       <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\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
+  <Import Project="..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Pic/packages.config b/XamJam.Pic/packages.config
index 1671418..1933e0e 100644
--- a/XamJam.Pic/packages.config
+++ b/XamJam.Pic/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Xamarin.FFImageLoading" version="2.1.8" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/XamJam.PicSelector/XamJam.PicSelector.csproj b/XamJam.PicSelector/XamJam.PicSelector.csproj
index 4eac7a1..77e3e37 100644
--- a/XamJam.PicSelector/XamJam.PicSelector.csproj
+++ b/XamJam.PicSelector/XamJam.PicSelector.csproj
@@ -49,15 +49,15 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.FFImageLoading.Forms.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Forms.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Xamarin.FFImageLoading.Forms.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Xamarin.FFImageLoading.2.1.8\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MR.Gestures">
@@ -80,9 +80,9 @@
       <HintPath>$(SolutionDir)\packages\Xam.Plugins.XamJam.BugHound.0.0.1-alpha\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Plugin.XamJam.BugHound.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="PropertyChanged">
-      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
@@ -128,11 +128,11 @@
     <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('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
-  <Import Project="$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <Import Project="$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.PicSelector/packages.config b/XamJam.PicSelector/packages.config
index f42ae79..b47d525 100644
--- a/XamJam.PicSelector/packages.config
+++ b/XamJam.PicSelector/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="MR.Gestures" version="1.3.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Xam.Plugin.Media" version="2.3.0" targetFramework="portable45-net45+win8+wpa81" />
diff --git a/XamJam.Ratings/XamJam.Ratings/XamJam.Ratings.csproj b/XamJam.Ratings/XamJam.Ratings/XamJam.Ratings.csproj
index e1edaec..69a8bc2 100644
--- a/XamJam.Ratings/XamJam.Ratings/XamJam.Ratings.csproj
+++ b/XamJam.Ratings/XamJam.Ratings/XamJam.Ratings.csproj
@@ -54,7 +54,7 @@
       <HintPath>$(SolutionDir)\packages\Xam.Plugins.XamJam.BugHound.0.0.1-alpha\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Plugin.XamJam.BugHound.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -69,12 +69,12 @@
       <HintPath>$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.Shared, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\portable-win8+net45+wp8+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.Shared.dll</HintPath>
+    <Reference Include="XamSvg.Shared, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\portable-win8+net45+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.Shared.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XamSvg.XamForms, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Vapolia.XamSvg.Forms.2.3.2.2\lib\portable-win8+net45+wp8+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.XamForms.dll</HintPath>
+    <Reference Include="XamSvg.XamForms, Version=2.3.2.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Vapolia.XamSvg.Forms.2.3.2.4\lib\portable-win8+net45+wpa81+MonoAndroid44+Xamarin.iOS10\XamSvg.XamForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -99,11 +99,11 @@
     <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('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
-  <Import Project="$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <Import Project="$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Ratings/XamJam.Ratings/packages.config b/XamJam.Ratings/XamJam.Ratings/packages.config
index 7b94f5d..ff81578 100644
--- a/XamJam.Ratings/XamJam.Ratings/packages.config
+++ b/XamJam.Ratings/XamJam.Ratings/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="MR.Gestures" version="1.3.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
-  <package id="Softlion.XamSvg" version="2.3.2.2" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Vapolia.XamSvg.Forms" version="2.3.2.2" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Softlion.XamSvg" version="2.3.2.4" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Vapolia.XamSvg.Forms" version="2.3.2.4" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugins.XamJam.BugHound" version="0.0.1-alpha" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/Plugin.XamJam.Screen.Abstractions.csproj b/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/Plugin.XamJam.Screen.Abstractions.csproj
index e249379..c87226c 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/Plugin.XamJam.Screen.Abstractions.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/Plugin.XamJam.Screen.Abstractions.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,11 +42,28 @@
     <Compile Include="ScreenSize.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Xamarin.iOS">
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Xamarin.iOS\v1.0\Xamarin.iOS.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/packages.config b/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/packages.config
new file mode 100644
index 0000000..78f7718
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.Abstractions/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.Android/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen.Android/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.Android/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.Android/Plugin.XamJam.Screen.Android.csproj b/XamJam.Screen/Plugin.XamJam.Screen.Android/Plugin.XamJam.Screen.Android.csproj
index bdbc058..14aeb30 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.Android/Plugin.XamJam.Screen.Android.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen.Android/Plugin.XamJam.Screen.Android.csproj
@@ -17,6 +17,8 @@
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
     <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,6 +41,10 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -53,6 +59,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -61,7 +68,17 @@
       <Name>Plugin.XamJam.Screen.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.Android/packages.config b/XamJam.Screen/Plugin.XamJam.Screen.Android/packages.config
new file mode 100644
index 0000000..7b06b72
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.Android/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="monoandroid70" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="monoandroid70" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.UWP/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen.UWP/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.UWP/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.UWP/Plugin.XamJam.Screen.UWP.csproj b/XamJam.Screen/Plugin.XamJam.Screen.UWP/Plugin.XamJam.Screen.UWP.csproj
index 9dc7f6a..68d6e16 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.UWP/Plugin.XamJam.Screen.UWP.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen.UWP/Plugin.XamJam.Screen.UWP.csproj
@@ -122,6 +122,9 @@
       <Name>Plugin.XamJam.Screen.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.UWP/project.json b/XamJam.Screen/Plugin.XamJam.Screen.UWP/project.json
index 32d9274..e2d40da 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.UWP/project.json
+++ b/XamJam.Screen/Plugin.XamJam.Screen.UWP/project.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
+    "PropertyChanged.Fody": "1.51.3"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/Plugin.XamJam.Screen.WindowsPhone8.csproj b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/Plugin.XamJam.Screen.WindowsPhone8.csproj
index f7514e4..4c4daca 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/Plugin.XamJam.Screen.WindowsPhone8.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/Plugin.XamJam.Screen.WindowsPhone8.csproj
@@ -18,6 +18,8 @@
     <ValidateXaml>true</ValidateXaml>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -97,9 +99,28 @@
       <Name>Plugin.XamJam.Screen.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/packages.config b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/packages.config
new file mode 100644
index 0000000..f6f61ec
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone8/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="wp8" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="wp8" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/Plugin.XamJam.Screen.WindowsPhone81.csproj b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/Plugin.XamJam.Screen.WindowsPhone81.csproj
index 0ee71e6..0c8b4a2 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/Plugin.XamJam.Screen.WindowsPhone81.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/Plugin.XamJam.Screen.WindowsPhone81.csproj
@@ -16,6 +16,8 @@
     <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -92,6 +94,18 @@
       <Name>Plugin.XamJam.Screen.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
@@ -99,6 +113,13 @@
     <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/packages.config b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/packages.config
new file mode 100644
index 0000000..f92f19c
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsPhone81/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="wpa81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="wpa81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/Plugin.XamJam.Screen.WindowsStore.csproj b/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/Plugin.XamJam.Screen.WindowsStore.csproj
index 200e9cf..3b18783 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/Plugin.XamJam.Screen.WindowsStore.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/Plugin.XamJam.Screen.WindowsStore.csproj
@@ -16,6 +16,8 @@
     <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -114,10 +116,29 @@
       <Name>Plugin.XamJam.Screen.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/packages.config b/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/packages.config
new file mode 100644
index 0000000..d849b9d
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.WindowsStore/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="win81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="win81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.iOS/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen.iOS/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.iOS/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.iOS/Plugin.XamJam.Screen.iOS.csproj b/XamJam.Screen/Plugin.XamJam.Screen.iOS/Plugin.XamJam.Screen.iOS.csproj
index a106b5c..eceb01f 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen.iOS/Plugin.XamJam.Screen.iOS.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen.iOS/Plugin.XamJam.Screen.iOS.csproj
@@ -11,6 +11,8 @@
     <RootNamespace>Plugin.XamJam.Screen</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>Plugin.XamJam.Screen</AssemblyName>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +44,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -53,5 +59,18 @@
       <Name>Plugin.XamJam.Screen.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\dotnet\Fody.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\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen.iOS/packages.config b/XamJam.Screen/Plugin.XamJam.Screen.iOS/packages.config
new file mode 100644
index 0000000..372ba42
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen.iOS/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="xamarinios10" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="xamarinios10" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen/FodyWeavers.xml b/XamJam.Screen/Plugin.XamJam.Screen/FodyWeavers.xml
new file mode 100644
index 0000000..bb0f322
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/XamJam.Screen/Plugin.XamJam.Screen/Plugin.XamJam.Screen.csproj b/XamJam.Screen/Plugin.XamJam.Screen/Plugin.XamJam.Screen.csproj
index d806628..3451b15 100644
--- a/XamJam.Screen/Plugin.XamJam.Screen/Plugin.XamJam.Screen.csproj
+++ b/XamJam.Screen/Plugin.XamJam.Screen/Plugin.XamJam.Screen.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,7 +47,26 @@
     <Compile Include="CrossScreen.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Screen/Plugin.XamJam.Screen/packages.config b/XamJam.Screen/Plugin.XamJam.Screen/packages.config
new file mode 100644
index 0000000..78f7718
--- /dev/null
+++ b/XamJam.Screen/Plugin.XamJam.Screen/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/XamJam.Util/FodyWeavers.xml b/XamJam.Util/FodyWeavers.xml
index bb0f322..7369928 100644
--- a/XamJam.Util/FodyWeavers.xml
+++ b/XamJam.Util/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers>
   <PropertyChanged />
 </Weavers>
\ No newline at end of file
diff --git a/XamJam.Util/XamJam.Util.csproj b/XamJam.Util/XamJam.Util.csproj
index dc312c2..9a6f686 100644
--- a/XamJam.Util/XamJam.Util.csproj
+++ b/XamJam.Util/XamJam.Util.csproj
@@ -56,7 +56,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Threading.Tasks.Dataflow, Version=4.5.24.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -85,15 +85,16 @@
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.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('$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
   <Import Project="$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(SolutionDir)\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Util/packages.config b/XamJam.Util/packages.config
index dd32b3d..74bb249 100644
--- a/XamJam.Util/packages.config
+++ b/XamJam.Util/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Xam.Plugins.XamJam.BugHound" version="0.0.1-alpha" targetFramework="portable45-net45+win8+wpa81" />
diff --git a/XamJam.Wall/FodyWeavers.xml b/XamJam.Wall/FodyWeavers.xml
index bb0f322..7369928 100644
--- a/XamJam.Wall/FodyWeavers.xml
+++ b/XamJam.Wall/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers>
   <PropertyChanged />
 </Weavers>
\ No newline at end of file
diff --git a/XamJam.Wall/Plugin.XamJam.Wall.nuspec b/XamJam.Wall/Plugin.XamJam.Wall.nuspec
index 4dd8954..f7d1ef0 100644
--- a/XamJam.Wall/Plugin.XamJam.Wall.nuspec
+++ b/XamJam.Wall/Plugin.XamJam.Wall.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.8.3">
     <id>Xam.Plugins.XamJam.Wall</id>
-    <version>0.0.2-alpha</version>
+    <version>0.0.3-alpha</version>
     <title>XamJam's Wall</title>
     <authors>Jason C. HandUber, Dr. Catherine Zanbaka</authors>
     <owners>Jason C. HandUber, Dr. Catherine Zanbaka</owners>
diff --git a/XamJam.Wall/XamJam.Wall.csproj b/XamJam.Wall/XamJam.Wall.csproj
index 1a1204f..f423c25 100644
--- a/XamJam.Wall/XamJam.Wall.csproj
+++ b/XamJam.Wall/XamJam.Wall.csproj
@@ -106,11 +106,11 @@
     <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\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <Import Project="..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.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.
   <Target Name="BeforeBuild">
diff --git a/XamJam.Wall/packages.config b/XamJam.Wall/packages.config
index 8f88f4d..864f6d1 100644
--- a/XamJam.Wall/packages.config
+++ b/XamJam.Wall/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
+  <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="MR.Gestures" version="1.3.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />