diff --git a/ExpressionBuilder/ExpressionBuilder/ExpressionBuilder.csproj b/ExpressionBuilder/ExpressionBuilder/ExpressionBuilder.csproj
index 71530295..65606e00 100644
--- a/ExpressionBuilder/ExpressionBuilder/ExpressionBuilder.csproj
+++ b/ExpressionBuilder/ExpressionBuilder/ExpressionBuilder.csproj
@@ -141,7 +141,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.6</Version>
+      <Version>6.0.8</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
diff --git a/MALCLient.UrlInterceptor/project.json b/MALCLient.UrlInterceptor/project.json
index 5476c2ce..472259cb 100644
--- a/MALCLient.UrlInterceptor/project.json
+++ b/MALCLient.UrlInterceptor/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.6"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.8"
   },
   "frameworks": {
     "uap10.0.10586": {}
diff --git a/MALClient.Android/AndroidViewModelLocator.cs b/MALClient.Android/AndroidViewModelLocator.cs
index 14187ce9..9051e368 100644
--- a/MALClient.Android/AndroidViewModelLocator.cs
+++ b/MALClient.Android/AndroidViewModelLocator.cs
@@ -21,7 +21,7 @@
 using MALClient.Android.ViewModels;
 using MALClient.XShared.Interfaces;
 using MALClient.XShared.ViewModels;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 
 namespace MALClient.Android
 {
diff --git a/MALClient.CommTest/project.json b/MALClient.CommTest/project.json
index 873119f1..e792e9fd 100644
--- a/MALClient.CommTest/project.json
+++ b/MALClient.CommTest/project.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.6",
-    "xunit": "2.1.0",
-    "xunit.runner.visualstudio": "2.1.0"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.8",
+    "xunit": "2.3.1",
+    "xunit.runner.visualstudio": "2.3.1"
   },
   "frameworks": {
     "uap10.0.10586": {}
diff --git a/MALClient.Desktop/MALClient.UWP.Desktop.csproj b/MALClient.Desktop/MALClient.UWP.Desktop.csproj
index a927928f..55ffdb6c 100644
--- a/MALClient.Desktop/MALClient.UWP.Desktop.csproj
+++ b/MALClient.Desktop/MALClient.UWP.Desktop.csproj
@@ -252,7 +252,7 @@
     <Compile Include="Managers\NavMgr.cs" />
     <Compile Include="ViewModels\HamburgerControlViewModel.cs" />
     <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="ViewModels\DekstopViewModelLocator.cs" />
+    <Compile Include="ViewModels\DesktopViewModelLocator.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -578,7 +578,7 @@
       <Version>4.1.6</Version>
     </PackageReference>
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.6.13</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Advertising.XAML">
       <Version>10.1705.16001</Version>
@@ -587,25 +587,25 @@
       <Version>2.2.29</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.6</Version>
+      <Version>6.0.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Services.Store.SDK">
       <Version>10.1705.16001</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>2.1.1</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
-      <Version>2.1.1</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>2.1.1</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="MvvmLightLibs">
-      <Version>5.3.0</Version>
+      <Version>5.4.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
+      <Version>11.0.1</Version>
     </PackageReference>
     <PackageReference Include="WinRTXamlToolkit">
       <Version>2.3.0</Version>
diff --git a/MALClient.Desktop/MainPage.xaml b/MALClient.Desktop/MainPage.xaml
index 8a3e3316..4ec97584 100644
--- a/MALClient.Desktop/MainPage.xaml
+++ b/MALClient.Desktop/MainPage.xaml
@@ -118,7 +118,6 @@
 			<Grid>
 				<Button IsTabStop="False" HorizontalAlignment="Left"
                         BorderThickness="1"
-                       Visibility="Visible"
                         Width="48" Height="48" Background="Transparent" 
                         Command="{Binding ReversePaneCommand}" 
                         Style="{StaticResource ButtonRevealStyle}">
@@ -195,10 +194,10 @@
 			<Grid x:Name="MainTitleBar" Width="Auto" Height="Auto"  Background="Transparent">
 			</Grid>
 			<Button Grid.Column="0" IsTabStop="False" HorizontalAlignment="Left"
-				VerticalAlignment="Center" Width="48" Height="32"
+				VerticalAlignment="Stretch" Width="48" Height="Auto"
 				Command="{Binding NavigateMainBackCommand}"
 				Visibility="{Binding NavigateMainBackButtonVisibility,Converter={StaticResource BoolToVisibilityConverter}}"
-				Background="Transparent" BorderThickness="0">
+				Style="{StaticResource NavigationBackButtonNormalStyle}">
 				<TextBlock x:Name="BackButtonText" FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE830;"/>
 			</Button>
 			<!-- Start Integrated Header -->
@@ -334,7 +333,7 @@
 									QuerySubmitted="SearchInput_OnQuerySubmitted"
 									Text="{Binding CurrentSearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
 									Visibility="{Binding SearchInputVisibility, Converter={StaticResource BoolToVisibilityConverter}}"
-									PlaceholderText="Search..." Height="32" MinWidth="250" />
+									PlaceholderText="Search..." Height="32" MinWidth="250" Margin="0,0,5,0" />
 							<userControls:LockableToggleButton IsTabStop="False" LockToggle="{Binding SearchToggleLock}"
                                                IsThreeState="False"
                                                VerticalAlignment="Center" Width="48" Height="48"
@@ -403,8 +402,7 @@
                             <Grid Background="Transparent">
                                 <TextBlock Text="New update! What's new?" FontWeight="Bold" Foreground="White"
                                            HorizontalAlignment="Left" Margin="10,5" />
-                                <Button Style="{StaticResource TextBlockButtonStyle}" HorizontalAlignment="Right" Foreground="White"
-                                        Click="ButtonCloseChangelogOnClick">
+								<Button HorizontalAlignment="Right" Foreground="White" Background="Transparent" Click="ButtonCloseChangelogOnClick" BorderThickness="1">
                                     <SymbolIcon Symbol="Cancel"/>
                                 </Button>
                             </Grid>
diff --git a/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml b/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml
index 8f288c55..a19bb16a 100644
--- a/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml
+++ b/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml
@@ -91,7 +91,7 @@
                     TintOpacity="0.7"
                     FallbackColor="{StaticResource ColorPivotInnerHeaderBarBackground}"/>
             </Grid.Background>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+			<StackPanel x:Name="DestStack" Orientation="Horizontal" HorizontalAlignment="Center">
                 <uwp:FontAwesome Icon="{Binding Icon,Converter={StaticResource DummyFontAwesomeToRealFontAwesomeConverter}}" FontSize="28" Margin="10,0" VerticalAlignment="Center"/>
                 <TextBlock Text="{Binding Title}" HorizontalAlignment="Center" FontSize="28" FontWeight="Medium" VerticalAlignment="Center" Margin="0,5"/>
             </StackPanel>
diff --git a/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml.cs b/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml.cs
index fc187628..cdb3ada7 100644
--- a/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml.cs
+++ b/MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml.cs
@@ -8,6 +8,7 @@
 using MALClient.XShared.ViewModels;
 using MALClient.XShared.ViewModels.Forums;
 using MALClient.XShared.ViewModels.Forums.Items;
+using Windows.UI.Xaml.Media.Animation;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -37,7 +38,13 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             _args = e.Parameter as ForumsBoardNavigationArgs;
             base.OnNavigatedTo(e);
-        }
+
+			ConnectedAnimation anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("header");
+			if (anim != null)
+			{
+				anim.TryStart(DestStack);
+			}
+		}
 
         private void TopicOnClick(object sender, ItemClickEventArgs e)
         {
diff --git a/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml b/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml
index bb8674d5..e94d3b47 100644
--- a/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml
+++ b/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml
@@ -90,7 +90,7 @@
                                                                         CommandParameter="{Binding Board}" />
                                                     </MenuFlyout>
                                                 </FlyoutBase.AttachedFlyout>
-                                                <StackPanel Orientation="Horizontal">
+												<StackPanel x:Name="SourceStack"  Orientation="Horizontal">
                                                     <fa:FontAwesome Icon="{Binding Icon,Converter={StaticResource DummyFontAwesomeToRealFontAwesomeConverter}}" FontSize="21" Margin="10,0" />
                                                     <TextBlock Text="{Binding Entry.Name}" FontWeight="Medium"
                                                                FontSize="19" />
diff --git a/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml.cs b/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml.cs
index 953f8d95..bafa321c 100644
--- a/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml.cs
+++ b/MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml.cs
@@ -9,6 +9,7 @@
 using MALClient.XShared.ViewModels;
 using MALClient.XShared.ViewModels.Forums;
 using MALClient.XShared.ViewModels.Forums.Items;
+using Windows.UI.Xaml.Media.Animation;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -34,7 +35,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
         private void BoardGridOnItemClick(object sender, ItemClickEventArgs e)
         {
-            ViewModel.NavigateBoardCommand.Execute((e.ClickedItem as ForumBoardEntryViewModel).Board);
+			(sender as GridView).PrepareConnectedAnimation("header", e.ClickedItem, "SourceStack");
+			ViewModel.NavigateBoardCommand.Execute((e.ClickedItem as ForumBoardEntryViewModel).Board);
         }
 
         private void BoardGridOnRightClick(object sender, RightTappedRoutedEventArgs e)
diff --git a/MALClient.Desktop/Pages/Main/AnimeListPage.xaml b/MALClient.Desktop/Pages/Main/AnimeListPage.xaml
index 857bfab3..6ec64492 100644
--- a/MALClient.Desktop/Pages/Main/AnimeListPage.xaml
+++ b/MALClient.Desktop/Pages/Main/AnimeListPage.xaml
@@ -165,8 +165,7 @@
             </GridView.ItemContainerTransitions>
             <GridView.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <ItemsWrapGrid Margin="0,0,0,0" Orientation="Horizontal" HorizontalAlignment="Center"
-                                   ItemWidth="200" ItemHeight="350" />
+                    <ItemsWrapGrid Orientation="Horizontal" HorizontalAlignment="Center" CacheLength="8.0" />
                 </ItemsPanelTemplate>
             </GridView.ItemsPanel>
             <GridView.ItemTemplate>
diff --git a/MALClient.Desktop/Pages/Main/CalendarPage.xaml b/MALClient.Desktop/Pages/Main/CalendarPage.xaml
index 97c3582b..0e6d335c 100644
--- a/MALClient.Desktop/Pages/Main/CalendarPage.xaml
+++ b/MALClient.Desktop/Pages/Main/CalendarPage.xaml
@@ -55,8 +55,7 @@
                                         <GridView.ItemsPanel>
                                             <ItemsPanelTemplate>
                                                 <ItemsWrapGrid Margin="0,0,16,0" Orientation="Horizontal"
-                                                               HorizontalAlignment="Stretch"
-                                                               ItemWidth="200" ItemHeight="350" />
+                                                               HorizontalAlignment="Stretch" />
                                             </ItemsPanelTemplate>
                                         </GridView.ItemsPanel>
                                     </GridView>
@@ -83,7 +82,7 @@
             <Pivot.Resources>
                 <Style TargetType="PivotHeaderItem" BasedOn="{StaticResource PivotHeaderOuterProfilePage}" />
                 <Style TargetType="GridView">
-                    <Setter Property="Margin" Value="1,1-5,0" />
+                    <Setter Property="Margin" Value="0" />
                     <Setter Property="MinWidth" Value="200" />
                     <Setter Property="IsItemClickEnabled" Value="True" />
                     <Setter Property="ShowsScrollingPlaceholders" Value="False" />
diff --git a/MALClient.Desktop/Pages/Main/HistoryPage.xaml b/MALClient.Desktop/Pages/Main/HistoryPage.xaml
index 923253b7..ca5a1529 100644
--- a/MALClient.Desktop/Pages/Main/HistoryPage.xaml
+++ b/MALClient.Desktop/Pages/Main/HistoryPage.xaml
@@ -41,25 +41,33 @@
                                     <Style TargetType="GridViewItem">
                                         <Setter Property="Margin" Value="5"/>
                                         <Setter Property="Padding" Value="0"/>
-                                        <Setter Property="Height" Value="340"/>
+                                        <Setter Property="Height" Value="350"/>
                                         <Setter Property="Background" Value="{ThemeResource BrushAnimeItemInnerBackground}"/>
                                         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                                         <Setter Property="VerticalContentAlignment" Value="Stretch"/>
                                     </Style>
                                 </GridView.ItemContainerStyle>
-                                <GridView.ItemTemplate>
+								<GridView.ItemContainerTransitions>
+									<TransitionCollection>
+										<PopupThemeTransition FromVerticalOffset="100" />
+										<AddDeleteThemeTransition />
+										<ReorderThemeTransition />
+										<RepositionThemeTransition />
+									</TransitionCollection>
+								</GridView.ItemContainerTransitions>
+								<GridView.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Background="{ThemeResource BrushHamburgerInnerBackground}" BorderThickness="3,0,0,0" BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}" >
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="200"/>
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
-                                            <items:AnimeGridItem IsRightTapEnabled="True" RightTapped="AnimeItemOnRightClick" Width="188" Height="340" HorizontalAlignment="Left" DataContext="{Binding Item1}"/>
+                                            <items:AnimeGridItem IsRightTapEnabled="True" RightTapped="AnimeItemOnRightClick" HorizontalAlignment="Left" DataContext="{Binding Item1}"/>
                                             <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto" PointerPressed="HistoryScrollViewerOnPointerPressed" HorizontalAlignment="Stretch">
                                                 <ItemsControl ItemsSource="{Binding Item2}">
                                                     <ItemsControl.ItemsPanel>
                                                         <ItemsPanelTemplate>
-                                                            <ItemsStackPanel Margin="0,0,16,0" GroupPadding="0,0,5,0"/>
+                                                            <ItemsStackPanel Margin="8,0,16,0" GroupPadding="0,0,0,0"/>
                                                         </ItemsPanelTemplate>
                                                     </ItemsControl.ItemsPanel>
                                                     <ItemsControl.ItemContainerStyle>
diff --git a/MALClient.Desktop/Pages/Main/PopularVideosPage.xaml b/MALClient.Desktop/Pages/Main/PopularVideosPage.xaml
index 74ed4f0a..20d16dd5 100644
--- a/MALClient.Desktop/Pages/Main/PopularVideosPage.xaml
+++ b/MALClient.Desktop/Pages/Main/PopularVideosPage.xaml
@@ -29,7 +29,7 @@
             </GridView.ItemContainerStyle>
             <GridView.ItemsPanel>
                 <ItemsPanelTemplate>
-					<ItemsWrapGrid ItemWidth="200" ItemHeight="350" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,10,0" />
+					<ItemsWrapGrid ItemWidth="212" ItemHeight="360" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,10,0" />
                 </ItemsPanelTemplate>
             </GridView.ItemsPanel>
             <GridView.ItemContainerTransitions>
diff --git a/MALClient.Desktop/Pages/Main/ProfilePage.xaml b/MALClient.Desktop/Pages/Main/ProfilePage.xaml
index 64c33def..4db45979 100644
--- a/MALClient.Desktop/Pages/Main/ProfilePage.xaml
+++ b/MALClient.Desktop/Pages/Main/ProfilePage.xaml
@@ -308,7 +308,7 @@
 									</GridView.ItemContainerStyle>
 									<GridView.ItemsPanel>
 										<ItemsPanelTemplate>
-											<ItemsWrapGrid Orientation="Horizontal" ItemWidth="200" ItemHeight="350" />
+											<ItemsWrapGrid Orientation="Horizontal"/>
 										</ItemsPanelTemplate>
 									</GridView.ItemsPanel>
 									<GridView.ItemTemplate>
@@ -479,7 +479,7 @@
 								</GridView.ItemContainerStyle>
 								<GridView.ItemsPanel>
 									<ItemsPanelTemplate>
-										<ItemsWrapGrid Orientation="Horizontal" ItemWidth="200" ItemHeight="350" />
+										<ItemsWrapGrid Orientation="Horizontal"/>
 									</ItemsPanelTemplate>
 								</GridView.ItemsPanel>
 								<GridView.ItemTemplate>
@@ -519,7 +519,7 @@
 							</GridView.ItemContainerStyle>
 							<GridView.ItemsPanel>
 								<ItemsPanelTemplate>
-									<ItemsWrapGrid Orientation="Horizontal" ItemWidth="200" ItemHeight="350" />
+									<ItemsWrapGrid Orientation="Horizontal" />
 								</ItemsPanelTemplate>
 							</GridView.ItemsPanel>
 							<GridView.ItemTemplate>
diff --git a/MALClient.Desktop/Pages/Off/AnimeDetailsPage.xaml b/MALClient.Desktop/Pages/Off/AnimeDetailsPage.xaml
index 5e2fbd4f..8b52c517 100644
--- a/MALClient.Desktop/Pages/Off/AnimeDetailsPage.xaml
+++ b/MALClient.Desktop/Pages/Off/AnimeDetailsPage.xaml
@@ -789,7 +789,7 @@
                                         Margin="5,10"
                                         BorderThickness="1"
                                         Style="{StaticResource ButtonRevealStyle}"/>
-                                <ProgressRing IsActive="True" Width="40" Height="40" Margin="0,5"
+                                <ProgressRing IsActive="True" Width="40" Height="40" Margin="0,15"
                                               Visibility="{Binding LoadingCharactersVisibility,Converter={StaticResource BoolToVisibilityConverter}}" />
                                 <Grid HorizontalAlignment="Center"
                                       Visibility="{Binding CharactersGridVisibility,Converter={StaticResource BoolToVisibilityConverter}}">
@@ -1591,7 +1591,7 @@
                                             <Setter Property="BorderBrush"
                                                     Value="{StaticResource SystemControlBackgroundAccentBrush}" />
                                             <Setter Property="BorderThickness" Value="5,0,0,0" />
-                                            <Setter Property="Margin" Value="5" />
+                                            <Setter Property="Margin" Value="0,0,0,10" />
                                             <Setter Property="Background"
                                                     Value="{ThemeResource BrushDetailsRelatedBackground}" />
                                             <Setter Property="Padding" Value="0" />
diff --git a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsArticlesPage.xaml b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsArticlesPage.xaml
index e2ae9f43..cd2b6001 100644
--- a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsArticlesPage.xaml
+++ b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsArticlesPage.xaml
@@ -30,8 +30,8 @@
             <TextBlock Text="Live Tiles" FontWeight="Medium"
                            HorizontalAlignment="Center"
                            TextWrapping="WrapWholeWords" />
-            <Button Content="Pin articles live tile" Click="ButtonPinArticlesOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300"/>
-            <Button Content="Pin news live tile" Click="ButtonPinNewsOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300"/>
+			<Button Content="Pin articles live tile" Click="ButtonPinArticlesOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
+			<Button Content="Pin news live tile" Click="ButtonPinNewsOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
             <TextBlock
                     Text="Tiles are updated every 12 hours from background."
                     FontWeight="SemiLight" TextWrapping="WrapWholeWords" FontSize="15" TextAlignment="Center"
diff --git a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsCachingPage.xaml b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsCachingPage.xaml
index 69bf6062..2638ce53 100644
--- a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsCachingPage.xaml
+++ b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsCachingPage.xaml
@@ -83,7 +83,8 @@
                                VerticalAlignment="Center" TextAlignment="Center" Margin="10,0,0,0" />
                 </StackPanel>
             </Button>-->
-            <Button x:Name="BtnClearImageCache" Margin="2,5" Click="ClearImageCache" HorizontalAlignment="Center">
+            <Button x:Name="BtnClearImageCache" Margin="2,5" Click="ClearImageCache" HorizontalAlignment="Center"
+					Style="{StaticResource ButtonRevealStyle}" BorderThickness="1">
                 <StackPanel Orientation="Horizontal">
                     <SymbolIcon Symbol="Delete" VerticalAlignment="Center" />
                     <TextBlock  Text="Clear image cache." VerticalAlignment="Center" TextAlignment="Center" Margin="10,0,0,0" />
diff --git a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsGeneralPage.xaml b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsGeneralPage.xaml
index 2a5c3e49..31f33e25 100644
--- a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsGeneralPage.xaml
+++ b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsGeneralPage.xaml
@@ -577,7 +577,8 @@
                             IsOn="{Binding SyncFavsFromTimeToTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                             OnContent="Sync" OffContent="Don't sync" HorizontalAlignment="Center" />
             </Grid>
-            <Button Content="Sync now!" HorizontalAlignment="Center" Margin="0,5" IsEnabled="{Binding IsSyncFavsButtonEnabled}" Command="{Binding SyncFavsCommand}"/>
+            <Button Content="Sync now!" HorizontalAlignment="Center" Margin="0,5" IsEnabled="{Binding IsSyncFavsButtonEnabled}" Command="{Binding SyncFavsCommand}"
+					Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
             <TextBlock
                     Text="Getting and updating favourites is pretty tricky and that's why I have to cache them, visiting and forcing update on your profile page will sync your favourites too. Favourites will sync accross devices."
                     FontWeight="SemiLight" TextWrapping="WrapWholeWords" FontSize="15" TextAlignment="Center"
diff --git a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsMiscPage.xaml b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsMiscPage.xaml
index 257f119b..a226902f 100644
--- a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsMiscPage.xaml
+++ b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsMiscPage.xaml
@@ -44,7 +44,7 @@
                 </StackPanel>
                 <Button Content="Rate now!" Command="{Binding ReviewCommand}"
                         HorizontalAlignment="Center"
-                        Margin="0,10,0,0" />
+                        Margin="0,10,0,0" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1" />
                 <MenuFlyoutSeparator Margin="0,5" />
                 <Grid Margin="10" HorizontalAlignment="Center">
                     <StackPanel>
diff --git a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsNotificationsPage.xaml b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsNotificationsPage.xaml
index 3234e5ae..6fa7a811 100644
--- a/MALClient.Desktop/Pages/Off/SettingsPages/SettingsNotificationsPage.xaml
+++ b/MALClient.Desktop/Pages/Off/SettingsPages/SettingsNotificationsPage.xaml
@@ -90,8 +90,8 @@
             </Grid>
             
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
-                <Button Content="Get notifications now!" Margin="5,0"  IsEnabled="{Binding IsCallNotificationsButtonEnabled}" Command="{Binding CallBackgroundTaskCommand}"/>
-                <Button Content="Clear seen notifications" Margin="5,0" Command="{Binding ResetSeenNotificationsCommand}"/>
+				<Button Content="Get notifications now!" Margin="5,0"  IsEnabled="{Binding IsCallNotificationsButtonEnabled}" Command="{Binding CallBackgroundTaskCommand}" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
+				<Button Content="Clear seen notifications" Margin="5,0" Command="{Binding ResetSeenNotificationsCommand}" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
             </StackPanel>
           
             <TextBlock
diff --git a/MALClient.Desktop/UserControls/New/HamburgerControl.xaml b/MALClient.Desktop/UserControls/New/HamburgerControl.xaml
index b9c34125..981fda02 100644
--- a/MALClient.Desktop/UserControls/New/HamburgerControl.xaml
+++ b/MALClient.Desktop/UserControls/New/HamburgerControl.xaml
@@ -279,7 +279,7 @@
                                             <Style TargetType="GridViewItem"
                                                    BasedOn="{StaticResource GridViewItemCustomStyle}">
                                                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                                                <Setter Property="Width" Value="122" />
+                                                <Setter Property="Width" Value="125" />
                                                 <Setter Property="Margin" Value="0" />
                                             </Style>
                                         </GridView.ItemContainerStyle>
diff --git a/MALClient.Desktop/ViewModels/DekstopViewModelLocator.cs b/MALClient.Desktop/ViewModels/DesktopViewModelLocator.cs
similarity index 97%
rename from MALClient.Desktop/ViewModels/DekstopViewModelLocator.cs
rename to MALClient.Desktop/ViewModels/DesktopViewModelLocator.cs
index 39acb426..5c6e6ba6 100644
--- a/MALClient.Desktop/ViewModels/DekstopViewModelLocator.cs
+++ b/MALClient.Desktop/ViewModels/DesktopViewModelLocator.cs
@@ -1,4 +1,5 @@
-using GalaSoft.MvvmLight.Ioc;
+using CommonServiceLocator;
+using GalaSoft.MvvmLight.Ioc;
 using MALClient.Adapters;
 using MALClient.Adapters.Credentials;
 using MALClient.UWP.Adapters;
@@ -6,7 +7,6 @@
 using MALClient.XShared.Interfaces;
 using MALClient.XShared.ViewModels;
 using MALClient.XShared.ViewModels.Main;
-using Microsoft.Practices.ServiceLocation;
 
 namespace MALClient.UWP.ViewModels
 {
diff --git a/MALClient.Mobile/MALClient.UWP.Mobile.csproj b/MALClient.Mobile/MALClient.UWP.Mobile.csproj
index 4831d2bf..16b2ba9d 100644
--- a/MALClient.Mobile/MALClient.UWP.Mobile.csproj
+++ b/MALClient.Mobile/MALClient.UWP.Mobile.csproj
@@ -530,22 +530,22 @@
       <Version>4.1.6</Version>
     </PackageReference>
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.6.13</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Net.Http">
       <Version>2.2.29</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.6</Version>
+      <Version>6.0.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Services.Store.SDK">
       <Version>10.1705.16001</Version>
     </PackageReference>
     <PackageReference Include="MvvmLight">
-      <Version>5.3.0</Version>
+      <Version>5.4.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
+      <Version>11.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.3</Version>
diff --git a/MALClient.Mobile/ViewModels/MobileViewModelLocator.cs b/MALClient.Mobile/ViewModels/MobileViewModelLocator.cs
index ec14693c..4732fabe 100644
--- a/MALClient.Mobile/ViewModels/MobileViewModelLocator.cs
+++ b/MALClient.Mobile/ViewModels/MobileViewModelLocator.cs
@@ -1,4 +1,5 @@
-using GalaSoft.MvvmLight.Ioc;
+using CommonServiceLocator;
+using GalaSoft.MvvmLight.Ioc;
 using MALClient.Adapters;
 using MALClient.Adapters.Credentials;
 using MALClient.UWP.Adapters;
@@ -6,7 +7,6 @@
 using MALClient.XShared.Interfaces;
 using MALClient.XShared.ViewModels;
 using MALClient.XShared.ViewModels.Main;
-using Microsoft.Practices.ServiceLocation;
 
 namespace MALClient.UWP.ViewModels
 {
diff --git a/MALClient.Models/MALClient.Models.csproj b/MALClient.Models/MALClient.Models.csproj
index 0e1f1d69..75e347eb 100644
--- a/MALClient.Models/MALClient.Models.csproj
+++ b/MALClient.Models/MALClient.Models.csproj
@@ -138,8 +138,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\portable-net45+win8+wp8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
diff --git a/MALClient.Models/packages.config b/MALClient.Models/packages.config
index b639cec6..cee960b1 100644
--- a/MALClient.Models/packages.config
+++ b/MALClient.Models/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Newtonsoft.Json" version="11.0.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Runtime" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
diff --git a/MALClient.UWP.Adapters/MALClient.UWP.Adapters.csproj b/MALClient.UWP.Adapters/MALClient.UWP.Adapters.csproj
index e517d9bd..6226c875 100644
--- a/MALClient.UWP.Adapters/MALClient.UWP.Adapters.csproj
+++ b/MALClient.UWP.Adapters/MALClient.UWP.Adapters.csproj
@@ -145,10 +145,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.6</Version>
+      <Version>6.0.8</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
+      <Version>11.0.1</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
diff --git a/MALClient.UWP.BGTaskLiveTilesNotifications/MALClient.UWP.BGTaskLiveTilesNotifications.csproj b/MALClient.UWP.BGTaskLiveTilesNotifications/MALClient.UWP.BGTaskLiveTilesNotifications.csproj
index 1b75fc42..a9cc335e 100644
--- a/MALClient.UWP.BGTaskLiveTilesNotifications/MALClient.UWP.BGTaskLiveTilesNotifications.csproj
+++ b/MALClient.UWP.BGTaskLiveTilesNotifications/MALClient.UWP.BGTaskLiveTilesNotifications.csproj
@@ -11,12 +11,13 @@
     <AssemblyName>MALClient.UWP.BGTaskLiveTilesNotifications</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -103,10 +104,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="LiveTilesBackgroundTask.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -133,6 +130,11 @@
       <Name>MALClient.XShared</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.8</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/MALClient.UWP.BGTaskLiveTilesNotifications/project.json b/MALClient.UWP.BGTaskLiveTilesNotifications/project.json
deleted file mode 100644
index 5476c2ce..00000000
--- a/MALClient.UWP.BGTaskLiveTilesNotifications/project.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.6"
-  },
-  "frameworks": {
-    "uap10.0.10586": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
diff --git a/MALClient.UWP.BGTaskNotifications/MALClient.UWP.BGTaskNotifications.csproj b/MALClient.UWP.BGTaskNotifications/MALClient.UWP.BGTaskNotifications.csproj
index 38834bcb..690d28f9 100644
--- a/MALClient.UWP.BGTaskNotifications/MALClient.UWP.BGTaskNotifications.csproj
+++ b/MALClient.UWP.BGTaskNotifications/MALClient.UWP.BGTaskNotifications.csproj
@@ -11,12 +11,13 @@
     <AssemblyName>nopnop</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -103,10 +104,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="NotificationsBackgroundTask.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -129,7 +126,14 @@
       <Name>MALClient.XShared</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
+      <Version>2.2.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/MALClient.UWP.BGTaskNotifications/project.json b/MALClient.UWP.BGTaskNotifications/project.json
deleted file mode 100644
index c9a9fdab..00000000
--- a/MALClient.UWP.BGTaskNotifications/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.6",
-    "Microsoft.Toolkit.Uwp.Notifications": "2.1.1"
-  },
-  "frameworks": {
-    "uap10.0.10586": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
diff --git a/MALClient.UWP.BGTaskToastActivation/MALClient.UWP.BGTaskToastActivation.csproj b/MALClient.UWP.BGTaskToastActivation/MALClient.UWP.BGTaskToastActivation.csproj
index 50b4cfec..5dec19ce 100644
--- a/MALClient.UWP.BGTaskToastActivation/MALClient.UWP.BGTaskToastActivation.csproj
+++ b/MALClient.UWP.BGTaskToastActivation/MALClient.UWP.BGTaskToastActivation.csproj
@@ -11,12 +11,13 @@
     <AssemblyName>MALClient.UWP.BGTaskToastActivation</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -103,10 +104,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="ToastActivationTask.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -129,6 +126,11 @@
       <Name>MALClient.XShared</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.8</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/MALClient.UWP.BGTaskToastActivation/project.json b/MALClient.UWP.BGTaskToastActivation/project.json
deleted file mode 100644
index 5476c2ce..00000000
--- a/MALClient.UWP.BGTaskToastActivation/project.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.6"
-  },
-  "frameworks": {
-    "uap10.0.10586": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
diff --git a/MALClient.XShared/MALClient.XShared.csproj b/MALClient.XShared/MALClient.XShared.csproj
index 940ae693..dc86a245 100644
--- a/MALClient.XShared/MALClient.XShared.csproj
+++ b/MALClient.XShared/MALClient.XShared.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -202,13 +204,14 @@
     <Compile Include="ViewModels\ViewModelLocator.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\netstandard1.0\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.Extras.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.Extras.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack-PCL, Version=1.4.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack-PCL.1.4.6\lib\HtmlAgilityPack-PCL.dll</HintPath>
@@ -218,14 +221,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Lib\libvideo.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
     <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\portable-net45+win8+wp8+wpa81\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
@@ -233,6 +236,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Lib\libvideo.dll" />
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -251,6 +255,13 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MALClient.XShared/ViewModels/ViewModelLocator.cs b/MALClient.XShared/ViewModels/ViewModelLocator.cs
index 67e8b4d9..d840e14b 100644
--- a/MALClient.XShared/ViewModels/ViewModelLocator.cs
+++ b/MALClient.XShared/ViewModels/ViewModelLocator.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight.Ioc;
 using MALClient.Models.Enums;
 using MALClient.XShared.Comm.Anime;
@@ -11,7 +12,6 @@
 using MALClient.XShared.ViewModels.Details;
 using MALClient.XShared.ViewModels.Forums;
 using MALClient.XShared.ViewModels.Main;
-using Microsoft.Practices.ServiceLocation;
 
 namespace MALClient.XShared.ViewModels
 {
diff --git a/MALClient.XShared/app.config b/MALClient.XShared/app.config
new file mode 100644
index 00000000..9a1a9fa2
--- /dev/null
+++ b/MALClient.XShared/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/MALClient.XShared/packages.config b/MALClient.XShared/packages.config
index b3574998..80f34af7 100644
--- a/MALClient.XShared/packages.config
+++ b/MALClient.XShared/packages.config
@@ -1,12 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="CommonServiceLocator" version="2.0.3" targetFramework="portable45-net45+win8+wpa81" />
   <package id="HtmlAgilityPack-PCL" version="1.4.6" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Microsoft.NETCore.Platforms" version="2.0.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Microsoft.NETCore.Targets" version="2.0.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="modernhttpclient" version="2.4.2" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="MvvmLightLibs" version="5.4.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="NETStandard.Library" version="2.0.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Newtonsoft.Json" version="11.0.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="runtime.native.System" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.IO" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Linq" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Net.Http" version="4.3.3" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Runtime" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Threading" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/MalClient.Shared/Items/AnimeGridItem.xaml b/MalClient.Shared/Items/AnimeGridItem.xaml
index 025f70e0..85e16932 100644
--- a/MalClient.Shared/Items/AnimeGridItem.xaml
+++ b/MalClient.Shared/Items/AnimeGridItem.xaml
@@ -8,10 +8,11 @@
     xmlns:xamlConverters="using:MALClient.UWP.Shared.XamlConverters"
     xmlns:attachedProperties="using:MALClient.UWP.Shared.UserControls.AttachedProperties"
     mc:Ignorable="d"
-    d:DesignHeight="300"
-    d:DesignWidth="400"
+    d:DesignHeight="350"
+    d:DesignWidth="180"
     PointerReleased="AnimeGridItem_OnPointerReleased" ManipulationCompleted="AnimeGridItem_OnManipulationCompleted"
-    PointerMoved="AnimeGridItem_OnPointerMoved" ManipulationStarted="AnimeGridItem_OnManipulationStarted">
+    PointerMoved="AnimeGridItem_OnPointerMoved" ManipulationStarted="AnimeGridItem_OnManipulationStarted"
+	Width="200" Height="350">
 
     <UserControl.Resources>
         <ResourceDictionary>
@@ -72,8 +73,7 @@
                 <RowDefinition Height="50" />
             </Grid.RowDefinitions>
             <Image controlsExt:ImageExtensions.FadeInOnLoaded="True" Grid.ColumnSpan="2" Stretch="UniformToFill" ImageOpened="Image_OnImageOpened"
-				   HorizontalAlignment="Center"
-                   MaxWidth="{Binding MaxWidth}" attachedProperties:AnimeImageExtensions.MalBaseImageSource="{x:Bind ViewModel.ImgUrl}">
+				   HorizontalAlignment="Center" attachedProperties:AnimeImageExtensions.MalBaseImageSource="{x:Bind ViewModel.ImgUrl}">
                 <!--<Image.Source>
                     <BitmapImage UriSource="{x:Bind ViewModel.ImgUrl}" DecodePixelHeight="325"
                                  DecodePixelType="Logical" DecodePixelWidth="{Binding MaxWidth}" />
@@ -164,11 +164,8 @@
                                     Foreground="{StaticResource AnimeGridItemText}" />
                     </Button>
                 </Grid>
-                <Grid x:Name="TimeTillNextAirGrid" VerticalAlignment="Bottom" Visibility="Collapsed">
-                    <Grid.Background>
-                        <SolidColorBrush Color="Black" Opacity=".75" />
-                    </Grid.Background>
-                    <TextBlock x:Name="TimeTillNextAir" FontWeight="SemiLight" Margin="5,0" Foreground="{StaticResource AnimeGridItemText}"/>
+				<Grid x:Name="TimeTillNextAirGrid" VerticalAlignment="Bottom" Visibility="Collapsed" Background="{StaticResource AnimeGridItemGridBackground}">
+					<TextBlock x:Name="TimeTillNextAir" FontWeight="SemiLight" Margin="5,0" Foreground="{StaticResource AnimeGridItemText}"/>
                 </Grid>
             </StackPanel>
         </Grid>
diff --git a/MalClient.Shared/Items/RecommendationItem.xaml b/MalClient.Shared/Items/RecommendationItem.xaml
index 7c615623..05e1b952 100644
--- a/MalClient.Shared/Items/RecommendationItem.xaml
+++ b/MalClient.Shared/Items/RecommendationItem.xaml
@@ -130,11 +130,8 @@
                                 <BitmapImage UriSource="{Binding Data.AnimeDependentData.ImgUrl}"/>
                             </Image.Source>
                         </Image>
-                        <Grid VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="35" Height="35">
-                            <Grid.Background>
-                                <AcrylicBrush BackgroundSource="Backdrop" TintTransitionDuration="0:0:1" TintColor="{StaticResource BrushDeepBackgroundColor}" TintOpacity="0.5" FallbackColor="{StaticResource BrushDeepBackgroundColor}"/>
-                            </Grid.Background>
-                            <SymbolIcon Symbol="Go" Foreground="White" />
+						<Grid VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="35" Height="35" Background="{StaticResource AnimeGridItemGridBackground}">
+							<SymbolIcon Symbol="Go" Foreground="White" />
                         </Grid>
                     </Grid>
                 </Button>
@@ -159,11 +156,8 @@
                                 <BitmapImage UriSource="{Binding Data.AnimeRecommendationData.ImgUrl}"/>
                             </Image.Source>
                         </Image>
-                        <Grid VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="35" Height="35">
-                            <Grid.Background>
-                                <SolidColorBrush Color="Black" Opacity=".5" />
-                            </Grid.Background>
-                            <SymbolIcon Symbol="Go" Foreground="White" />
+						<Grid VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="35" Height="35" Background="{StaticResource AnimeGridItemGridBackground}">
+							<SymbolIcon Symbol="Go" Foreground="White" />
                         </Grid>
                     </Grid>
                 </Button>
diff --git a/MalClient.Shared/MALClient.UWP.Shared.csproj b/MalClient.Shared/MALClient.UWP.Shared.csproj
index 25e4fe12..af19b130 100644
--- a/MalClient.Shared/MALClient.UWP.Shared.csproj
+++ b/MalClient.Shared/MALClient.UWP.Shared.csproj
@@ -343,6 +343,9 @@
     <Folder Include="Assets\StoreIcons\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CommonServiceLocator">
+      <Version>2.0.3</Version>
+    </PackageReference>
     <PackageReference Include="FontAwesome.UWP">
       <Version>4.7.0.9</Version>
     </PackageReference>
@@ -350,22 +353,22 @@
       <Version>4.1.6</Version>
     </PackageReference>
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.6.13</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.6</Version>
+      <Version>6.0.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
-      <Version>2.1.1</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>2.1.1</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="MvvmLightLibs">
-      <Version>5.3.0</Version>
+      <Version>5.4.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
+      <Version>11.0.1</Version>
     </PackageReference>
     <PackageReference Include="WinRTXamlToolkit">
       <Version>2.3.0</Version>