diff --git a/Opus/Assets/Version.txt b/Opus/Assets/Version.txt
index bce98d0..a75a778 100644
--- a/Opus/Assets/Version.txt
+++ b/Opus/Assets/Version.txt
@@ -1,3 +1,3 @@
-Version: 3.5.3
+Version: 3.5.4
 Beta: False
-Link: https://github.com/AnonymusRaccoon/Opus/releases/download/3.5.3/Opus.v3.5.3.apk
+Link: https://github.com/AnonymusRaccoon/Opus/releases/download/3.5.4/Opus.v3.5.4.apk
diff --git a/Opus/Code/Api/Services/Downloader.cs b/Opus/Code/Api/Services/Downloader.cs
index 4498eb1..fd090dc 100644
--- a/Opus/Code/Api/Services/Downloader.cs
+++ b/Opus/Code/Api/Services/Downloader.cs
@@ -114,18 +114,22 @@ namespace Opus.Api.Services
 
             instance.downloadPath = downloadPath;
             instance.maxDownload = prefManager.GetInt("maxDownload", 4);
+
+            const string permission = Manifest.Permission.WriteExternalStorage;
+            if (Android.Support.V4.Content.ContextCompat.CheckSelfPermission(instance, permission) != (int)Permission.Granted)
+            {
+                string[] permissions = new string[] { permission };
+                MainActivity.instance.RequestPermissions(permissions, RequestCode);
+
+                await Task.Delay(1000);
+                while (Android.Support.V4.Content.ContextCompat.CheckSelfPermission(instance, permission) != (int)Permission.Granted)
+                    await Task.Delay(500);
+            }
         }
 
         #region Downloading of the queue
         public async void StartDownload()
         {
-            System.Console.WriteLine("&Queue count: " + queue.Count);
-            foreach (var item in queue)
-            {
-                System.Console.WriteLine("&Item: " + item.Name + " State:  " + item.State.ToString());
-            }
-
-
             while (downloadCount < maxDownload && queue.Count(x => x.State == DownloadState.None) > 0)
             {
                 System.Console.WriteLine("&Initiating the download of a song");
@@ -147,16 +151,6 @@ namespace Opus.Api.Services
 
             queue[position].State = DownloadState.Initialization;
             UpdateList(position);
-            const string permission = Manifest.Permission.WriteExternalStorage;
-            if (Android.Support.V4.Content.ContextCompat.CheckSelfPermission(this, permission) != (int)Permission.Granted)
-            {
-                string[] permissions = new string[] { permission };
-                MainActivity.instance.RequestPermissions(permissions, RequestCode);
-
-                await Task.Delay(1000);
-                while (Android.Support.V4.Content.ContextCompat.CheckSelfPermission(this, permission) != (int)Permission.Granted)
-                    await Task.Delay(500);
-            }
 
             while (downloadCount >= maxDownload)
                 await Task.Delay(1000);
@@ -183,7 +177,7 @@ namespace Opus.Api.Services
                     if (queue.Count != 0)
                         DownloadAudio(queue.FindIndex(x => x.State == DownloadState.None), path);
 
-                    Playlist.instance?.CheckForSync();
+                    Playlist.instance?.Activity.RunOnUiThread(() => { Playlist.instance.CheckForSync(); });
                     return;
                 }
                     
@@ -248,7 +242,7 @@ namespace Opus.Api.Services
                 if (queue.Count != 0)
                     DownloadAudio(queue.FindIndex(x => x.State == DownloadState.None), path);
 
-                Playlist.instance?.CheckForSync();
+                Playlist.instance?.Activity.RunOnUiThread(() => { Playlist.instance.CheckForSync(); });
             }
             catch (System.Net.Http.HttpRequestException)
             {
@@ -282,7 +276,7 @@ namespace Opus.Api.Services
                 meta.Tag.Album = title + " - " + artist;
                 meta.Tag.Comment = queue[position].YoutubeID;
                 IPicture[] pictures = new IPicture[1];
-                Bitmap bitmap = Picasso.With(Application.Context).Load(await YoutubeManager.GetBestThumb(thumbnails)).Transform(new RemoveBlackBorder(true)).MemoryPolicy(MemoryPolicy.NoCache).Get();
+                Bitmap bitmap = Picasso.With(this).Load(await YoutubeManager.GetBestThumb(thumbnails)).Transform(new RemoveBlackBorder(true)).MemoryPolicy(MemoryPolicy.NoCache).Get();
                 byte[] data;
                 using (var MemoryStream = new MemoryStream())
                 {
diff --git a/Opus/Code/MainActivity.cs b/Opus/Code/MainActivity.cs
index 2cfa4ab..1f7494e 100644
--- a/Opus/Code/MainActivity.cs
+++ b/Opus/Code/MainActivity.cs
@@ -438,19 +438,24 @@ namespace Opus
         public void Navigate(int layout)
         {
             contentRefresh.Refreshing = false;
-            if (YoutubeSearch.instances != null)
+
+            if(menu?.FindItem(Resource.Id.search)?.IsActionViewExpanded == true)
             {
                 var searchView = menu.FindItem(Resource.Id.search).ActionView.JavaCast<SearchView>();
                 menu.FindItem(Resource.Id.search).CollapseActionView();
                 searchView.ClearFocus();
                 searchView.Iconified = true;
                 searchView.SetQuery("", false);
-                SupportActionBar.SetDisplayHomeAsUpEnabled(false);
+            }
 
+            if (YoutubeSearch.instances != null)
+            {
+                SupportActionBar.SetDisplayHomeAsUpEnabled(false);
                 SupportFragmentManager.PopBackStack(null, Android.Support.V4.App.FragmentManager.PopBackStackInclusive);
             }
 
-            FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
+            if(FindViewById(Resource.Id.toolbarLogo) != null)
+                FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
 
             if (PlaylistTracks.instance != null)
             {
diff --git a/Opus/Opus.csproj b/Opus/Opus.csproj
index a618928..a89bdbd 100644
--- a/Opus/Opus.csproj
+++ b/Opus/Opus.csproj
@@ -296,34 +296,34 @@
       <HintPath>..\packages\Xamarin.Android.Support.ViewPager.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Auth, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Auth.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0\lib\monoandroid90\Xamarin.GooglePlayServices.Auth.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Auth.Api.Phone, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0\lib\monoandroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Auth.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Auth.Base.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0\lib\monoandroid90\Xamarin.GooglePlayServices.Auth.Base.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Base.71.1610.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Base.71.1610.0\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Cast, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Cast.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0\lib\monoandroid90\Xamarin.GooglePlayServices.Cast.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Cast.Framework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Cast.Framework.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0\lib\monoandroid90\Xamarin.GooglePlayServices.Cast.Framework.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Flags, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Flags.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0\lib\monoandroid90\Xamarin.GooglePlayServices.Flags.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Tasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0-preview9\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
+      <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
     </Reference>
-    <Reference Include="YoutubeExplode, Version=4.7.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\YoutubeExplode.4.7.6\lib\netstandard2.0\YoutubeExplode.dll</HintPath>
+    <Reference Include="YoutubeExplode, Version=4.7.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\YoutubeExplode.4.7.7\lib\netstandard2.0\YoutubeExplode.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -958,15 +958,15 @@
     <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets'))" />
     <Error Condition="!Exists('..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets'))" />
     <Error Condition="!Exists('..\packages\Xamarin.Android.Support.v7.Preference.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.Preference.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.v7.Preference.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.Preference.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Base.71.1610.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Base.71.1610.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets'))" />
-    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Base.71.1610.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Base.71.1610.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.targets'))" />
   </Target>
   <Import Project="..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" />
@@ -1008,15 +1008,15 @@
   <Import Project="..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.v7.Preference.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.Preference.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.Preference.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.Preference.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Base.71.1610.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.71.1610.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets')" />
-  <Import Project="..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0-preview9\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Base.71.1610.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.71.1610.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.Api.Phone.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Api.Phone.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.Base.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.Base.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Auth.71.1600.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Auth.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Flags.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Cast.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.targets')" />
+  <Import Project="..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Cast.Framework.71.1602.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Cast.Framework.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/Opus/Properties/AndroidManifest.xml b/Opus/Properties/AndroidManifest.xml
index b06cf4e..8af0492 100644
--- a/Opus/Properties/AndroidManifest.xml
+++ b/Opus/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.sdg.opus" android:installLocation="preferExternal" android:versionName="3.5.3" android:versionCode="58">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.sdg.opus" android:installLocation="preferExternal" android:versionName="3.5.4" android:versionCode="59">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/Opus/packages.config b/Opus/packages.config
index 2d835bd..f87fc54 100644
--- a/Opus/packages.config
+++ b/Opus/packages.config
@@ -118,14 +118,14 @@
   <package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.1" targetFramework="monoandroid90" />
   <package id="Xamarin.Android.Support.ViewPager" version="28.0.0.1" targetFramework="monoandroid90" />
   <package id="Xamarin.Build.Download" version="0.4.11" targetFramework="monoandroid81" />
-  <package id="Xamarin.GooglePlayServices.Auth" version="71.1600.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Auth.Api.Phone" version="71.1600.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Auth.Base" version="71.1600.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Base" version="71.1610.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Basement" version="71.1620.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Cast" version="71.1602.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Cast.Framework" version="71.1602.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Flags" version="71.1601.0-preview9" targetFramework="monoandroid90" />
-  <package id="Xamarin.GooglePlayServices.Tasks" version="71.1601.0-preview9" targetFramework="monoandroid90" />
-  <package id="YoutubeExplode" version="4.7.6" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Auth" version="71.1600.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Auth.Api.Phone" version="71.1600.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Auth.Base" version="71.1600.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Base" version="71.1610.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Basement" version="71.1620.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Cast" version="71.1602.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Cast.Framework" version="71.1602.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Flags" version="71.1601.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.GooglePlayServices.Tasks" version="71.1601.0" targetFramework="monoandroid90" />
+  <package id="YoutubeExplode" version="4.7.7" targetFramework="monoandroid90" />
 </packages>
\ No newline at end of file