diff --git a/NuGetPackage/NuGetPackage.nuspec b/NuGetPackage/NuGetPackage.nuspec
index 1b5a4d5..53284c5 100644
Binary files a/NuGetPackage/NuGetPackage.nuspec and b/NuGetPackage/NuGetPackage.nuspec differ
diff --git a/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs b/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs
index ee8a36d..3bd1231 100644
--- a/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs
+++ b/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs
@@ -1,15 +1,15 @@
 #pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 4.0.30319.17020
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
 
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("SolTech.Xamarin.Forms.Android.Resource", IsApplication=false)]
+[assembly: Android.Runtime.ResourceDesignerAttribute("SolTech.Xamarin.Forms.Android.Resource", IsApplication=false)]
 
 namespace SolTech.Xamarin.Forms.Android
 {
diff --git a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj
index 117ebae..08888b5 100644
--- a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj
+++ b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A7135FD6-C10D-446E-AFAF-32ED0D50A46C}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
@@ -16,6 +14,9 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <NuGetPackageImportStamp>1c898bc0</NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <ReleaseVersion>
+    </ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,29 +35,29 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
-    </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.Android.Support.v4">
+      <HintPath>..\..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -76,17 +78,17 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Soltech.Xamarin.Forms\SolTech.Xamarin.Forms.csproj">
-      <Project>{ece6750d-6d1e-449d-8da9-59031fa5d924}</Project>
+      <Project>{ECE6750D-6D1E-449D-8DA9-59031FA5D924}</Project>
       <Name>SolTech.Xamarin.Forms</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.1.3.4.6332\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.3.4.6332\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SolTech.Xamarin.Forms.Android/packages.config b/SolTech.Xamarin.Forms.Android/packages.config
index d72c2f0..9c6a1f3 100644
--- a/SolTech.Xamarin.Forms.Android/packages.config
+++ b/SolTech.Xamarin.Forms.Android/packages.config
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid22" />
-  <package id="Xamarin.Forms" version="1.2.3.6257" targetFramework="MonoAndroid22" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Xamarin.Android.Support.v4" version="21.0.3.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Forms" version="1.3.4.6332" targetFramework="MonoAndroid50" />
 </packages>
\ No newline at end of file
diff --git a/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs b/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs
index efa5178..9be6a30 100644
--- a/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs
+++ b/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs
@@ -1,8 +1,9 @@
 
-using MonoTouch.UIKit;
+using UIKit;
 using SolTech.Forms;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
+using CoreText;
 
 [assembly: ExportRenderer(typeof(LimitedEntry), typeof(SolTech.Forms.iOS.LimitedEntryRenderer))]
 
@@ -10,6 +11,10 @@ namespace SolTech.Forms.iOS
 {
     public class LimitedEntryRenderer : EntryRenderer
     {
+		public LimitedEntryRenderer ()
+		{
+			
+		}
         protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
         {
             base.OnElementChanged(e);
diff --git a/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs b/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs
index 4a86e74..1c72b93 100644
--- a/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs
+++ b/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs
@@ -1,7 +1,8 @@
-using MonoTouch.UIKit;
+using UIKit;
 using SolTech.Forms;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
+using System;
 
 [assembly: ExportRenderer(typeof(ToggleSelector), typeof(SolTech.Forms.iOS.ToggleSelectorRenderer))]
 
@@ -46,7 +47,7 @@ private void ValueChangedListener(object sender, System.EventArgs args)
             var nativeSegmentedControl = sender as UISegmentedControl;
             if (nativeSegmentedControl == null) return;
 
-            this.Element.SelectedItem = (ToggleSelectorItem)nativeSegmentedControl.SelectedSegment;
+			this.Element.SelectedItem = (ToggleSelectorItem)(int)nativeSegmentedControl.SelectedSegment;
         }
 
         protected override void OnElementPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
diff --git a/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs b/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs
index 99aa55e..14ce759 100644
--- a/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs
+++ b/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
diff --git a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj
index 87ef352..458a10b 100644
--- a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj
+++ b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj
@@ -2,15 +2,18 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{5939F192-6E02-4AFA-9929-8566E172C94C}</ProjectGuid>
-    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>SolTech.Xamarin.Forms.iOS</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>SolTech.Xamarin.Forms.iOS</AssemblyName>
     <NuGetPackageImportStamp>777766b9</NuGetPackageImportStamp>
+    <ReleaseVersion>
+    </ReleaseVersion>
+    <TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,32 +48,32 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="monotouch" />
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
+    <Reference Include="Xamarin.iOS" />
     <Reference Include="Xamarin.Forms.Platform.iOS">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.1.3.4.6332\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\packages\Xamarin.Forms.1.3.4.6332\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.1.3.4.6332\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Soltech.Xamarin.Forms\SolTech.Xamarin.Forms.csproj">
-      <Project>{ece6750d-6d1e-449d-8da9-59031fa5d924}</Project>
+      <Project>{ECE6750D-6D1E-449D-8DA9-59031FA5D924}</Project>
       <Name>SolTech.Xamarin.Forms</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+  <Import Project="..\..\packages\Xamarin.Forms.1.3.4.6332\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.3.4.6332\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets'))" />
   </Target>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SolTech.Xamarin.Forms.iOS/packages.config b/SolTech.Xamarin.Forms.iOS/packages.config
index 6857021..96a09c6 100644
--- a/SolTech.Xamarin.Forms.iOS/packages.config
+++ b/SolTech.Xamarin.Forms.iOS/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Forms" version="1.2.3.6257" targetFramework="MonoTouch10" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Xamarin.Forms" version="1.3.4.6332" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/Soltech.Xamarin.Forms.WinPhone/Soltech.Xamarin.Forms.WinPhone.csproj b/Soltech.Xamarin.Forms.WinPhone/Soltech.Xamarin.Forms.WinPhone.csproj
index cd9aaf7..89656d8 100644
--- a/Soltech.Xamarin.Forms.WinPhone/Soltech.Xamarin.Forms.WinPhone.csproj
+++ b/Soltech.Xamarin.Forms.WinPhone/Soltech.Xamarin.Forms.WinPhone.csproj
@@ -118,12 +118,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Soltech.Xamarin.Forms.userprefs b/Soltech.Xamarin.Forms.userprefs
new file mode 100644
index 0000000..aba0891
--- /dev/null
+++ b/Soltech.Xamarin.Forms.userprefs
@@ -0,0 +1,11 @@
+<Properties StartupItem="Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench />
+  <MonoDevelop.Ide.DebuggingService.Breakpoints>
+    <BreakpointStore />
+  </MonoDevelop.Ide.DebuggingService.Breakpoints>
+  <MonoDevelop.Ide.DebuggingService.PinnedWatches>
+    <Watch file="../AMS.Core/ViewModels/BaseViewModel.cs" line="101" offsetX="520" offsetY="1500" expression="location" liveUpdate="False" />
+    <Watch file="../AMS.Core/Core/Extensions/BindablePropertyExtensions.cs" line="62" offsetX="602" offsetY="915" expression="binding.Binding" liveUpdate="False" />
+  </MonoDevelop.Ide.DebuggingService.PinnedWatches>
+</Properties>
\ No newline at end of file
diff --git a/Soltech.Xamarin.Forms/Controls/LimitedEntry.cs b/Soltech.Xamarin.Forms/Controls/LimitedEntry.cs
index c2b1df2..e0c7fda 100644
--- a/Soltech.Xamarin.Forms/Controls/LimitedEntry.cs
+++ b/Soltech.Xamarin.Forms/Controls/LimitedEntry.cs
@@ -6,7 +6,7 @@ public class LimitedEntry : Xamarin.Forms.Entry
     {
         /// <summary>Identifies the MaxLength bindable property.</summary>
         /// <remarks />
-        public static readonly BindableProperty MaxLengthProperty = BindableProperty.Create("MaxLength", typeof(int), typeof(LimitedEntry), -1, BindingMode.OneWay, null, null, null, null);
+		public static readonly BindableProperty MaxLengthProperty = BindableProperty.Create<LimitedEntry, int>(t => t.MaxLength, -1);
 
         public int MaxLength
         {
diff --git a/Soltech.Xamarin.Forms/Controls/StatefulButton.cs b/Soltech.Xamarin.Forms/Controls/StatefulButton.cs
index ce0a7ba..686e388 100644
--- a/Soltech.Xamarin.Forms/Controls/StatefulButton.cs
+++ b/Soltech.Xamarin.Forms/Controls/StatefulButton.cs
@@ -4,8 +4,9 @@ namespace SolTech.Forms
 {
     public class StatefulButton : Button
     {
-        public static readonly BindableProperty EnabledColorProperty = BindableProperty.Create("EnabledColor", typeof(Color), typeof(StatefulButton), Color.Gray, BindingMode.OneWay, null, StatefulButton.ColorsChanged, null, null);
-        public static readonly BindableProperty DisabledColorProperty = BindableProperty.Create("DisabledColor", typeof(Color), typeof(StatefulButton), Color.Gray, BindingMode.OneWay, null, StatefulButton.ColorsChanged, null, null);
+		public static readonly BindableProperty EnabledColorProperty = BindableProperty.Create<StatefulButton, Color>(t => t.EnabledColor, Color.Gray, BindingMode.OneWay, null, StatefulButton.ColorsChanged);
+
+		public static readonly BindableProperty DisabledColorProperty = BindableProperty.Create<StatefulButton, Color>(t => t.DisabledColor, Color.Gray, BindingMode.OneWay, null, StatefulButton.ColorsChanged);
 
         public StatefulButton()
         {
@@ -45,7 +46,7 @@ public Color DisabledColor
             }
         }
 
-        private static void ColorsChanged(BindableObject bindable, object oldValue, object newValue)
+		private static void ColorsChanged(BindableObject bindable, Color oldValue, Color newValue)
         {
             StatefulButton statefuleButton = (StatefulButton)bindable;
             if (statefuleButton != null)
diff --git a/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs b/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs
index 87b7d7e..c4d42e7 100644
--- a/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs
+++ b/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs
@@ -86,4 +86,4 @@ private ILocalizer GetLocalizer(Assembly assembly)
             return _localizer;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj
index beb5cc0..8f0c264 100644
--- a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj
+++ b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
@@ -16,6 +16,8 @@
     <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <NuGetPackageImportStamp>109141f9</NuGetPackageImportStamp>
+    <ReleaseVersion>
+    </ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,24 +54,13 @@
     <Compile Include="Localization\EmbeddedResourceLocalizer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.1.2.3.6257\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.1.4.2.6359\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.4.2.6359\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.1.2.3.6257\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.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.
@@ -78,4 +69,18 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\packages\Xamarin.Forms.1.4.2.6359\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\packages\Xamarin.Forms.1.4.2.6359\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\packages\Xamarin.Forms.1.4.2.6359\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Soltech.Xamarin.Forms/packages.config b/Soltech.Xamarin.Forms/packages.config
index 56bba31..596cc49 100644
--- a/Soltech.Xamarin.Forms/packages.config
+++ b/Soltech.Xamarin.Forms/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Forms" version="1.2.3.6257" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Xamarin.Forms" version="1.4.2.6359" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
 </packages>
\ No newline at end of file