From ac3b7ad2c9ede725c7864c202f76e552dcc5842f Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 30 Sep 2016 12:41:03 +0200
Subject: [PATCH] XLabs running an App Toolbar!!!

versions : latest stables Xamarin.Forms & XLabs.*

To got it running: a new base android implementation for XLabs usage:

        XFormsCompatApplicationDroid : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity

and the corresponding

        XFormsCompatAppDroid : XFormsApp<XFormsCompatApplicationDroid>

plus the Toolbar instacntiation fix.
---
 .../BookAStar.Droid/BookAStar.Droid.csproj    | 126 ++++---
 BookAStar/BookAStar.Droid/CompatXFormsApp.cs  | 353 ++++++++++++++++++
 BookAStar/BookAStar.Droid/MainActivity.cs     |  42 ++-
 BookAStar/BookAStar.Droid/packages.config     |  37 +-
 BookAStar/BookAStar.iOS/BookAStar.iOS.csproj  |  20 +
 BookAStar/BookAStar.iOS/packages.config       |   4 +
 BookAStar/BookAStar/App.xaml.cs               | 101 ++---
 BookAStar/BookAStar/BookAStar.csproj          |  44 ++-
 BookAStar/BookAStar/packages.config           |  19 +-
 9 files changed, 553 insertions(+), 193 deletions(-)
 create mode 100644 BookAStar/BookAStar.Droid/CompatXFormsApp.cs

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index cf995dc5..9719f770 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -33,7 +33,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>0</WarningLevel>
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
@@ -43,6 +43,9 @@
     <Debugger>Xamarin</Debugger>
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
     <CodeAnalysisRuleSet />
+    <AotAssemblies>False</AotAssemblies>
+    <EnableLLVM>False</EnableLLVM>
+    <EnableProguard>False</EnableProguard>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -71,7 +74,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="GoogleMediaFramework">
@@ -81,8 +84,14 @@
       <HintPath>..\..\packages\MarkdownDeep-av.NET.1.5.2\lib\MonoAndroid10\MarkdownDeep.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
-    <Reference Include="Mono.Android.Export, Version=1.0.6099.33544, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
+    <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v7.0\Mono.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Android.Export, Version=1.0.6110.33687, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v7.0\Mono.Android.Export.dll</HintPath>
+    </Reference>
     <Reference Include="Mono.Data.Sqlite" />
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -152,8 +161,8 @@
       <HintPath>..\..\packages\SQLite.Net.Async-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.Async.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SQLite.Net.Platform.XamarinAndroid, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SQLite.Net-PCL.3.1.1\lib\MonoAndroid\SQLite.Net.Platform.XamarinAndroid.dll</HintPath>
+    <Reference Include="SQLite.Net.Platform.XamarinAndroid, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SQLite.Net.Platform.XamarinAndroid.2.5.1\lib\MonoAndroid\SQLite.Net.Platform.XamarinAndroid.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -202,90 +211,99 @@
       <HintPath>..\..\Components\xamarin.auth-1.2.3.1\lib\android\Xamarin.Auth.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Labs, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Labs.1.0.1.0\lib\portable-net45+win+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Labs.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Maps, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Maps.Android, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Maps.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Ads, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Ads.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Ads.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Analytics">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Analytics.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Analytics, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Analytics.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Base.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Base.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Basement">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Gcm">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Gcm.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Gcm, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Gcm.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Maps">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Maps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Measurement">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Measurement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Measurement.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Measurement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Measurement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Measurement.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Caching, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Caching.SQLite, Version=2.0.5653.32809, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.SQLite.2.0.5653-pre2\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Caching.SQLite.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Caching, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Caching.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
+    <Reference Include="XLabs.Core, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Core.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Caching.Sqlite, Version=2.2.0.38187, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Caching.SQLite.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.Sqlite.dll</HintPath>
+    <Reference Include="XLabs.Forms, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.3.0-pre02\lib\monoandroid\XLabs.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Core.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
+    <Reference Include="XLabs.Forms.Droid, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.3.0-pre02\lib\monoandroid\XLabs.Forms.Droid.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Forms, Version=2.2.0.38180, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\monoandroid\XLabs.Forms.dll</HintPath>
+    <Reference Include="XLabs.IOC, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Forms.Droid, Version=2.2.0.38195, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\monoandroid\XLabs.Forms.Droid.dll</HintPath>
+    <Reference Include="XLabs.Platform, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.3.0-pre02\lib\MonoAndroid\XLabs.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.IOC, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.IoC.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
+    <Reference Include="XLabs.Platform.Droid, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.3.0-pre02\lib\MonoAndroid\XLabs.Platform.Droid.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Platform, Version=2.2.0.38179, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\MonoAndroid\XLabs.Platform.dll</HintPath>
+    <Reference Include="XLabs.Serialization, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Platform.Droid, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\MonoAndroid\XLabs.Platform.Droid.dll</HintPath>
+    <Reference Include="XLabs.Settings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Serialization, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
+    <Reference Include="XLabs.Settings.XamSettings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.XamSettings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.XamSettings.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -295,7 +313,6 @@
     <Compile Include="Helpers\YavscHelpers.cs" />
     <Compile Include="Html.cs" />
     <Compile Include="MainActivity.cs" />
-    <Compile Include="MainApplication.cs" />
     <Compile Include="MarkdownEditor.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -310,6 +327,7 @@
     <Compile Include="Services\GcmRegistrationIntentService.cs" />
     <Compile Include="Services\MyGcmIntentService.cs" />
     <Compile Include="Services\MyInstanceIdListener.cs" />
+    <Compile Include="CompatXFormsApp.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
@@ -442,13 +460,11 @@
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets'))" />
     <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.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\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'))" />
   </Target>
-  <Import Project="..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
   <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.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.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')" />
   <!-- 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/BookAStar/BookAStar.Droid/CompatXFormsApp.cs b/BookAStar/BookAStar.Droid/CompatXFormsApp.cs
new file mode 100644
index 00000000..c8bdfb90
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/CompatXFormsApp.cs
@@ -0,0 +1,353 @@
+// ***********************************************************************
+// Assembly         : XLabs.Forms.Droid
+// Author           : XLabs Team
+// Created          : 12-27-2015
+// 
+// Last Modified By : XLabs Team
+// Last Modified On : 01-04-2016
+// ***********************************************************************
+// <copyright file="XFormsApp.cs" company="XLabs Team">
+//     Copyright (c) XLabs Team. All rights reserved.
+// </copyright>
+// <summary>
+//       This project is licensed under the Apache 2.0 license
+//       https://github.com/XLabs/Xamarin-Forms-Labs/blob/master/LICENSE
+//       
+//       XLabs is a open source project that aims to provide a powerfull and cross 
+//       platform set of controls tailored to work with Xamarin Forms.
+// </summary>
+// ***********************************************************************
+// 
+
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+using XLabs.Platform.Device;
+using XLabs.Platform.Mvvm;
+using XLabs.Platform.Services;
+using XLabs.Platform.Services.Email;
+using XLabs.Platform.Services.Geolocation;
+using XLabs.Platform.Services.IO;
+using XLabs.Platform.Services.Media;
+using Environment = Android.OS.Environment;
+
+namespace XLabs.Forms
+{
+    /// <summary>
+    /// Class XFormsApplicationDroid.
+    /// </summary>
+    public class XFormsCompatApplicationDroid : 
+        global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+    {
+        /// <summary>
+        /// Gets or sets the destroy.
+        /// </summary>
+        /// <value>The destroy.</value>
+        public EventHandler<EventArgs> Destroy { get; set; }
+
+        /// <summary>
+        /// Gets or sets the pause.
+        /// </summary>
+        /// <value>The pause.</value>
+        public EventHandler<EventArgs> Pause { get; set; }
+
+        /// <summary>
+        /// Gets or sets the restart.
+        /// </summary>
+        /// <value>The restart.</value>
+        public EventHandler<EventArgs> Restart { get; set; }
+
+        /// <summary>
+        /// Gets or sets the resume.
+        /// </summary>
+        /// <value>The resume.</value>
+        public EventHandler<EventArgs> Resume { get; set; }
+
+        /// <summary>
+        /// Gets or sets the start.
+        /// </summary>
+        /// <value>The start.</value>
+        public EventHandler<EventArgs> Start { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stop.
+        /// </summary>
+        /// <value>The stop event handler.</value>
+        public EventHandler<EventArgs> Stop { get; set; }
+
+        /// <summary>
+        /// Called when [destroy].
+        /// </summary>
+        protected override void OnDestroy()
+        {
+            var handler = this.Destroy;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnDestroy();
+        }
+
+        /// <summary>
+        /// Called as part of the activity lifecycle when an activity is going into
+        /// the background, but has not (yet) been killed.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <altmember cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnStop" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called as part of the activity lifecycle when an activity is going into
+        /// the background, but has not (yet) been killed.  The counterpart to
+        /// <c><see cref="M:Android.App.Activity.OnResume" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">When activity B is launched in front of activity A, this callback will
+        /// be invoked on A.  B will not be created until A's <c><see cref="M:Android.App.Activity.OnPause" /></c> returns,
+        /// so be sure to not do anything lengthy here.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">This callback is mostly used for saving any persistent state the
+        /// activity is editing, to present a "edit in place" model to the user and
+        /// making sure nothing is lost if there are not enough resources to start
+        /// the new activity without first killing this one.  This is also a good
+        /// place to do things like stop animations and other things that consume a
+        /// noticeable amount of CPU in order to make the switch to the next activity
+        /// as fast as possible, or to close resources that are exclusive access
+        /// such as the camera.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">In situations where the system needs more memory it may kill paused
+        /// processes to reclaim resources.  Because of this, you should be sure
+        /// that all of your state is saved by the time you return from
+        /// this function.  In general <c><see cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" /></c> is used to save
+        /// per-instance state in the activity and this method is used to store
+        /// global persistent data (in content providers, files, etc.)
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">After receiving this call you will usually receive a following call
+        /// to <c><see cref="M:Android.App.Activity.OnStop" /></c> (after the next activity has been resumed and
+        /// displayed), however in some cases there will be a direct call back to
+        /// <c><see cref="M:Android.App.Activity.OnResume" /></c> without going through the stopped state.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onPause()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnPause()
+        {
+            var handler = this.Pause;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnPause();
+        }
+
+        /// <summary>
+        /// Called after <c><see cref="M:Android.App.Activity.OnStop" /></c> when the current activity is being
+        /// re-displayed to the user (the user has navigated back to it).
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnStop" />
+        /// <altmember cref="M:Android.App.Activity.OnStart" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called after <c><see cref="M:Android.App.Activity.OnStop" /></c> when the current activity is being
+        /// re-displayed to the user (the user has navigated back to it).  It will
+        /// be followed by <c><see cref="M:Android.App.Activity.OnStart" /></c> and then <c><see cref="M:Android.App.Activity.OnResume" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">For activities that are using raw <c><see cref="T:Android.Database.ICursor" /></c> objects (instead of
+        /// creating them through
+        /// <c><see cref="M:Android.App.Activity.ManagedQuery(Android.Net.Uri, System.String[], System.String[], System.String[], System.String[])" /></c>,
+        /// this is usually the place
+        /// where the cursor should be required (because you had deactivated it in
+        /// <c><see cref="M:Android.App.Activity.OnStop" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onRestart()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnRestart()
+        {
+            var handler = this.Restart;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnRestart();
+        }
+
+        /// <summary>
+        /// Called after <c><see cref="M:Android.App.Activity.OnRestoreInstanceState(Android.OS.Bundle)" /></c>, <c><see cref="M:Android.App.Activity.OnRestart" /></c>, or
+        /// <c><see cref="M:Android.App.Activity.OnPause" /></c>, for your activity to start interacting with the user.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnRestoreInstanceState(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnRestart" />
+        /// <altmember cref="M:Android.App.Activity.OnPostResume" />
+        /// <altmember cref="M:Android.App.Activity.OnPause" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called after <c><see cref="M:Android.App.Activity.OnRestoreInstanceState(Android.OS.Bundle)" /></c>, <c><see cref="M:Android.App.Activity.OnRestart" /></c>, or
+        /// <c><see cref="M:Android.App.Activity.OnPause" /></c>, for your activity to start interacting with the user.
+        /// This is a good place to begin animations, open exclusive-access devices
+        /// (such as the camera), etc.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">Keep in mind that onResume is not the best indicator that your activity
+        /// is visible to the user; a system window such as the key guard may be in
+        /// front.  Use <c><see cref="M:Android.App.Activity.OnWindowFocusChanged(System.Boolean)" /></c> to know for certain that your
+        /// activity is visible to the user (for example, to resume a game).
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onResume()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnResume()
+        {
+            var handler = this.Resume;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnResume();
+        }
+
+        /// <summary>
+        /// Called after <c><see cref="M:Android.App.Activity.OnCreate(Android.OS.Bundle)" /></c> or after <c><see cref="M:Android.App.Activity.OnRestart" /></c> when
+        /// the activity had been stopped, but is now again being displayed to the
+        /// user.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnCreate(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnStop" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called after <c><see cref="M:Android.App.Activity.OnCreate(Android.OS.Bundle)" /></c> or after <c><see cref="M:Android.App.Activity.OnRestart" /></c> when
+        /// the activity had been stopped, but is now again being displayed to the
+        /// user.  It will be followed by <c><see cref="M:Android.App.Activity.OnResume" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onStart()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnStart()
+        {
+            var handler = this.Start;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnStart();
+        }
+
+        /// <summary>
+        /// Called when you are no longer visible to the user.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnRestart" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <altmember cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnDestroy" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called when you are no longer visible to the user.  You will next
+        /// receive either <c><see cref="M:Android.App.Activity.OnRestart" /></c>, <c><see cref="M:Android.App.Activity.OnDestroy" /></c>, or nothing,
+        /// depending on later user activity.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">Note that this method may never be called, in low memory situations
+        /// where the system does not have enough memory to keep your activity's
+        /// process running after its <c><see cref="M:Android.App.Activity.OnPause" /></c> method is called.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onStop()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnStop()
+        {
+            var handler = this.Stop;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnStop();
+        }
+    }
+
+    /// <summary>
+    /// Class XFormsAppDroid.
+    /// </summary>
+    public class XFormsCompatAppDroid : XFormsApp<XFormsCompatApplicationDroid>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XFormsAppDroid"/> class.
+        /// </summary>
+        public XFormsCompatAppDroid() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XFormsAppDroid"/> class.
+        /// </summary>
+        /// <param name="app">The application.</param>
+        public XFormsCompatAppDroid(XFormsCompatApplicationDroid app) : base(app) { }
+
+        /// <summary>
+        /// Raises the back press.
+        /// </summary>
+        public void RaiseBackPress()
+        {
+            this.OnBackPress();
+        }
+
+        /// <summary>
+        /// Called when [initialize].
+        /// </summary>
+        /// <param name="app">The application.</param>
+        /// <param name="initServices">Should initialize services.</param>
+        protected override void OnInit(XFormsCompatApplicationDroid app, bool initServices = true)
+        {
+            this.AppContext.Start += (o, e) => this.OnStartup();
+            this.AppContext.Stop += (o, e) => this.OnClosing();
+            this.AppContext.Pause += (o, e) => this.OnSuspended();
+            this.AppContext.Resume += (o, e) => this.OnResumed();
+            this.AppDataDirectory = Environment.ExternalStorageDirectory.AbsolutePath;
+
+            if (initServices)
+            {
+                DependencyService.Register<TextToSpeechService>();
+                DependencyService.Register<Geolocator>();
+                DependencyService.Register<MediaPicker>();
+                DependencyService.Register<SoundService>();
+                DependencyService.Register<EmailService>();
+                DependencyService.Register<FileManager>();
+                DependencyService.Register<AndroidDevice>();
+            }
+
+            base.OnInit(app);
+        }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index ebbab814..37d5ed43 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -38,17 +38,24 @@ using SQLite.Net;
 using XLabs.Ioc;
 using XLabs.Platform.Mvvm;
 using XLabs.Caching;
+using XLabs;
+using XLabs.Enums;
 
 namespace BookAStar.Droid
 {
     [Activity(Name="fr.pschneider.bas.MainActivity", Label = "BookAStar", Theme = "@style/MainTheme", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity :
-        XFormsApplicationDroid,
-        // was global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
+
+        // global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
+        XFormsCompatApplicationDroid,
         IPlatform, IComponentContext
     {
         protected override void OnCreate(Bundle bundle)
         {
+
+            TabLayoutResource = Resource.Layout.Tabbar;
+            ToolbarResource = Resource.Layout.Toolbar;
+
             base.OnCreate(bundle);
 
             if (Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
@@ -56,14 +63,14 @@ namespace BookAStar.Droid
                 Android.Webkit.WebView.SetWebContentsDebuggingEnabled(true);
             }
 
-            IXFormsApp<XFormsApplicationDroid> app =null;
+            IXFormsApp<XFormsCompatApplicationDroid> app =null;
             if (!Resolver.IsSet)
             {
                 this.SetIoc();
             }
             else
             {
-                app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsApplicationDroid>;
+                app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsCompatApplicationDroid>;
                 if (app != null)
                     app.AppContext = this;
             }
@@ -79,17 +86,15 @@ namespace BookAStar.Droid
                 }
             };
 
-            //TabLayoutResource = Resource.Layout.Tabbar;
-            //ToolbarResource = Resource.Layout.Toolbar;
 
             // Theme.Resources.FinishPreloading();
             // Theme.ApplyStyle(Resource.Style.MainTheme, false);
 
             // XmlREader tb = Resources.GetLayout(Resource.Layout.Toolbar);
             // FIXME Why does Forms try to theme this toolbar?
-             var tb = new Toolbar(this.BaseContext);
-             this.SetActionBar(tb);
-            
+            var tb = new Toolbar(this);
+            this.SetActionBar(tb);
+            // this.SetTheme(Resource.Style.MainTheme);
             LoadApplication(new BookAStar.App(this));
             // TabLayoutResource = Resource.Layout.Tabbar;
             // ToolbarResource = Resource.Layout.Toolbar;
@@ -108,7 +113,7 @@ namespace BookAStar.Droid
         {
             var resolverContainer = new SimpleContainer();
 
-            var app = new XFormsAppDroid();
+            var app = new XFormsCompatAppDroid();
 
             app.Init(this);
 
@@ -124,9 +129,14 @@ namespace BookAStar.Droid
                 .Register<IDependencyContainer>(resolverContainer)
                 .Register<IXFormsApp>(app)
                 .Register<ISecureStorage>(t => new KeyVaultStorage(t.Resolve<IDevice>().Id.ToCharArray()))
+               
+                /*
                 .Register<ICacheProvider>(
                     t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
-                        new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));
+                        new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()))
+                        
+            */
+                        ;
             Resolver.SetResolver(resolverContainer.GetResolver());
         }
 
@@ -147,6 +157,11 @@ namespace BookAStar.Droid
             }
         }
 
+        public App AppContext
+        {
+            get;set;
+        }
+
         bool StartNotifications()
         {
             if (IsPlayServicesAvailable(out gCMStatusMessage))
@@ -423,6 +438,11 @@ namespace BookAStar.Droid
         {
             throw new NotImplementedException();
         }
+
+        public void Init(App context, bool initServices = true)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
 
diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config
index 44911c6e..22387ca9 100644
--- a/BookAStar/BookAStar.Droid/packages.config
+++ b/BookAStar/BookAStar.Droid/packages.config
@@ -7,6 +7,7 @@
   <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Async-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="monoandroid70" />
+  <package id="SQLite.Net.Platform.XamarinAndroid" version="2.5.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="Xam.Plugin.Connectivity" version="2.2.12" targetFramework="monoandroid70" />
   <package id="Xam.Plugin.DeviceInfo" version="2.0.2" targetFramework="monoandroid70" />
@@ -22,22 +23,22 @@
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Controls.SignaturePad" version="1.4.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms.Labs" version="1.0.1.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Gcm" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Measurement" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="XLabs.Caching" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Caching.SQLite" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Settings" version="2.0.5782" targetFramework="monoandroid70" />
-  <package id="XLabs.Settings.XamSettings" version="2.0.5782" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Gcm" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Measurement" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Caching.SQLite" version="2.0.5653-pre2" targetFramework="monoandroid70" />
+  <package id="XLabs.Core" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Forms" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.IoC" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Platform" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Settings.XamSettings" version="2.3.0-pre02" targetFramework="monoandroid70" />
 </packages>
\ No newline at end of file
diff --git a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
index 0cce83b0..59e07669 100644
--- a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
+++ b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
@@ -136,6 +136,14 @@
       <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Maps.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Maps.iOS.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
@@ -149,6 +157,18 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.iOS" />
+    <Reference Include="XLabs.Caching, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Serialization, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Settings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Yavsc.Client\Yavsc.Client.csproj">
diff --git a/BookAStar/BookAStar.iOS/packages.config b/BookAStar/BookAStar.iOS/packages.config
index b78e7945..fa5dcff1 100644
--- a/BookAStar/BookAStar.iOS/packages.config
+++ b/BookAStar/BookAStar.iOS/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="xamarinios10" />
+  <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="xamarinios10" />
+  <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="xamarinios10" />
+  <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index b8de6756..0232ef16 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -48,7 +48,7 @@ namespace BookAStar
         // by Views resolution, and then, drop it
         public static App CurrentApp { get { return Current as App; } }
 
-        public static void Init()
+        public void Init()
         {
             var app = Resolver.Resolve<IXFormsApp>();
             
@@ -56,7 +56,7 @@ namespace BookAStar
             {
                 return;
             }
-
+            Configure(app);
             app.Closing += (o, e) => Debug.WriteLine("Application Closing");
             app.Error += (o, e) => Debug.WriteLine("Application Error");
             app.Initialize += (o, e) => Debug.WriteLine("Application Initialized");
@@ -64,9 +64,9 @@ namespace BookAStar
             app.Rotation += (o, e) => Debug.WriteLine("Application Rotated");
             app.Startup += (o, e) => Debug.WriteLine("Application Startup");
             app.Suspended += (o, e) => Debug.WriteLine("Application Suspended");
-
         }
-        public void Configure(IXFormsApp app)
+
+        private void Configure(IXFormsApp app)
         {
             ViewFactory.EnableCache = true;
             ViewFactory.Register<DashboardPage, DashboardViewModel>(
@@ -85,6 +85,9 @@ namespace BookAStar
             InitializeComponent();
             Init();
             BuildMainPage();
+
+            NavigationPage.SetHasNavigationBar(MainPage, true);
+            NavigationPage.SetHasBackButton(MainPage, true);
         }
         BookQueriesPage bQueriesPage;
         AccountChooserPage accChooserPage;
@@ -97,13 +100,14 @@ namespace BookAStar
             bQueriesPage = new BookQueriesPage
             {
                 BindingContext = DataManager.Current.BookQueries,
-                Title = "Demandes"
+                Title = "Demandes",
+                Icon = "icon.png"
             };
 
-            home = new HomePage() { Title = "Accueil" };
+            home = new HomePage() { Title = "Accueil", Icon = "icon.png" };
 
             // var mainPage = new NavigationPage(bQueriesPage);
-            /*
+            
             masterDetail = new ExtendedMasterDetailPage() {
                 Title="MainPAge"
             };
@@ -111,9 +115,10 @@ namespace BookAStar
             masterDetail.Master = new DashboardPage {
                 Title = "Bookingstar",
                 BindingContext = new DashboardViewModel() };
-            masterDetail.Detail = new HomePage { Title = "Accueil" };
 
-            */
+            masterDetail.Detail = home;
+
+            
             ToolbarItem tiSetts = new ToolbarItem()
             {
                 Text = "Paramètres",
@@ -125,75 +130,9 @@ namespace BookAStar
                 Text = "Accueil",
                 Icon = "icon.png"
             };
-
           
-
-
-
-
-            /*     searchPage = new SearchPage
-                 {
-                     Title = "Trouvez votre artiste",
-                     Icon = "glyphish_07_map_marker.png"
-                 };
-
-                  settingsPage = new SettingsPage
-                 {
-                     Title = "Paramètres",
-                     Icon = "ic_corp_icon.png"
-                 };
-
-                  pinPage = new PinPage
-                 {
-                     Title = "Carte",
-                     Icon = "glyphish_07_map_marker.png"
-                 };
-                 PlatformSpecificInstance = instance;
-                 Navigation = new NavigationPage(searchPage);
-
-                 //var hasLabelStyle = r.ContainsKey("labelStyle");
-                 // var stid = this.StyleId;
-                 // null var appsstyle = settingsPage.Style;
-                 // appsstyle.CanCascade = true;
-                 MainPage = Navigation;
-                 ToolbarItem tiSetts = new ToolbarItem()
-                 {
-                     Text = "Settings",
-                     Icon = "ic_corp_icon.png"
-                 };
-                 Navigation.ToolbarItems.Add(tiSetts);
-                 tiSetts.Clicked += (object sender, EventArgs e) =>
-                 {
-                     ShowPage (settingsPage);
-                 };
-                 ToolbarItem tiQueries = new ToolbarItem
-                 {
-                     Text = "Demandes"
-                 };
-
-                 tiQueries.Clicked += (object sender, EventArgs e) =>
-                 {
-                     BookQueriesPage bookQueriesPage = new BookQueriesPage
-                     {
-                         Title = "Demandes de devis"
-                     };
-                     bookQueriesPage.BindingContext = DataManager.BookQueries;
-                     ShowPage(bookQueriesPage);
-                 };
-                 Navigation.ToolbarItems.Add(tiQueries);
-                 ToolbarItem tiMap = new ToolbarItem
-                 {
-                     Text = "Carte",
-                     Icon = "glyphish_07_map_marker.png"
-                 };
-                 Navigation.ToolbarItems.Add(tiMap);
-                 tiMap.Clicked += (object sender, EventArgs e) =>
-                 {
-                     ShowPage(pinPage);
-                 };
-                 MainPage = Navigation;
-                 */
-            var mainTab = new ExtendedTabbedPage()
+          // FIXME  "Tabs not supported in this configuration"
+             var mainTab = new ExtendedTabbedPage()
             {
                 Title = "XLabs",
                 SwipeEnabled = true,
@@ -203,8 +142,10 @@ namespace BookAStar
                 TabBarBackgroundImage = "visuel_sexion.png",
                 TabBarSelectedImage = "icon.png",
             };
-
-            var navPage = new NavigationPage(bQueriesPage);
+            var navPage = new NavigationPage(masterDetail) {
+                Title = "Navigation",
+                Icon = "icon.png"
+            } ;
             //var navPage = new NavigationPage(mainTab);
             
             navPage.ToolbarItems.Add(tiHome);
@@ -237,7 +178,7 @@ namespace BookAStar
         public static void ShowBookQuery (BookQueryData query)
         {
            var page = ViewFactory.CreatePage<BookQueryViewModel
-                , BookQueryPage>(null, new BookQueryViewModel(query));
+                , BookQueryPage>((b,p)=> p.BindingContext = new BookQueryViewModel(query));
            App.Current.MainPage.Navigation.PushAsync(page as Page);
         }
 
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index f75de879..f476d5a0 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -201,47 +201,51 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <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>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\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="XLabs.Caching, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Caching.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
+    <Reference Include="XLabs.Caching, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Core.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
+    <Reference Include="XLabs.Core, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Core.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Forms, Version=2.2.0.38180, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Forms.dll</HintPath>
+    <Reference Include="XLabs.Forms, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.IOC, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.IoC.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
+    <Reference Include="XLabs.IOC, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Platform, Version=2.2.0.38179, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Platform.dll</HintPath>
+    <Reference Include="XLabs.Platform, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Serialization, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
+    <Reference Include="XLabs.Serialization, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Serialization.Json.NET, Version=2.2.0.38187, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Serialization.JSON.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.Json.NET.dll</HintPath>
+    <Reference Include="XLabs.Serialization.Json.NET, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.JSON.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.Json.NET.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Settings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -302,12 +306,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.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">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\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'))" />
   </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/BookAStar/BookAStar/packages.config b/BookAStar/BookAStar/packages.config
index 25d993d0..ce4629e8 100644
--- a/BookAStar/BookAStar/packages.config
+++ b/BookAStar/BookAStar/packages.config
@@ -7,13 +7,14 @@
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugins.Settings" version="2.5.1.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms.Maps" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Caching" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Serialization.JSON" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Core" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Forms" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.IoC" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Platform" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Serialization.JSON" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file