diff --git a/MPfm/MPfm.Android/Classes/Activities/ResumePlaybackActivity.cs b/MPfm/MPfm.Android/Classes/Activities/ResumePlaybackActivity.cs
index d10d8f30..676932f3 100644
--- a/MPfm/MPfm.Android/Classes/Activities/ResumePlaybackActivity.cs
+++ b/MPfm/MPfm.Android/Classes/Activities/ResumePlaybackActivity.cs
@@ -39,12 +39,9 @@ namespace MPfm.Android
     public class ResumePlaybackActivity : BaseActivity, IResumePlaybackView
     {
         private MobileNavigationManager _navigationManager;
-        private TextView _lblIPAddress;
-        private TextView _lblStatus;
-        private Button _btnConnectManually;
         private ListView _listView;
-        private SyncListAdapter _listAdapter;
-        private List<SyncDevice> _devices;
+        private ResumePlaybackListAdapter _listAdapter;
+        private List<CloudDeviceInfo> _devices;
 
         protected override void OnCreate(Bundle bundle)
         {
@@ -56,28 +53,18 @@ protected override void OnCreate(Bundle bundle)
             ActionBar.SetDisplayHomeAsUpEnabled(true);
             ActionBar.SetHomeButtonEnabled(true);
 
-            _lblIPAddress = FindViewById<TextView>(Resource.Id.resumePlayback_lblIPAddress);
-            _lblStatus = FindViewById<TextView>(Resource.Id.resumePlayback_lblStatus);
-            _btnConnectManually = FindViewById<Button>(Resource.Id.resumePlayback_btnConnectManually);
-            _btnConnectManually.Click += BtnConnectManuallyOnClick;
-
             _listView = FindViewById<ListView>(Resource.Id.resumePlayback_listView);
-            //_listAdapter = new SyncListAdapter(this, new List<SyncDevice>());
-            //_listView.SetAdapter(_listAdapter);
-            //_listView.ItemClick += ListViewOnItemClick;
+            _listAdapter = new ResumePlaybackListAdapter(this, new List<CloudDeviceInfo>());
+            _listView.SetAdapter(_listAdapter);
+            _listView.ItemClick += ListViewOnItemClick;
 
             // Since the onViewReady action could not be added to an intent, tell the NavMgr the view is ready
             ((AndroidNavigationManager)_navigationManager).SetResumePlaybackActivityInstance(this);
         }
 
-        private void BtnConnectManuallyOnClick(object sender, EventArgs eventArgs)
-        {
-        }
-
         private void ListViewOnItemClick(object sender, AdapterView.ItemClickEventArgs itemClickEventArgs)
         {
-            OnCancelDiscovery();
-            OnConnectDevice(_devices[itemClickEventArgs.Position]);
+            OnResumePlayback(_devices[itemClickEventArgs.Position]);
         }
 
         protected override void OnStart()
@@ -116,78 +103,31 @@ protected override void OnDestroy()
             base.OnDestroy();
         }
 
-        public override bool OnOptionsItemSelected(IMenuItem item)
-        {
-            switch (item.ItemId)
-            {
-                case global::Android.Resource.Id.Home:
-                    var intent = new Intent(this, typeof (MainActivity));
-                    intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
-                    OnCancelDiscovery();
-                    this.StartActivity(intent);
-                    this.Finish();
-                    return true;
-                    break;
-                default:
-                    return base.OnOptionsItemSelected(item);
-                    break;
-            }
-        }
+        #region IResumePlaybackView implementation
 
-        public override void OnBackPressed()
-        {
-            OnCancelDiscovery();
-            base.OnBackPressed();
-        }
-
-        #region ISyncView implementation
+        public Action<CloudDeviceInfo> OnResumePlayback { get; set; }
 
-        public Action<SyncDevice> OnConnectDevice { get; set; }
-        public Action<string> OnConnectDeviceManually { get; set; }
-        public Action OnStartDiscovery { get; set; }
-        public Action OnCancelDiscovery { get; set; }
-        
-        public void SyncError(Exception ex)
+        public void ResumePlaybackError(Exception ex)
         {
-            RunOnUiThread(() => {
+            RunOnUiThread(() =>
+            {
                 AlertDialog ad = new AlertDialog.Builder(this).Create();
                 ad.SetCancelable(false);
-                ad.SetMessage(string.Format("An error has occured in Sync: {0}", ex));
+                ad.SetMessage(string.Format("An error has occured in ResumePlayback: {0}", ex));
                 ad.SetButton("OK", (sender, args) => ad.Dismiss());
                 ad.Show();
             });
         }
 
-        public void RefreshIPAddress(string address)
+        public void RefreshDevices(IEnumerable<CloudDeviceInfo> devices)
         {
-            RunOnUiThread(() => {
-                _lblIPAddress.Text = address;
-            });
-        }
-
-        public void RefreshDiscoveryProgress(float percentageDone, string status)
-        {
-            RunOnUiThread(() => {
-                _lblStatus.Text = status;
-            });
-        }
-
-        public void RefreshDevices(IEnumerable<SyncDevice> devices)
-        {
-            RunOnUiThread(() => {
+            RunOnUiThread(() =>
+            {
                 _devices = devices.ToList();
                 _listAdapter.SetData(_devices);
             });
         }
-
-        public void RefreshDevicesEnded()
-        {
-        }
-
-        public void SyncDevice(SyncDevice device)
-        {
-        }
-
+        
         #endregion
 
     }
diff --git a/MPfm/MPfm.Android/Classes/Adapters/ResumePlaybackListAdapter.cs b/MPfm/MPfm.Android/Classes/Adapters/ResumePlaybackListAdapter.cs
new file mode 100644
index 00000000..525046ef
--- /dev/null
+++ b/MPfm/MPfm.Android/Classes/Adapters/ResumePlaybackListAdapter.cs
@@ -0,0 +1,87 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System.Collections.Generic;
+using System.Linq;
+using Android.App;
+using Android.Graphics;
+using Android.Views;
+using Android.Widget;
+using MPfm.Core;
+using MPfm.Library.Objects;
+using MPfm.Player.Objects;
+
+namespace MPfm.Android.Classes.Adapters
+{
+    public class ResumePlaybackListAdapter : BaseAdapter<CloudDeviceInfo>
+    {
+        readonly Activity _context;
+        List<CloudDeviceInfo> _items;
+
+        public ResumePlaybackListAdapter(Activity context, List<CloudDeviceInfo> items)
+        {
+            _context = context;
+            _items = items;
+        }
+
+        public void SetData(IEnumerable<CloudDeviceInfo> items)
+        {
+            _items = items.ToList();
+            NotifyDataSetChanged();
+        }
+
+        public override long GetItemId(int position)
+        {
+            return position;
+        }
+
+        public override CloudDeviceInfo this[int position]
+        {
+            get { return _items[position]; }
+        }
+
+        public override int Count
+        {
+            get { return _items.Count; }
+        }
+
+        public override View GetView(int position, View convertView, ViewGroup parent)
+        {
+            var item = _items[position];
+            View view = convertView;
+            if (view == null) // no view to re-use, create new
+                view = _context.LayoutInflater.Inflate(Resource.Layout.ResumePlaybackCell, null);
+
+            var lblTitle = view.FindViewById<TextView>(Resource.Id.resumePlaybackCell_lblTitle);
+            var lblSubtitle = view.FindViewById<TextView>(Resource.Id.resumePlaybackCell_lblSubtitle);
+            var lblArtistName = view.FindViewById<TextView>(Resource.Id.resumePlaybackCell_lblArtistName);
+            var lblAlbumTitle = view.FindViewById<TextView>(Resource.Id.resumePlaybackCell_lblAlbumTitle);
+            var lblSongTitle = view.FindViewById<TextView>(Resource.Id.resumePlaybackCell_lblSongTitle);
+            var lblTimestamp = view.FindViewById<TextView>(Resource.Id.resumePlaybackCell_lblTimestamp);
+            var imageAlbum = view.FindViewById<ImageView>(Resource.Id.resumePlaybackCell_imageAlbum);
+
+            lblTitle.Text = item.DeviceName;
+            lblSubtitle.Text = "On-the-fly playlist";
+            lblArtistName.Text = item.ArtistName;
+            lblAlbumTitle.Text = item.AlbumTitle;
+            lblSongTitle.Text = item.SongTitle;
+            lblTimestamp.Text = string.Format("Last updated on {0}", item.Timestamp);
+
+            return view;
+        }
+    }
+}
diff --git a/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs b/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs
index 24fb9a6a..8a4d9686 100644
--- a/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs
+++ b/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs
@@ -23,6 +23,7 @@
 using Com.Dropbox.Sync.Android;
 using MPfm.Core;
 using MPfm.Library;
+using MPfm.Library.Objects;
 using MPfm.Library.Services.Interfaces;
 using MPfm.Sound.AudioFiles;
 using MPfm.Sound.Playlists;
@@ -172,6 +173,59 @@ public void InitializeAppFolder()
             }
         }
 
+        public string PushDeviceInfo(AudioFile audioFile, long positionBytes, string position)
+        {
+            return PushNowPlaying_File(audioFile, positionBytes, position);
+        }
+
+        public IEnumerable<CloudDeviceInfo> PullDeviceInfos()
+        {
+            List<CloudDeviceInfo> devices = new List<CloudDeviceInfo>();
+            DbxFile file = null;
+
+            try
+            {
+                var fileInfos = _fileSystem.ListFolder(new DbxPath("/Devices"));
+
+                foreach (var fileInfo in fileInfos)
+                {
+                    try
+                    {
+                        file = _fileSystem.Open(fileInfo.Path);
+                        //file.Update();
+                        string json = file.ReadString();
+
+                        CloudDeviceInfo device = null;
+                        try
+                        {
+                            device = JsonConvert.DeserializeObject<CloudDeviceInfo>(json);
+                            devices.Add(device);
+                        }
+                        catch (Exception ex)
+                        {
+                            Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to deserialize JSON for path {0} - ex: {1}", fileInfo.Path.Name, ex);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to download file {0} - ex: {1}", fileInfo.Path.Name, ex);
+                    }
+                    finally
+                    {
+                        if (file != null)
+                            file.Close();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("AndroidDropboxService - PullDeviceInfos - Exception: {0}", ex);
+                throw;
+            }
+
+            return devices;
+        }
+
         public string PushNowPlaying(AudioFile audioFile, long positionBytes, string position)
         {
             return PushNowPlaying_File(audioFile, positionBytes, position);
@@ -518,6 +572,7 @@ public void OnFileChange(DbxFile file)
 
             Console.WriteLine("AndroidDropboxService - OnFileChange {0}", file.Path.ToString());
         }
+
     }
 
     public class SerializablePlaylist
diff --git a/MPfm/MPfm.Android/MPfm.Android.csproj b/MPfm/MPfm.Android/MPfm.Android.csproj
index e805b40b..b077da72 100644
--- a/MPfm/MPfm.Android/MPfm.Android.csproj
+++ b/MPfm/MPfm.Android/MPfm.Android.csproj
@@ -91,6 +91,7 @@
     <Compile Include="Classes\Adapters\FolderListAdapter.cs" />
     <Compile Include="Classes\Adapters\PlaylistListAdapter.cs" />
     <Compile Include="Classes\Adapters\PlaylistItemListAdapter.cs" />
+    <Compile Include="Classes\Adapters\ResumePlaybackListAdapter.cs" />
     <Compile Include="Classes\Adapters\SyncMenuListAdapter.cs" />
     <Compile Include="Classes\Adapters\SyncListAdapter.cs" />
     <Compile Include="Classes\Adapters\MobileLibraryBrowserGridAdapter.cs" />
@@ -308,6 +309,9 @@
     <AndroidResource Include="Resources\layout\ResumePlayback.axml">
       <SubType>Designer</SubType>
     </AndroidResource>
+    <AndroidResource Include="Resources\layout\ResumePlaybackCell.axml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\Values\Strings.xml" />
diff --git a/MPfm/MPfm.Android/Resources/Layout/ResumePlayback.axml b/MPfm/MPfm.Android/Resources/Layout/ResumePlayback.axml
index c9d2d60a..e2183c40 100644
--- a/MPfm/MPfm.Android/Resources/Layout/ResumePlayback.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/ResumePlayback.axml
@@ -6,34 +6,12 @@
   android:orientation="vertical"
   android:background="@color/background">
   <TextView
-    android:id="@+id/resumePlayback_lblIPAddress"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="6dp"
-    android:text="Please select a device to resume from:"
+    android:padding="8dp"
+    android:text="Please select a device from the list to resume playback:"
     android:textSize="14dp"
     android:textColor="#CCCCCC" />
-  <LinearLayout
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="6dp"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
-    <ProgressBar
-      android:id="@+id/resumePlayback_progressBar"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"      
-      style="@android:style/Widget.ProgressBar.Small"
-      android:indeterminate="true" />
-    <TextView
-      android:id="@+id/resumePlayback_lblStatus"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"     
-      android:layout_marginLeft="8dp"      
-      android:text="Refreshing devices..."
-      android:textSize="16dp"
-      android:textColor="#FFFFFF" />
-  </LinearLayout>
   <ListView
     android:id="@+id/resumePlayback_listView"
     android:layout_width="fill_parent"
@@ -44,13 +22,4 @@
     android:divider="#BBBBBB"
     android:dividerHeight="1px"
     android:listSelector="@drawable/list" />
-  <Button
-    android:id="@+id/resumePlayback_btnConnectManually"    
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:background="@drawable/button"
-    android:text="Connect manually to device"
-    android:textColor="@color/button_textcolor"
-    android:textSize="14dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/MPfm/MPfm.Android/Resources/Layout/ResumePlaybackCell.axml b/MPfm/MPfm.Android/Resources/Layout/ResumePlaybackCell.axml
new file mode 100644
index 00000000..70b52050
--- /dev/null
+++ b/MPfm/MPfm.Android/Resources/Layout/ResumePlaybackCell.axml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+   android:layout_width="fill_parent"
+   android:layout_height="118dp"
+   android:minHeight="118dp"
+   android:maxHeight="118dp"
+   android:padding="6dp"
+   android:orientation="vertical">
+  <TextView
+    android:id="@+id/resumePlaybackCell_lblTitle"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"   
+    android:text="[Title]"
+    android:textColor="@color/list_text"
+    android:textStyle="bold"
+    android:textSize="16dp" />
+  <TextView
+    android:id="@+id/resumePlaybackCell_lblSubtitle"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="[Subtitle]"
+    android:textColor="#222222"
+    android:textSize="14dp" />
+  <LinearLayout 
+     android:layout_width="fill_parent"
+     android:layout_height="wrap_content"
+     android:paddingTop="8dp"
+     android:paddingBottom="8dp"
+     android:orientation="horizontal">
+    <ImageView
+      android:id="@+id/resumePlaybackCell_imageAlbum"
+      android:layout_width="54dp"
+      android:layout_height="54dp"
+      android:layout_marginRight="6dp"
+      android:background="#333333" />
+    <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+      <TextView
+        android:id="@+id/resumePlaybackCell_lblArtistName"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="[ArtistName]"
+        android:textColor="#000000"
+        android:textSize="12dp" />
+      <TextView
+        android:id="@+id/resumePlaybackCell_lblAlbumTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="[AlbumTitle]"
+        android:textColor="#222222"
+        android:textSize="12dp" />
+      <TextView
+        android:id="@+id/resumePlaybackCell_lblSongTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="[SongTitle]"
+        android:textColor="#444444"
+        android:textSize="12dp" />
+    </LinearLayout>     
+  </LinearLayout>
+  <TextView
+  android:id="@+id/resumePlaybackCell_lblTimestamp"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:text="[Timestamp]"
+  android:textColor="#666666"
+  android:textSize="11dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/MPfm/MPfm.Android/Resources/Resource.Designer.cs b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
index 053e59b4..231d29fc 100644
--- a/MPfm/MPfm.Android/Resources/Resource.Designer.cs
+++ b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
@@ -559,8 +559,8 @@ public partial class Id
 			// aapt resource value: 0x7f0c001f
 			public const int equalizerPresetCell_lblName = 2131492895;
 			
-			// aapt resource value: 0x7f0c012c
-			public const int equalizerPresetDetailsMenu_item_save = 2131493164;
+			// aapt resource value: 0x7f0c012f
+			public const int equalizerPresetDetailsMenu_item_save = 2131493167;
 			
 			// aapt resource value: 0x7f0c0028
 			public const int equalizerPresetDetails_btnDelete = 2131492904;
@@ -595,8 +595,8 @@ public partial class Id
 			// aapt resource value: 0x7f0c002a
 			public const int equalizerPresetFaderCell_seekBar = 2131492906;
 			
-			// aapt resource value: 0x7f0c012d
-			public const int equalizerPresetsMenu_item_add = 2131493165;
+			// aapt resource value: 0x7f0c0130
+			public const int equalizerPresetsMenu_item_add = 2131493168;
 			
 			// aapt resource value: 0x7f0c0032
 			public const int equalizerPresets_btnBypass = 2131492914;
@@ -640,23 +640,23 @@ public partial class Id
 			// aapt resource value: 0x7f0c0036
 			public const int fragment_generalSettings_mainLayout = 2131492918;
 			
-			// aapt resource value: 0x7f0c0121
-			public const int fragment_updateLibrary_button = 2131493153;
+			// aapt resource value: 0x7f0c0124
+			public const int fragment_updateLibrary_button = 2131493156;
 			
-			// aapt resource value: 0x7f0c0120
-			public const int fragment_updateLibrary_lblSubtitle = 2131493152;
+			// aapt resource value: 0x7f0c0123
+			public const int fragment_updateLibrary_lblSubtitle = 2131493155;
 			
-			// aapt resource value: 0x7f0c011f
-			public const int fragment_updateLibrary_lblTitle = 2131493151;
+			// aapt resource value: 0x7f0c0122
+			public const int fragment_updateLibrary_lblTitle = 2131493154;
 			
-			// aapt resource value: 0x7f0c011c
-			public const int fragment_updateLibrary_mainLayout = 2131493148;
+			// aapt resource value: 0x7f0c011f
+			public const int fragment_updateLibrary_mainLayout = 2131493151;
 			
-			// aapt resource value: 0x7f0c011e
-			public const int fragment_updateLibrary_progressBar = 2131493150;
+			// aapt resource value: 0x7f0c0121
+			public const int fragment_updateLibrary_progressBar = 2131493153;
 			
-			// aapt resource value: 0x7f0c011d
-			public const int fragment_updateLibrary_relativeLayout = 2131493149;
+			// aapt resource value: 0x7f0c0120
+			public const int fragment_updateLibrary_relativeLayout = 2131493152;
 			
 			// aapt resource value: 0x7f0c0038
 			public const int genericcell_image = 2131492920;
@@ -982,11 +982,11 @@ public partial class Id
 			// aapt resource value: 0x7f0c00a0
 			public const int pitchShifting_seekBar = 2131493024;
 			
-			// aapt resource value: 0x7f0c012f
-			public const int playerMenu_item_effects = 2131493167;
+			// aapt resource value: 0x7f0c0132
+			public const int playerMenu_item_effects = 2131493170;
 			
-			// aapt resource value: 0x7f0c012e
-			public const int playerMenu_item_playlist = 2131493166;
+			// aapt resource value: 0x7f0c0131
+			public const int playerMenu_item_playlist = 2131493169;
 			
 			// aapt resource value: 0x7f0c00ba
 			public const int playerMetadata_lblAlbumTitle = 2131493050;
@@ -1105,281 +1105,290 @@ public partial class Id
 			// aapt resource value: 0x7f0c00ca
 			public const int preferences_pager_title_strip = 2131493066;
 			
+			// aapt resource value: 0x7f0c00cf
+			public const int resumePlaybackCell_imageAlbum = 2131493071;
+			
+			// aapt resource value: 0x7f0c00d1
+			public const int resumePlaybackCell_lblAlbumTitle = 2131493073;
+			
 			// aapt resource value: 0x7f0c00d0
-			public const int resumePlayback_btnConnectManually = 2131493072;
+			public const int resumePlaybackCell_lblArtistName = 2131493072;
 			
-			// aapt resource value: 0x7f0c00cc
-			public const int resumePlayback_lblIPAddress = 2131493068;
+			// aapt resource value: 0x7f0c00d2
+			public const int resumePlaybackCell_lblSongTitle = 2131493074;
 			
 			// aapt resource value: 0x7f0c00ce
-			public const int resumePlayback_lblStatus = 2131493070;
+			public const int resumePlaybackCell_lblSubtitle = 2131493070;
 			
-			// aapt resource value: 0x7f0c00cf
-			public const int resumePlayback_listView = 2131493071;
+			// aapt resource value: 0x7f0c00d3
+			public const int resumePlaybackCell_lblTimestamp = 2131493075;
+			
+			// aapt resource value: 0x7f0c00cd
+			public const int resumePlaybackCell_lblTitle = 2131493069;
+			
+			// aapt resource value: 0x7f0c00cc
+			public const int resumePlayback_listView = 2131493068;
 			
 			// aapt resource value: 0x7f0c00cb
 			public const int resumePlayback_mainLayout = 2131493067;
 			
-			// aapt resource value: 0x7f0c00cd
-			public const int resumePlayback_progressBar = 2131493069;
+			// aapt resource value: 0x7f0c00d6
+			public const int selectFolders_btnCancel = 2131493078;
 			
-			// aapt resource value: 0x7f0c00d3
-			public const int selectFolders_btnCancel = 2131493075;
+			// aapt resource value: 0x7f0c00d7
+			public const int selectFolders_btnOK = 2131493079;
 			
 			// aapt resource value: 0x7f0c00d4
-			public const int selectFolders_btnOK = 2131493076;
-			
-			// aapt resource value: 0x7f0c00d1
-			public const int selectFolders_layoutLoading = 2131493073;
-			
-			// aapt resource value: 0x7f0c00d2
-			public const int selectFolders_listView = 2131493074;
+			public const int selectFolders_layoutLoading = 2131493076;
 			
 			// aapt resource value: 0x7f0c00d5
-			public const int selectPlaylist_btnAddNewPlaylist = 2131493077;
-			
-			// aapt resource value: 0x7f0c00d7
-			public const int selectPlaylist_btnCancel = 2131493079;
+			public const int selectFolders_listView = 2131493077;
 			
 			// aapt resource value: 0x7f0c00d8
-			public const int selectPlaylist_btnSelect = 2131493080;
+			public const int selectPlaylist_btnAddNewPlaylist = 2131493080;
 			
-			// aapt resource value: 0x7f0c00d6
-			public const int selectPlaylist_listView = 2131493078;
+			// aapt resource value: 0x7f0c00da
+			public const int selectPlaylist_btnCancel = 2131493082;
+			
+			// aapt resource value: 0x7f0c00db
+			public const int selectPlaylist_btnSelect = 2131493083;
 			
 			// aapt resource value: 0x7f0c00d9
-			public const int splash_layout = 2131493081;
+			public const int selectPlaylist_listView = 2131493081;
 			
-			// aapt resource value: 0x7f0c00da
-			public const int splash_text = 2131493082;
+			// aapt resource value: 0x7f0c00dc
+			public const int splash_layout = 2131493084;
 			
-			// aapt resource value: 0x7f0c00e9
-			public const int syncCloud_btnDelete = 2131493097;
+			// aapt resource value: 0x7f0c00dd
+			public const int splash_text = 2131493085;
 			
-			// aapt resource value: 0x7f0c00e5
-			public const int syncCloud_btnLogin = 2131493093;
+			// aapt resource value: 0x7f0c00ec
+			public const int syncCloud_btnDelete = 2131493100;
 			
-			// aapt resource value: 0x7f0c00e6
-			public const int syncCloud_btnLogout = 2131493094;
+			// aapt resource value: 0x7f0c00e8
+			public const int syncCloud_btnLogin = 2131493096;
 			
-			// aapt resource value: 0x7f0c00e7
-			public const int syncCloud_btnPull = 2131493095;
+			// aapt resource value: 0x7f0c00e9
+			public const int syncCloud_btnLogout = 2131493097;
 			
-			// aapt resource value: 0x7f0c00e8
-			public const int syncCloud_btnPush = 2131493096;
+			// aapt resource value: 0x7f0c00ea
+			public const int syncCloud_btnPull = 2131493098;
 			
-			// aapt resource value: 0x7f0c00e2
-			public const int syncCloud_lblConnected = 2131493090;
+			// aapt resource value: 0x7f0c00eb
+			public const int syncCloud_btnPush = 2131493099;
 			
-			// aapt resource value: 0x7f0c00e3
-			public const int syncCloud_lblDataChanged = 2131493091;
+			// aapt resource value: 0x7f0c00e5
+			public const int syncCloud_lblConnected = 2131493093;
 			
-			// aapt resource value: 0x7f0c00e4
-			public const int syncCloud_lblValue = 2131493092;
+			// aapt resource value: 0x7f0c00e6
+			public const int syncCloud_lblDataChanged = 2131493094;
 			
-			// aapt resource value: 0x7f0c00e1
-			public const int syncCloud_mainLayout = 2131493089;
+			// aapt resource value: 0x7f0c00e7
+			public const int syncCloud_lblValue = 2131493095;
 			
-			// aapt resource value: 0x7f0c00ef
-			public const int syncDownload_lblCompleted = 2131493103;
+			// aapt resource value: 0x7f0c00e4
+			public const int syncCloud_mainLayout = 2131493092;
 			
-			// aapt resource value: 0x7f0c00ee
-			public const int syncDownload_lblCompletedValue = 2131493102;
+			// aapt resource value: 0x7f0c00f2
+			public const int syncDownload_lblCompleted = 2131493106;
 			
-			// aapt resource value: 0x7f0c00f5
-			public const int syncDownload_lblCurrentFileProgress = 2131493109;
+			// aapt resource value: 0x7f0c00f1
+			public const int syncDownload_lblCompletedValue = 2131493105;
 			
-			// aapt resource value: 0x7f0c00f4
-			public const int syncDownload_lblCurrentFileProgressValue = 2131493108;
+			// aapt resource value: 0x7f0c00f8
+			public const int syncDownload_lblCurrentFileProgress = 2131493112;
 			
 			// aapt resource value: 0x7f0c00f7
-			public const int syncDownload_lblDownloadSpeed = 2131493111;
+			public const int syncDownload_lblCurrentFileProgressValue = 2131493111;
 			
-			// aapt resource value: 0x7f0c00f6
-			public const int syncDownload_lblDownloadSpeedValue = 2131493110;
+			// aapt resource value: 0x7f0c00fa
+			public const int syncDownload_lblDownloadSpeed = 2131493114;
 			
 			// aapt resource value: 0x7f0c00f9
-			public const int syncDownload_lblErrors = 2131493113;
-			
-			// aapt resource value: 0x7f0c00f8
-			public const int syncDownload_lblErrorsValue = 2131493112;
+			public const int syncDownload_lblDownloadSpeedValue = 2131493113;
 			
-			// aapt resource value: 0x7f0c00ed
-			public const int syncDownload_lblFileName = 2131493101;
+			// aapt resource value: 0x7f0c00fc
+			public const int syncDownload_lblErrors = 2131493116;
 			
-			// aapt resource value: 0x7f0c00f1
-			public const int syncDownload_lblFilesDownloaded = 2131493105;
+			// aapt resource value: 0x7f0c00fb
+			public const int syncDownload_lblErrorsValue = 2131493115;
 			
 			// aapt resource value: 0x7f0c00f0
-			public const int syncDownload_lblFilesDownloadedValue = 2131493104;
+			public const int syncDownload_lblFileName = 2131493104;
 			
-			// aapt resource value: 0x7f0c00ec
-			public const int syncDownload_lblTitle = 2131493100;
+			// aapt resource value: 0x7f0c00f4
+			public const int syncDownload_lblFilesDownloaded = 2131493108;
 			
 			// aapt resource value: 0x7f0c00f3
-			public const int syncDownload_lblTotalFiles = 2131493107;
-			
-			// aapt resource value: 0x7f0c00f2
-			public const int syncDownload_lblTotalFilesValue = 2131493106;
+			public const int syncDownload_lblFilesDownloadedValue = 2131493107;
 			
-			// aapt resource value: 0x7f0c00ea
-			public const int syncDownload_mainLayout = 2131493098;
+			// aapt resource value: 0x7f0c00ef
+			public const int syncDownload_lblTitle = 2131493103;
 			
-			// aapt resource value: 0x7f0c00eb
-			public const int syncDownload_progressBar = 2131493099;
+			// aapt resource value: 0x7f0c00f6
+			public const int syncDownload_lblTotalFiles = 2131493110;
 			
-			// aapt resource value: 0x7f0c00fa
-			public const int syncManualConnect_lblIPAddress = 2131493114;
+			// aapt resource value: 0x7f0c00f5
+			public const int syncDownload_lblTotalFilesValue = 2131493109;
 			
-			// aapt resource value: 0x7f0c00fc
-			public const int syncManualConnect_lblPort = 2131493116;
+			// aapt resource value: 0x7f0c00ed
+			public const int syncDownload_mainLayout = 2131493101;
 			
-			// aapt resource value: 0x7f0c00fb
-			public const int syncManualConnect_txtIPAddress = 2131493115;
+			// aapt resource value: 0x7f0c00ee
+			public const int syncDownload_progressBar = 2131493102;
 			
 			// aapt resource value: 0x7f0c00fd
-			public const int syncManualConnect_txtPort = 2131493117;
+			public const int syncManualConnect_lblIPAddress = 2131493117;
 			
-			// aapt resource value: 0x7f0c0109
-			public const int syncMenuCell_checkmark = 2131493129;
+			// aapt resource value: 0x7f0c00ff
+			public const int syncManualConnect_lblPort = 2131493119;
 			
-			// aapt resource value: 0x7f0c0106
-			public const int syncMenuCell_image = 2131493126;
+			// aapt resource value: 0x7f0c00fe
+			public const int syncManualConnect_txtIPAddress = 2131493118;
 			
-			// aapt resource value: 0x7f0c0107
-			public const int syncMenuCell_index = 2131493127;
+			// aapt resource value: 0x7f0c0100
+			public const int syncManualConnect_txtPort = 2131493120;
 			
-			// aapt resource value: 0x7f0c0108
-			public const int syncMenuCell_title = 2131493128;
+			// aapt resource value: 0x7f0c010c
+			public const int syncMenuCell_checkmark = 2131493132;
 			
-			// aapt resource value: 0x7f0c0130
-			public const int syncMenuMenu_item_sync = 2131493168;
+			// aapt resource value: 0x7f0c0109
+			public const int syncMenuCell_image = 2131493129;
 			
-			// aapt resource value: 0x7f0c0105
-			public const int syncMenu_btnSelectAll = 2131493125;
+			// aapt resource value: 0x7f0c010a
+			public const int syncMenuCell_index = 2131493130;
 			
-			// aapt resource value: 0x7f0c0104
-			public const int syncMenu_lblFreeSpace = 2131493124;
+			// aapt resource value: 0x7f0c010b
+			public const int syncMenuCell_title = 2131493131;
 			
-			// aapt resource value: 0x7f0c0100
-			public const int syncMenu_lblStatus = 2131493120;
+			// aapt resource value: 0x7f0c0133
+			public const int syncMenuMenu_item_sync = 2131493171;
+			
+			// aapt resource value: 0x7f0c0108
+			public const int syncMenu_btnSelectAll = 2131493128;
+			
+			// aapt resource value: 0x7f0c0107
+			public const int syncMenu_lblFreeSpace = 2131493127;
 			
 			// aapt resource value: 0x7f0c0103
-			public const int syncMenu_lblTotal = 2131493123;
+			public const int syncMenu_lblStatus = 2131493123;
 			
-			// aapt resource value: 0x7f0c0102
-			public const int syncMenu_listView = 2131493122;
+			// aapt resource value: 0x7f0c0106
+			public const int syncMenu_lblTotal = 2131493126;
 			
-			// aapt resource value: 0x7f0c00fe
-			public const int syncMenu_loadingLayout = 2131493118;
+			// aapt resource value: 0x7f0c0105
+			public const int syncMenu_listView = 2131493125;
 			
 			// aapt resource value: 0x7f0c0101
-			public const int syncMenu_mainLayout = 2131493121;
-			
-			// aapt resource value: 0x7f0c00ff
-			public const int syncMenu_progressBar = 2131493119;
+			public const int syncMenu_loadingLayout = 2131493121;
 			
-			// aapt resource value: 0x7f0c010f
-			public const int syncWebBrowser_lblCode = 2131493135;
+			// aapt resource value: 0x7f0c0104
+			public const int syncMenu_mainLayout = 2131493124;
 			
-			// aapt resource value: 0x7f0c010b
-			public const int syncWebBrowser_lblStep1 = 2131493131;
+			// aapt resource value: 0x7f0c0102
+			public const int syncMenu_progressBar = 2131493122;
 			
-			// aapt resource value: 0x7f0c010c
-			public const int syncWebBrowser_lblStep1Details = 2131493132;
+			// aapt resource value: 0x7f0c0112
+			public const int syncWebBrowser_lblCode = 2131493138;
 			
 			// aapt resource value: 0x7f0c010e
-			public const int syncWebBrowser_lblStep2 = 2131493134;
+			public const int syncWebBrowser_lblStep1 = 2131493134;
+			
+			// aapt resource value: 0x7f0c010f
+			public const int syncWebBrowser_lblStep1Details = 2131493135;
+			
+			// aapt resource value: 0x7f0c0111
+			public const int syncWebBrowser_lblStep2 = 2131493137;
+			
+			// aapt resource value: 0x7f0c0110
+			public const int syncWebBrowser_lblUrl = 2131493136;
 			
 			// aapt resource value: 0x7f0c010d
-			public const int syncWebBrowser_lblUrl = 2131493133;
+			public const int syncWebBrowser_mainLayout = 2131493133;
 			
-			// aapt resource value: 0x7f0c010a
-			public const int syncWebBrowser_mainLayout = 2131493130;
+			// aapt resource value: 0x7f0c00e3
+			public const int sync_btnConnectManually = 2131493091;
 			
-			// aapt resource value: 0x7f0c00e0
-			public const int sync_btnConnectManually = 2131493088;
+			// aapt resource value: 0x7f0c00df
+			public const int sync_lblIPAddress = 2131493087;
 			
-			// aapt resource value: 0x7f0c00dc
-			public const int sync_lblIPAddress = 2131493084;
+			// aapt resource value: 0x7f0c00e1
+			public const int sync_lblStatus = 2131493089;
+			
+			// aapt resource value: 0x7f0c00e2
+			public const int sync_listView = 2131493090;
 			
 			// aapt resource value: 0x7f0c00de
-			public const int sync_lblStatus = 2131493086;
+			public const int sync_mainLayout = 2131493086;
 			
-			// aapt resource value: 0x7f0c00df
-			public const int sync_listView = 2131493087;
+			// aapt resource value: 0x7f0c00e0
+			public const int sync_progressBar = 2131493088;
 			
-			// aapt resource value: 0x7f0c00db
-			public const int sync_mainLayout = 2131493083;
+			// aapt resource value: 0x7f0c011c
+			public const int timeShifting_btnDecrement = 2131493148;
 			
-			// aapt resource value: 0x7f0c00dd
-			public const int sync_progressBar = 2131493085;
+			// aapt resource value: 0x7f0c0116
+			public const int timeShifting_btnDetectTempo = 2131493142;
 			
-			// aapt resource value: 0x7f0c0119
-			public const int timeShifting_btnDecrement = 2131493145;
+			// aapt resource value: 0x7f0c011d
+			public const int timeShifting_btnIncrement = 2131493149;
 			
-			// aapt resource value: 0x7f0c0113
-			public const int timeShifting_btnDetectTempo = 2131493139;
+			// aapt resource value: 0x7f0c011e
+			public const int timeShifting_btnReset = 2131493150;
 			
-			// aapt resource value: 0x7f0c011a
-			public const int timeShifting_btnIncrement = 2131493146;
+			// aapt resource value: 0x7f0c0117
+			public const int timeShifting_lblCurrentTempo = 2131493143;
 			
-			// aapt resource value: 0x7f0c011b
-			public const int timeShifting_btnReset = 2131493147;
+			// aapt resource value: 0x7f0c0119
+			public const int timeShifting_lblCurrentTempoValue = 2131493145;
 			
 			// aapt resource value: 0x7f0c0114
-			public const int timeShifting_lblCurrentTempo = 2131493140;
+			public const int timeShifting_lblDetectedTempo = 2131493140;
 			
-			// aapt resource value: 0x7f0c0116
-			public const int timeShifting_lblCurrentTempoValue = 2131493142;
+			// aapt resource value: 0x7f0c0115
+			public const int timeShifting_lblDetectedTempoValue = 2131493141;
 			
-			// aapt resource value: 0x7f0c0111
-			public const int timeShifting_lblDetectedTempo = 2131493137;
+			// aapt resource value: 0x7f0c0118
+			public const int timeShifting_lblReferenceTempo = 2131493144;
 			
-			// aapt resource value: 0x7f0c0112
-			public const int timeShifting_lblDetectedTempoValue = 2131493138;
+			// aapt resource value: 0x7f0c011a
+			public const int timeShifting_lblReferenceTempoValue = 2131493146;
 			
-			// aapt resource value: 0x7f0c0115
-			public const int timeShifting_lblReferenceTempo = 2131493141;
+			// aapt resource value: 0x7f0c0113
+			public const int timeShifting_lblTitle = 2131493139;
 			
-			// aapt resource value: 0x7f0c0117
-			public const int timeShifting_lblReferenceTempoValue = 2131493143;
+			// aapt resource value: 0x7f0c011b
+			public const int timeShifting_seekBar = 2131493147;
 			
-			// aapt resource value: 0x7f0c0110
-			public const int timeShifting_lblTitle = 2131493136;
+			// aapt resource value: 0x7f0c0125
+			public const int widgetPlayer = 2131493157;
 			
-			// aapt resource value: 0x7f0c0118
-			public const int timeShifting_seekBar = 2131493144;
+			// aapt resource value: 0x7f0c012d
+			public const int widgetPlayerLoading = 2131493165;
 			
-			// aapt resource value: 0x7f0c0122
-			public const int widgetPlayer = 2131493154;
+			// aapt resource value: 0x7f0c012e
+			public const int widgetPlayerLoading_lblMessage = 2131493166;
 			
-			// aapt resource value: 0x7f0c012a
-			public const int widgetPlayerLoading = 2131493162;
+			// aapt resource value: 0x7f0c012c
+			public const int widgetPlayer_btnNext = 2131493164;
 			
 			// aapt resource value: 0x7f0c012b
-			public const int widgetPlayerLoading_lblMessage = 2131493163;
+			public const int widgetPlayer_btnPlayPause = 2131493163;
 			
-			// aapt resource value: 0x7f0c0129
-			public const int widgetPlayer_btnNext = 2131493161;
+			// aapt resource value: 0x7f0c012a
+			public const int widgetPlayer_btnPrevious = 2131493162;
+			
+			// aapt resource value: 0x7f0c0126
+			public const int widgetPlayer_imageAlbum = 2131493158;
 			
 			// aapt resource value: 0x7f0c0128
-			public const int widgetPlayer_btnPlayPause = 2131493160;
+			public const int widgetPlayer_lblAlbumTitle = 2131493160;
 			
 			// aapt resource value: 0x7f0c0127
-			public const int widgetPlayer_btnPrevious = 2131493159;
-			
-			// aapt resource value: 0x7f0c0123
-			public const int widgetPlayer_imageAlbum = 2131493155;
-			
-			// aapt resource value: 0x7f0c0125
-			public const int widgetPlayer_lblAlbumTitle = 2131493157;
+			public const int widgetPlayer_lblArtistName = 2131493159;
 			
-			// aapt resource value: 0x7f0c0124
-			public const int widgetPlayer_lblArtistName = 2131493156;
-			
-			// aapt resource value: 0x7f0c0126
-			public const int widgetPlayer_lblSongTitle = 2131493158;
+			// aapt resource value: 0x7f0c0129
+			public const int widgetPlayer_lblSongTitle = 2131493161;
 			
 			static Id()
 			{
@@ -1494,46 +1503,49 @@ public partial class Layout
 			public const int ResumePlayback = 2130903072;
 			
 			// aapt resource value: 0x7f030021
-			public const int SelectFolders = 2130903073;
+			public const int ResumePlaybackCell = 2130903073;
 			
 			// aapt resource value: 0x7f030022
-			public const int SelectPlaylist = 2130903074;
+			public const int SelectFolders = 2130903074;
 			
 			// aapt resource value: 0x7f030023
-			public const int Splash = 2130903075;
+			public const int SelectPlaylist = 2130903075;
 			
 			// aapt resource value: 0x7f030024
-			public const int Sync = 2130903076;
+			public const int Splash = 2130903076;
 			
 			// aapt resource value: 0x7f030025
-			public const int SyncCloud = 2130903077;
+			public const int Sync = 2130903077;
 			
 			// aapt resource value: 0x7f030026
-			public const int SyncDownload = 2130903078;
+			public const int SyncCloud = 2130903078;
 			
 			// aapt resource value: 0x7f030027
-			public const int SyncManualConnect = 2130903079;
+			public const int SyncDownload = 2130903079;
 			
 			// aapt resource value: 0x7f030028
-			public const int SyncMenu = 2130903080;
+			public const int SyncManualConnect = 2130903080;
 			
 			// aapt resource value: 0x7f030029
-			public const int SyncMenuCell = 2130903081;
+			public const int SyncMenu = 2130903081;
 			
 			// aapt resource value: 0x7f03002a
-			public const int SyncWebBrowser = 2130903082;
+			public const int SyncMenuCell = 2130903082;
 			
 			// aapt resource value: 0x7f03002b
-			public const int TimeShifting = 2130903083;
+			public const int SyncWebBrowser = 2130903083;
 			
 			// aapt resource value: 0x7f03002c
-			public const int UpdateLibrary = 2130903084;
+			public const int TimeShifting = 2130903084;
 			
 			// aapt resource value: 0x7f03002d
-			public const int WidgetPlayer = 2130903085;
+			public const int UpdateLibrary = 2130903085;
 			
 			// aapt resource value: 0x7f03002e
-			public const int WidgetPlayerLoading = 2130903086;
+			public const int WidgetPlayer = 2130903086;
+			
+			// aapt resource value: 0x7f03002f
+			public const int WidgetPlayerLoading = 2130903087;
 			
 			static Layout()
 			{
diff --git a/MPfm/MPfm.MVP/Helpers/ConfigurationHelper.cs b/MPfm/MPfm.Core/Helpers/PathHelper.cs
similarity index 86%
rename from MPfm/MPfm.MVP/Helpers/ConfigurationHelper.cs
rename to MPfm/MPfm.Core/Helpers/PathHelper.cs
index 1bd66236..aabe9150 100644
--- a/MPfm/MPfm.MVP/Helpers/ConfigurationHelper.cs
+++ b/MPfm/MPfm.Core/Helpers/PathHelper.cs
@@ -17,27 +17,25 @@
 
 using System;
 using System.IO;
-using System.Xml.Serialization;
-using MPfm.MVP.Config;
 
 #if WINDOWSSTORE
 using Windows.Storage;
 #endif
 
-namespace MPfm.MVP.Helpers
+namespace MPfm.Core.Helpers
 {
     /// <summary>
     /// Helper static class for configuration paths.
     /// </summary>
-    public static class ConfigurationHelper
+    public static class PathHelper
     {
-		public static string HomeDirectory;
-        public static string PeakFileDirectory;
-		public static string ConfigurationFilePath;
-		public static string DatabaseFilePath;
-		public static string LogFilePath;		
+        public static string HomeDirectory { get; set; }
+        public static string PeakFileDirectory { get; set; }
+        public static string ConfigurationFilePath { get; set; }
+        public static string DatabaseFilePath { get; set; }
+        public static string LogFilePath { get; set; }
 		
-		static ConfigurationHelper()
+		static PathHelper()
 		{
 			// Get assembly directory
 			//string assemblyDirectory = System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
diff --git a/MPfm/MPfm.Core/MPfm.Core.csproj b/MPfm/MPfm.Core/MPfm.Core.csproj
index dcdbf282..9f4254f3 100644
--- a/MPfm/MPfm.Core/MPfm.Core.csproj
+++ b/MPfm/MPfm.Core/MPfm.Core.csproj
@@ -96,6 +96,7 @@
     <Compile Include="Attributes\DatabaseFieldAttribute.cs" />
     <Compile Include="DatabaseFieldMap.cs" />
     <Compile Include="Extensions\DictionaryExtension.cs" />
+    <Compile Include="Helpers\PathHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tracing.cs" />
     <Compile Include="OS.cs" />
@@ -104,7 +105,9 @@
     <Compile Include="Normalizer.cs" />
     <Compile Include="Helpers\XMLHelper.cs" />
     <Compile Include="Network\IPAddressRangeFinder.cs" />
-    <Compile Include="Network\WebClientTimeout.cs" />
+    <Compile Include="Network\WebClientTimeout.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="XmlSerialization.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MPfm/MPfm.Library/MPfm.Library.Android.csproj b/MPfm/MPfm.Library/MPfm.Library.Android.csproj
index 15c412ff..91f96013 100644
--- a/MPfm/MPfm.Library/MPfm.Library.Android.csproj
+++ b/MPfm/MPfm.Library/MPfm.Library.Android.csproj
@@ -160,6 +160,8 @@
     <Compile Include="Database\Interfaces\IDatabaseFacade.cs" />
     <Compile Include="Database\Interfaces\ISQLiteGateway.cs" />
     <Compile Include="Database\DatabaseFacade.cs" />
+    <Compile Include="Objects\CloudDeviceInfo.cs" />
+    <Compile Include="Objects\CloudPlaylist.cs" />
     <Compile Include="Objects\PlaylistAudioFile.cs" />
     <Compile Include="Objects\NetworkState.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
diff --git a/MPfm/MPfm.Library/MPfm.Library.csproj b/MPfm/MPfm.Library/MPfm.Library.csproj
index e036bd03..a76ad04b 100644
--- a/MPfm/MPfm.Library/MPfm.Library.csproj
+++ b/MPfm/MPfm.Library/MPfm.Library.csproj
@@ -171,6 +171,9 @@
     <Compile Include="Database\Interfaces\IDatabaseFacade.cs" />
     <Compile Include="Database\Interfaces\ISQLiteGateway.cs" />
     <Compile Include="Database\DatabaseFacade.cs" />
+    <Compile Include="Objects\AuthenticationToken.cs" />
+    <Compile Include="Objects\CloudDeviceInfo.cs" />
+    <Compile Include="Objects\CloudPlaylist.cs" />
     <Compile Include="Objects\PlaylistAudioFile.cs" />
     <Compile Include="Objects\NetworkState.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
@@ -180,7 +183,8 @@
     <Compile Include="Objects\Folder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\DropboxCoreService.cs" />
-    <Compile Include="Services\Interfaces\IDropboxService.cs" />
+    <Compile Include="Services\Exceptions\CloudAppNotLinkedException.cs" />
+    <Compile Include="Services\Interfaces\ICloudLibraryService.cs" />
     <Compile Include="UpdateLibrary\UpdateLibraryProgressDataSong.cs" />
     <Compile Include="UpdateLibrary\UpdateLibraryFinishedData.cs" />
     <Compile Include="UpdateLibrary\UpdateLibraryArgument.cs" />
diff --git a/MPfm/MPfm.Library/Objects/AuthenticationToken.cs b/MPfm/MPfm.Library/Objects/AuthenticationToken.cs
new file mode 100644
index 00000000..cf160861
--- /dev/null
+++ b/MPfm/MPfm.Library/Objects/AuthenticationToken.cs
@@ -0,0 +1,31 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+
+namespace MPfm.Library.Objects
+{
+    /// <summary>
+	/// Object representing a authentication token (value + secret) and user name.
+    /// </summary>
+    public class AuthenticationToken
+    {
+        public string Value { get; set; }
+        public string Secret { get; set; }
+        public string UserName { get; set; }
+    }
+}
diff --git a/MPfm/MPfm.Library/Services/DropboxCoreService.cs b/MPfm/MPfm.Library/Services/DropboxCoreService.cs
index db14e54f..a58d5f23 100644
--- a/MPfm/MPfm.Library/Services/DropboxCoreService.cs
+++ b/MPfm/MPfm.Library/Services/DropboxCoreService.cs
@@ -15,6 +15,13 @@
 // You should have received a copy of the GNU General Public License
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
+using System.Text;
+using MPfm.Core;
+using MPfm.Core.Helpers;
+using MPfm.Library.Objects;
+using MPfm.Library.Services.Exceptions;
+using MPfm.Sound.Playlists;
+using Newtonsoft.Json;
 #if !IOS && !ANDROID && !WINDOWS_PHONE
 using System;
 using System.Collections.Generic;
@@ -41,10 +48,14 @@ public class DropboxCoreService : ICloudLibraryService
         private readonly ILibraryService _libraryService;
         private readonly IAudioFileCacheService _audioFileCacheService;
         private readonly ISyncDeviceSpecifications _deviceSpecifications;
+        private IDropbox _dropbox;
         private DropboxServiceProvider _dropboxServiceProvider;
         private OAuthToken _oauthToken;
 
-        public event DropboxDataChanged OnDropboxDataChanged;
+        public bool HasLinkedAccount { get; private set; }
+
+        public event CloudDataChanged OnCloudDataChanged;
+        public event CloudAuthenticationStatusChanged OnCloudAuthenticationStatusChanged;
 
         public DropboxCoreService(ILibraryService libraryService, IAudioFileCacheService audioFileCacheService,
             ISyncDeviceSpecifications deviceSpecifications)
@@ -57,34 +68,84 @@ public class DropboxCoreService : ICloudLibraryService
 
         private void Initialize()
         {
-        }
+            try
+            {
+                Console.WriteLine("DropboxCoreService - Initialize - Initializing service...");
+                var diskToken = LoadTokenFromDisk();
+                var oauthAccessToken = new OAuthToken(diskToken.Value, diskToken.Secret);
 
-        public bool HasLinkedAccount { get; private set; }
+                _dropboxServiceProvider = new DropboxServiceProvider(DropboxAppKey, DropboxAppSecret, AccessLevel.AppFolder);
+                _dropbox = _dropboxServiceProvider.GetApi(oauthAccessToken.Value, oauthAccessToken.Secret);
+                //dropbox.Locale = CultureInfo.CurrentUICulture.IetfLanguageTag;
+                HasLinkedAccount = true;
+                Console.WriteLine("DropboxCoreService - Initialize - Finished initializing service!");
+            }
+            catch (AggregateException ae)
+            {
+                HasLinkedAccount = false;
+                ae.Handle(ex =>
+                {
+                    if (ex is DropboxApiException)
+                    {
+                        Console.WriteLine("DropboxCoreService - Initialize - Exception: {0}", ex);
+                        return true;
+                    }
+                    
+                    // Ignore exceptions; if we cannot login on initialize, the user will have to relink the app later. 
+                    // The UI should check the HasLinkedAccount property to see if Dropbox is available.
+                    return true;
+                });
+            }
+            catch (Exception ex)
+            {
+                // Ignore exceptions (see previous comment)
+            }
+        }        
 
         public void LinkApp(object view)
         {
             try
             {
-                _dropboxServiceProvider = new DropboxServiceProvider(DropboxAppKey, DropboxAppSecret,
-                    AccessLevel.AppFolder);
+                if (OnCloudAuthenticationStatusChanged != null)
+                    OnCloudAuthenticationStatusChanged(CloudAuthenticationStatusType.GetRequestToken);
 
-                /* OAuth 1.0 'dance' */
+                // If the Initialize method has failed the service provider will be null!
+                if(_dropboxServiceProvider == null)
+                    _dropboxServiceProvider = new DropboxServiceProvider(DropboxAppKey, DropboxAppSecret, AccessLevel.AppFolder);
 
-                // Authorization without callback url
-                Console.Write("Getting request token...");
+                // Authorization without callback url                
                 _oauthToken = _dropboxServiceProvider.OAuthOperations.FetchRequestTokenAsync(null, null).Result;
-                Console.WriteLine("Done - FetchRequestToken - secret: {0} value: {1}", _oauthToken.Secret,
-                    _oauthToken.Value);
 
-                OAuth1Parameters parameters = new OAuth1Parameters();
-                //parameters.Add("locale", CultureInfo.CurrentUICulture.IetfLanguageTag); // for a localized version of the authorization website
-                string authenticateUrl = _dropboxServiceProvider.OAuthOperations.BuildAuthorizeUrl(_oauthToken.Value,
-                    parameters);
-                Console.WriteLine("Redirect user for authorization");
-                Process.Start(authenticateUrl);
+                if (OnCloudAuthenticationStatusChanged != null)
+                    OnCloudAuthenticationStatusChanged(CloudAuthenticationStatusType.OpenWebBrowser);
+
+                AuthenticationToken token = null;
+                try
+                {
+                    // Try to get a previously saved token
+                    token = LoadTokenFromDisk();
+                }
+                catch
+                {
+                    // Ignore exception; use the web browser to get a new token
+                }
+
+                if (token == null)
+                {
+                    // Open web browser for authentication
+                    OAuth1Parameters parameters = new OAuth1Parameters();
+                    //parameters.Add("locale", CultureInfo.CurrentUICulture.IetfLanguageTag); // for a localized version of the authorization website
+                    string authenticateUrl = _dropboxServiceProvider.OAuthOperations.BuildAuthorizeUrl(_oauthToken.Value, parameters);
+                    Process.Start(authenticateUrl);                    
+                }
+                else
+                {
+                    ContinueLinkApp(token);
+                }
             }
             catch (AggregateException ae)
             {
+                HasLinkedAccount = false;
                 ae.Handle(ex =>
                 {
                     if (ex is DropboxApiException)
@@ -95,115 +156,53 @@ public void LinkApp(object view)
                     return false;
                 });
             }
-
         }
 
         public void ContinueLinkApp()
+        {
+            ContinueLinkApp(null);
+        }
+
+        private void ContinueLinkApp(AuthenticationToken token)
         {
             try
             {
-                Console.Write("Getting access token...");
-                AuthorizedRequestToken requestToken = new AuthorizedRequestToken(_oauthToken, null);
-                OAuthToken oauthAccessToken =
-                    _dropboxServiceProvider.OAuthOperations.ExchangeForAccessTokenAsync(requestToken, null).Result;
-                Console.WriteLine("Done - FetchAccessToken - secret: {0} value: {1}", oauthAccessToken.Secret,
-                    oauthAccessToken.Value);
+                // Get access token either from parameter or from API
+                OAuthToken oauthAccessToken = null;
+                if (token == null)
+                {
+                    AuthorizedRequestToken requestToken = new AuthorizedRequestToken(_oauthToken, null);
+                    oauthAccessToken = _dropboxServiceProvider.OAuthOperations.ExchangeForAccessTokenAsync(requestToken, null).Result;
+                }
+                else
+                {
+                    oauthAccessToken = new OAuthToken(token.Value, token.Secret);
+                }
 
-                //OAuthToken oauthAccessToken2 = new OAuthToken("z20l3g6vs5bbvqcr", "b8eiq09w1gxsyad");
-                /* API */
+                if (OnCloudAuthenticationStatusChanged != null)
+                    OnCloudAuthenticationStatusChanged(CloudAuthenticationStatusType.RequestAccessToken);
 
-                IDropbox dropbox = _dropboxServiceProvider.GetApi(oauthAccessToken.Value, oauthAccessToken.Secret);
-                //IDropbox dropbox = dropboxServiceProvider.GetApi(oauthAccessToken2.Value, oauthAccessToken2.Secret);
+                // Get Dropbox API instance
+                _dropbox = _dropboxServiceProvider.GetApi(oauthAccessToken.Value, oauthAccessToken.Secret);
                 //dropbox.Locale = CultureInfo.CurrentUICulture.IetfLanguageTag;
 
-                DropboxProfile profile = dropbox.GetUserProfileAsync().Result;
-                Console.WriteLine("Hi " + profile.DisplayName + "!");
-
-                // Use step by step debugging, or not             
+                // Test Dropbox API connection (get user name from profile)
+                DropboxProfile profile = _dropbox.GetUserProfileAsync().Result;
+                HasLinkedAccount = true;
 
-                //DeltaPage deltaPage = dropbox.DeltaAsync(null).Result;
-                //dropbox.AccessLevel
-                //Entry createFolderEntry = dropbox.CreateFolderAsync("Spring Social").Result;
-
-                Task.Factory.StartNew(() =>
-                {
-                    string cursor = null;
-                    while (true)
-                    {
-                        DeltaPage deltaPage = dropbox.DeltaAsync(cursor).Result;
-                        cursor = deltaPage.Cursor;
-                        Console.WriteLine("Delta check - entries: {0} cursor: {1} hasMore: {2} reset: {3}",
-                            deltaPage.Entries.Count, deltaPage.Cursor, deltaPage.HasMore, deltaPage.Reset);
-                        if (deltaPage.Entries.Count > 0)
-                        {
-                            //FileRef fileRef = dropbox.CreateFileRefAsync("File.txt").Result;
-                            dropbox.DownloadFileAsync("File.txt")
-                                .ContinueWith(task =>
-                                {
-                                    Console.WriteLine("File '{0}' downloaded ({1})", task.Result.Metadata.Path,
-                                        task.Result.Metadata.Size);
-                                    // Save file to "C:\Spring Social.txt"
-                                    //using (FileStream fileStream = new FileStream(@"C:\Spring Social.txt", FileMode.Create))
-                                    //{
-                                    //    fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
-                                    //}
-                                });
-                        }
-                        Thread.Sleep(1000);
-                    }
+                // Save token to hard disk
+                SaveTokenToDisk(new AuthenticationToken() {
+                    Value = oauthAccessToken.Value, 
+                    Secret = oauthAccessToken.Secret,
+                    UserName = profile.DisplayName
                 });
-
-                for (int a = 0; a < 10; a++)
-                {
-                    Thread.Sleep(4000);
-                    string text = string.Format("Windows - Step {0}", a);
-                    byte[] bytes = System.Text.Encoding.UTF8.GetBytes(text);
-                    Console.WriteLine(text);
-
-                    //var test = new ByteArrayResource(bytes);
-                    Entry uploadFileEntry = dropbox.UploadFileAsync(
-                        //new AssemblyResource("assembly://Spring.ConsoleQuickStart/Spring.ConsoleQuickStart/File.txt"),
-                        new ByteArrayResource(bytes),
-                        "File.txt", true, null, CancellationToken.None).Result;
-                }
-                //FileRef fileRef = dropbox.CreateFileRefAsync("File.txt").Result;
-                ////FileRef fileRef = dropbox.CreateFileRefAsync("Spring Social/File.txt").Result;
-                //Entry copyRefEntry = dropbox.CopyFileRefAsync(fileRef.Value, "Spring Social/File_copy_ref.txt").Result;
-                //Entry copyEntry = dropbox.CopyAsync("Spring Social/File.txt", "Spring Social/File_copy.txt").Result;
-                //Entry deleteEntry = dropbox.DeleteAsync("Spring Social/File.txt").Result;
-                //Entry moveEntry = dropbox.MoveAsync("Spring Social/File_copy.txt", "Spring Social/File.txt").Result;
-                //dropbox.DownloadFileAsync("Spring Social/File.txt")
-                //    .ContinueWith(task =>
-                //    {
-                //        Console.WriteLine("File '{0}' downloaded ({1})", task.Result.Metadata.Path, task.Result.Metadata.Size);
-                //        // Save file to "C:\Spring Social.txt"
-                //        using (FileStream fileStream = new FileStream(@"C:\Spring Social.txt", FileMode.Create))
-                //        {
-                //            fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
-                //        }
-                //    });
-                //Entry folderMetadata = dropbox.GetMetadataAsync("Spring Social").Result;
-                //IList<Entry> revisionsEntries = dropbox.GetRevisionsAsync("Spring Social/File.txt").Result;
-                //Entry restoreEntry = dropbox.RestoreAsync("Spring Social/File.txt", revisionsEntries[2].Revision).Result;
-                //IList<Entry> searchResults = dropbox.SearchAsync("Spring Social/", ".txt").Result;
-                //DropboxLink shareableLink = dropbox.GetShareableLinkAsync("Spring Social/File.txt").Result;
-                //DropboxLink mediaLink = dropbox.GetMediaLinkAsync("Spring Social/File.txt").Result;
-                //Entry uploadImageEntry = dropbox.UploadFileAsync(
-                //    new AssemblyResource("assembly://Spring.ConsoleQuickStart/Spring.ConsoleQuickStart/Image.png"),
-                //    "/Spring Social/Image.png", true, null, CancellationToken.None).Result;
-                //dropbox.DownloadThumbnailAsync("Spring Social/Image.png", ThumbnailFormat.Png, ThumbnailSize.Medium)
-                //    .ContinueWith(task =>
-                //    {
-                //        Console.WriteLine("Thumbnail '{0}' downloaded ({1})", task.Result.Metadata.Path, task.Result.Metadata.Size);
-                //        // Save file to "C:\Thumbnail_Medium.png"
-                //        using (FileStream fileStream = new FileStream(@"C:\Thumbnail_Medium.png", FileMode.Create))
-                //        {
-                //            fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
-                //        }
-                //    });
+                
+                if (OnCloudAuthenticationStatusChanged != null)
+                    OnCloudAuthenticationStatusChanged(CloudAuthenticationStatusType.ConnectedToDropbox);
             }
             catch (AggregateException ae)
             {
+                HasLinkedAccount = false;
                 ae.Handle(ex =>
                 {
                     if (ex is DropboxApiException)
@@ -216,14 +215,201 @@ public void ContinueLinkApp()
             }
         }
 
+        private AuthenticationToken LoadTokenFromDisk()
+        {
+            FileStream fileStream = null;
+            try
+            {
+                byte[] bytes = new byte[4096]; // 4k is way enough to store the token
+                string filePath = Path.Combine(PathHelper.HomeDirectory, "dropbox.json");
+                fileStream = File.OpenRead(filePath);
+                fileStream.Read(bytes, 0, (int) fileStream.Length);
+                string json = Encoding.UTF8.GetString(bytes);
+                var token = JsonConvert.DeserializeObject<AuthenticationToken>(json);
+
+                return token;
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("DropboxCoreService - LoadTokenFromDisk - Failed to load token: {0}", ex);
+                throw;
+            }
+            finally
+            {
+                if (fileStream != null)
+                    fileStream.Close();
+            }
+
+            return null;
+        }
+
+        private void SaveTokenToDisk(AuthenticationToken token)
+        {
+            FileStream fileStream = null;
+            try
+            {
+                // If the file exists, decrypt it before changing its contents
+                string filePath = Path.Combine(PathHelper.HomeDirectory, "dropbox.json");
+                if (File.Exists(filePath))
+                    File.Decrypt(filePath);
+
+                // Write file to disk
+                string json = JsonConvert.SerializeObject(token);
+                byte[] bytes = Encoding.UTF8.GetBytes(json);
+                fileStream = File.OpenWrite(filePath);
+                fileStream.Write(bytes, 0, bytes.Length);
+                fileStream.Close();
+
+                // Encrypt file
+                File.Encrypt(filePath);
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("DropboxCoreService - SaveTokenToDisk - Failed to save token: {0}", ex);
+                throw;
+            }
+            finally
+            {
+                if (fileStream != null)
+                    fileStream.Close();
+            }
+        }
+
+        private void DeleteTokenFromDisk()
+        {
+            try
+            {
+                string filePath = Path.Combine(PathHelper.HomeDirectory, "dropbox.json");
+                if(File.Exists(filePath))
+                    File.Delete(filePath);
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("DropboxCoreService - DeleteTokenFromDisk - Failed to delete token: {0}", ex);
+                throw;
+            }
+        }
+
         public void UnlinkApp()
         {
+            DeleteTokenFromDisk();
+            HasLinkedAccount = false;
+            _dropbox = null;
         }
 
         public void InitializeAppFolder()
         {
+            try
+            {
+                var taskMetadata = _dropbox.GetMetadataAsync("/Playlists");
+                var taskPlaylists = _dropbox.CreateFolderAsync("/Playlists");
+                var taskDevices = _dropbox.CreateFolderAsync("/Devices");
+
+                var metadata = taskMetadata.Result;
+                var folderPlaylists = taskPlaylists.Result;
+                var folderDevices = taskDevices.Result;
+            }
+            catch (AggregateException ae)
+            {
+                ae.Handle(ex =>
+                {
+                    if (ex is DropboxApiException)
+                    {
+                        Console.WriteLine(ex.Message);
+                        return true;
+                    }
+                    return false;
+                });
+            }
+        }
+
+        public void PushHello()
+        {
+            // Use step by step debugging, or not             
+
+            //DeltaPage deltaPage = dropbox.DeltaAsync(null).Result;
+            //dropbox.AccessLevel
+            //Entry createFolderEntry = dropbox.CreateFolderAsync("Spring Social").Result;
+
+            //Task.Factory.StartNew(() =>
+            //{
+            //    string cursor = null;
+            //    while (true)
+            //    {
+            //        DeltaPage deltaPage = dropbox.DeltaAsync(cursor).Result;
+            //        cursor = deltaPage.Cursor;
+            //        Console.WriteLine("Delta check - entries: {0} cursor: {1} hasMore: {2} reset: {3}",
+            //            deltaPage.Entries.Count, deltaPage.Cursor, deltaPage.HasMore, deltaPage.Reset);
+            //        if (deltaPage.Entries.Count > 0)
+            //        {
+            //            //FileRef fileRef = dropbox.CreateFileRefAsync("File.txt").Result;
+            //            dropbox.DownloadFileAsync("File.txt")
+            //                .ContinueWith(task =>
+            //                {
+            //                    Console.WriteLine("File '{0}' downloaded ({1})", task.Result.Metadata.Path,
+            //                        task.Result.Metadata.Size);
+            //                    // Save file to "C:\Spring Social.txt"
+            //                    //using (FileStream fileStream = new FileStream(@"C:\Spring Social.txt", FileMode.Create))
+            //                    //{
+            //                    //    fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
+            //                    //}
+            //                });
+            //        }
+            //        Thread.Sleep(1000);
+            //    }
+            //});
+
+            //for (int a = 0; a < 10; a++)
+            //{
+            //    Thread.Sleep(4000);
+            //    string text = string.Format("Windows - Step {0}", a);
+            //    byte[] bytes = System.Text.Encoding.UTF8.GetBytes(text);
+            //    Console.WriteLine(text);
+
+            //    //var test = new ByteArrayResource(bytes);
+            //    Entry uploadFileEntry = dropbox.UploadFileAsync(
+            //        //new AssemblyResource("assembly://Spring.ConsoleQuickStart/Spring.ConsoleQuickStart/File.txt"),
+            //        new ByteArrayResource(bytes),
+            //        "File.txt", true, null, CancellationToken.None).Result;
+            //}
+
+            //FileRef fileRef = dropbox.CreateFileRefAsync("File.txt").Result;
+            ////FileRef fileRef = dropbox.CreateFileRefAsync("Spring Social/File.txt").Result;
+            //Entry copyRefEntry = dropbox.CopyFileRefAsync(fileRef.Value, "Spring Social/File_copy_ref.txt").Result;
+            //Entry copyEntry = dropbox.CopyAsync("Spring Social/File.txt", "Spring Social/File_copy.txt").Result;
+            //Entry deleteEntry = dropbox.DeleteAsync("Spring Social/File.txt").Result;
+            //Entry moveEntry = dropbox.MoveAsync("Spring Social/File_copy.txt", "Spring Social/File.txt").Result;
+            //dropbox.DownloadFileAsync("Spring Social/File.txt")
+            //    .ContinueWith(task =>
+            //    {
+            //        Console.WriteLine("File '{0}' downloaded ({1})", task.Result.Metadata.Path, task.Result.Metadata.Size);
+            //        // Save file to "C:\Spring Social.txt"
+            //        using (FileStream fileStream = new FileStream(@"C:\Spring Social.txt", FileMode.Create))
+            //        {
+            //            fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
+            //        }
+            //    });
+            //Entry folderMetadata = dropbox.GetMetadataAsync("Spring Social").Result;
+            //IList<Entry> revisionsEntries = dropbox.GetRevisionsAsync("Spring Social/File.txt").Result;
+            //Entry restoreEntry = dropbox.RestoreAsync("Spring Social/File.txt", revisionsEntries[2].Revision).Result;
+            //IList<Entry> searchResults = dropbox.SearchAsync("Spring Social/", ".txt").Result;
+            //DropboxLink shareableLink = dropbox.GetShareableLinkAsync("Spring Social/File.txt").Result;
+            //DropboxLink mediaLink = dropbox.GetMediaLinkAsync("Spring Social/File.txt").Result;
+            //Entry uploadImageEntry = dropbox.UploadFileAsync(
+            //    new AssemblyResource("assembly://Spring.ConsoleQuickStart/Spring.ConsoleQuickStart/Image.png"),
+            //    "/Spring Social/Image.png", true, null, CancellationToken.None).Result;
+            //dropbox.DownloadThumbnailAsync("Spring Social/Image.png", ThumbnailFormat.Png, ThumbnailSize.Medium)
+            //    .ContinueWith(task =>
+            //    {
+            //        Console.WriteLine("Thumbnail '{0}' downloaded ({1})", task.Result.Metadata.Path, task.Result.Metadata.Size);
+            //        // Save file to "C:\Thumbnail_Medium.png"
+            //        using (FileStream fileStream = new FileStream(@"C:\Thumbnail_Medium.png", FileMode.Create))
+            //        {
+            //            fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
+            //        }
+            //    });
         }
-    
+
         public void PushStuff()
         {
         }
@@ -237,6 +423,98 @@ public void DeleteStuff()
         {
         }
 
+        public string PushDeviceInfo(AudioFile audioFile, long positionBytes, string position)
+        {
+            try
+            {
+                if(!HasLinkedAccount)
+                    throw new CloudAppNotLinkedException();
+
+                var device = new CloudDeviceInfo()
+                {
+                    AudioFileId = audioFile.Id,
+                    ArtistName = audioFile.ArtistName,
+                    AlbumTitle = audioFile.AlbumTitle,
+                    SongTitle = audioFile.Title,
+                    Position = position,
+                    PositionBytes = positionBytes,
+                    DeviceType = _deviceSpecifications.GetDeviceType().ToString(),
+                    DeviceName = _deviceSpecifications.GetDeviceName(),
+                    DeviceId = _deviceSpecifications.GetDeviceUniqueId(),
+                    IPAddress = _deviceSpecifications.GetIPAddress(),
+                    Timestamp = DateTime.Now
+                };
+
+                string json = JsonConvert.SerializeObject(device);
+                byte[] bytes = Encoding.UTF8.GetBytes(json);
+                var taskMetadata = _dropbox.UploadFileAsync(new ByteArrayResource(bytes), string.Format("/Devices/{0}.json", device.DeviceId));
+                var entry = taskMetadata.Result;
+            }
+            catch (AggregateException ae)
+            {
+                ae.Handle(ex =>
+                {
+                    if (ex is DropboxApiException)
+                    {
+                        Console.WriteLine(ex.Message);
+                        return true;
+                    }
+                    return false;
+                });
+            }
+            return string.Empty;
+        }
+
+        public IEnumerable<CloudDeviceInfo> PullDeviceInfos()
+        {
+            List<CloudDeviceInfo> devices = new List<CloudDeviceInfo>();
+
+            try
+            {
+                if (!HasLinkedAccount)
+                    throw new CloudAppNotLinkedException();
+
+                var entries = _dropbox.SearchAsync("/Devices", ".json").Result;                
+                foreach (var entry in entries)
+                {
+                    try
+                    {
+                        var file = _dropbox.DownloadFileAsync(entry.Path).Result;
+                        var bytes = file.Content;
+                        string json = Encoding.UTF8.GetString(bytes);
+
+                        CloudDeviceInfo device = null;
+                        try
+                        {
+                            device = JsonConvert.DeserializeObject<CloudDeviceInfo>(json);
+                            devices.Add(device);
+                        }
+                        catch (Exception ex)
+                        {
+                            Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to deserialize JSON for path {0} - ex: {1}", file.Metadata.Path, ex);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to download file - ex: {0}", ex);
+                    }   
+                }
+            }
+            catch (AggregateException ae)
+            {
+                ae.Handle(ex =>
+                {
+                    if (ex is DropboxApiException)
+                    {
+                        Console.WriteLine(ex.Message);
+                        return true;
+                    }
+                    return false;
+                });
+            }
+            return devices;
+        }
+
         public string PushNowPlaying(AudioFile audioFile, long positionBytes, string position)
         {
             return string.Empty;
@@ -250,6 +528,30 @@ public string PullNowPlaying()
         public void DeleteNowPlaying()
         {
         }
+
+        public string PushPlaylist(Playlist playlist)
+        {
+            return string.Empty;
+        }
+
+        public Playlist PullPlaylist(Guid playlistId)
+        {
+            return new Playlist();
+        }
+
+        public IEnumerable<Playlist> PullPlaylists()
+        {
+            return new List<Playlist>();
+        }
+
+        public void DeletePlaylist(Guid playlistId)
+        {
+        }
+
+        public void DeletePlaylists()
+        {
+        }
     }
 }
+
 #endif
diff --git a/MPfm/MPfm.Library/Services/Exceptions/CloudAppNotLinkedException.cs b/MPfm/MPfm.Library/Services/Exceptions/CloudAppNotLinkedException.cs
new file mode 100644
index 00000000..75cac3ae
--- /dev/null
+++ b/MPfm/MPfm.Library/Services/Exceptions/CloudAppNotLinkedException.cs
@@ -0,0 +1,29 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Text;
+
+namespace MPfm.Library.Services.Exceptions
+{
+    public class CloudAppNotLinkedException : Exception
+    {
+        public CloudAppNotLinkedException() : base("The application is not linked to the cloud account.")
+        {
+        }
+    }
+}
diff --git a/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs b/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs
index 0093eff7..8d922eb3 100644
--- a/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs
+++ b/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs
@@ -24,14 +24,16 @@
 
 namespace MPfm.Library.Services.Interfaces
 {
-    public delegate void DropboxDataChanged(string data);
+    public delegate void CloudAuthenticationStatusChanged(CloudAuthenticationStatusType statusType);
+    public delegate void CloudDataChanged(string data);
 
     /// <summary>
     /// Interface for the cloud service implementations.
     /// </summary>
     public interface ICloudLibraryService
     {
-        event DropboxDataChanged OnDropboxDataChanged;
+        event CloudAuthenticationStatusChanged OnCloudAuthenticationStatusChanged;
+        event CloudDataChanged OnCloudDataChanged;
 
         bool HasLinkedAccount { get; }
 
@@ -56,6 +58,14 @@ public interface ICloudLibraryService
         IEnumerable<Playlist> PullPlaylists();
         void DeletePlaylist(Guid playlistId);
         void DeletePlaylists();
+    }
 
+    public enum CloudAuthenticationStatusType
+    {
+        GetRequestToken = 0,
+        OpenWebBrowser = 1,
+        RequestAccessToken = 2,
+        ConnectToDropbox = 3,
+        ConnectedToDropbox = 4
     }
 }
diff --git a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
index b747a420..6f13c0da 100644
--- a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
+++ b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
+using MPfm.Core.Helpers;
 using MPfm.Library.Database;
 using MPfm.Library.Database.Interfaces;
 using MPfm.Library.Services;
@@ -44,7 +45,7 @@ static Bootstrapper()
             var container = TinyIoC.TinyIoCContainer.Current;
 
             // Register services
-            container.Register<IDatabaseFacade>(new DatabaseFacade(ConfigurationHelper.DatabaseFilePath));
+            container.Register<IDatabaseFacade>(new DatabaseFacade(PathHelper.DatabaseFilePath));
             container.Register<ITinyMessengerHub, TinyMessengerHub>().AsSingleton(); 
             container.Register<IInitializationService, InitializationService>().AsSingleton();
             container.Register<IPlayerService, PlayerService>().AsSingleton();
@@ -67,11 +68,13 @@ static Bootstrapper()
             container.Register<IUpdateLibraryPresenter, UpdateLibraryPresenter>().AsSingleton();
             container.Register<IEqualizerPresetsPresenter, EqualizerPresetsPresenter>().AsMultiInstance();
             container.Register<IEqualizerPresetDetailsPresenter, EqualizerPresetDetailsPresenter>().AsMultiInstance();
-            container.Register<IPreferencesPresenter, PreferencesPresenter>().AsSingleton();
-            container.Register<IAudioPreferencesPresenter, AudioPreferencesPresenter>().AsSingleton();
-            container.Register<IGeneralPreferencesPresenter, GeneralPreferencesPresenter>().AsSingleton();
-            container.Register<ILibraryPreferencesPresenter, LibraryPreferencesPresenter>().AsSingleton();
-            container.Register<IPlaylistPresenter, PlaylistPresenter>().AsSingleton();
+            container.Register<IPreferencesPresenter, PreferencesPresenter>().AsMultiInstance();
+            container.Register<IAudioPreferencesPresenter, AudioPreferencesPresenter>().AsMultiInstance();
+            container.Register<ICloudPreferencesPresenter, CloudPreferencesPresenter>().AsMultiInstance();
+            container.Register<IGeneralPreferencesPresenter, GeneralPreferencesPresenter>().AsMultiInstance();
+            container.Register<ILibraryPreferencesPresenter, LibraryPreferencesPresenter>().AsMultiInstance();
+            container.Register<ICloudConnectPresenter, CloudConnectPresenter>().AsMultiInstance();
+            container.Register<IPlaylistPresenter, PlaylistPresenter>().AsMultiInstance();
             container.Register<ILoopsPresenter, LoopsPresenter>().AsMultiInstance();
             container.Register<ILoopDetailsPresenter, LoopDetailsPresenter>().AsMultiInstance();
             container.Register<IMarkersPresenter, MarkersPresenter>().AsMultiInstance();
diff --git a/MPfm/MPfm.MVP/Config/AppConfigManager.cs b/MPfm/MPfm.MVP/Config/AppConfigManager.cs
index c02fd549..e64baa25 100644
--- a/MPfm/MPfm.MVP/Config/AppConfigManager.cs
+++ b/MPfm/MPfm.MVP/Config/AppConfigManager.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
+using MPfm.Core.Helpers;
 using MPfm.MVP.Bootstrap;
 using MPfm.MVP.Config.Providers;
 using MPfm.MVP.Helpers;
@@ -56,12 +57,12 @@ public AppConfigManager()
 
         public void Load()
         {
-            Root = _provider.Load(ConfigurationHelper.ConfigurationFilePath);
+            Root = _provider.Load(PathHelper.ConfigurationFilePath);
         }
 
         public void Save()
         {
-            _provider.Save(ConfigurationHelper.ConfigurationFilePath, Root);
+            _provider.Save(PathHelper.ConfigurationFilePath, Root);
         }
     }
 }
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.csproj b/MPfm/MPfm.MVP/MPfm.MVP.csproj
index e1a899af..076023e2 100644
--- a/MPfm/MPfm.MVP/MPfm.MVP.csproj
+++ b/MPfm/MPfm.MVP/MPfm.MVP.csproj
@@ -63,6 +63,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\MPfm.Library\Lib\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Rest, Version=1.1.1.35040, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\MPfm.Library\Lib\Spring.Rest.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Social.Core, Version=1.0.1.35140, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\MPfm.Library\Lib\Spring.Social.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Social.Dropbox, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\MPfm.Library\Lib\Spring.Social.Dropbox.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Posix" />
@@ -113,6 +129,7 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Config\AppConfigManager.cs" />
     <Compile Include="Config\IAppConfig.cs" />
+    <Compile Include="Messages\CloudConnectStatusChangedMessage.cs" />
     <Compile Include="Messages\ConnectionStatusChangedMessage.cs" />
     <Compile Include="Messages\ApplicationCloseMessage.cs" />
     <Compile Include="Messages\ActivateLockScreenMessage.cs" />
@@ -120,12 +137,19 @@
     <Compile Include="Messages\PlaylistListUpdatedMessage.cs" />
     <Compile Include="Messages\PlayerSetPositionMessage.cs" />
     <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
+    <Compile Include="Models\CloudConnectEntity.cs" />
+    <Compile Include="Models\CloudPreferencesStateEntity.cs" />
     <Compile Include="Models\FolderEntity.cs" />
     <Compile Include="Models\PlaylistEntity.cs" />
+    <Compile Include="Models\CloudPreferencesEntity.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
+    <Compile Include="Presenters\CloudConnectPresenter.cs" />
     <Compile Include="Presenters\AddMarkerPresenter.cs" />
     <Compile Include="Presenters\AddPlaylistPresenter.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />
+    <Compile Include="Presenters\CloudPreferencesPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\ICloudConnectPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\ICloudPreferencesPresenter.cs" />
     <Compile Include="Presenters\Interfaces\IAddMarkerPresenter.cs" />
     <Compile Include="Presenters\Interfaces\IAddPlaylistPresenter.cs" />
     <Compile Include="Presenters\Interfaces\IResumePlaybackPresenter.cs" />
@@ -153,6 +177,8 @@
     <Compile Include="Presenters\SyncConnectManualPresenter.cs" />
     <Compile Include="Presenters\UpdateLibraryPresenter.cs" />
     <Compile Include="Models\PlayerPositionEntity.cs" />
+    <Compile Include="Views\ICloudConnectView.cs" />
+    <Compile Include="Views\ICloudPreferencesView.cs" />
     <Compile Include="Views\IAddMarkerView.cs" />
     <Compile Include="Views\IAddPlaylistView.cs" />
     <Compile Include="Views\IResumePlaybackView.cs" />
@@ -175,7 +201,6 @@
     <Compile Include="Models\LibraryBrowserEntity.cs" />
     <Compile Include="Views\ILibraryBrowserView.cs" />
     <Compile Include="Presenters\LibraryBrowserPresenter.cs" />
-    <Compile Include="Helpers\ConfigurationHelper.cs" />
     <Compile Include="Presenters\SongBrowserPresenter.cs" />
     <Compile Include="Views\ISongBrowserView.cs" />
     <Compile Include="Presenters\Interfaces\ILibraryBrowserPresenter.cs" />
diff --git a/MPfm/MPfm.MVP/Messages/CloudConnectStatusChangedMessage.cs b/MPfm/MPfm.MVP/Messages/CloudConnectStatusChangedMessage.cs
new file mode 100644
index 00000000..3870bda6
--- /dev/null
+++ b/MPfm/MPfm.MVP/Messages/CloudConnectStatusChangedMessage.cs
@@ -0,0 +1,37 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using MPfm.Library.Services.Interfaces;
+using TinyMessenger;
+
+namespace MPfm.MVP.Messages
+{
+    /// <summary>
+    /// Message used to notify the app that the one of the cloud service connection has changed status.
+    /// </summary>
+    public class CloudConnectStatusChangedMessage : TinyMessageBase
+    {
+        public string CloudServiceName { get; set; }
+        public CloudAuthenticationStatusType StatusType { get; set; }
+        public bool IsApplicationLinked { get; set; }
+
+        public CloudConnectStatusChangedMessage(object sender) 
+            : base(sender)
+        {
+        }       
+    }
+}
diff --git a/MPfm/MPfm.MVP/Models/CloudConnectEntity.cs b/MPfm/MPfm.MVP/Models/CloudConnectEntity.cs
new file mode 100644
index 00000000..a1b9ae7d
--- /dev/null
+++ b/MPfm/MPfm.MVP/Models/CloudConnectEntity.cs
@@ -0,0 +1,34 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+
+namespace MPfm.MVP.Models
+{
+	public class CloudConnectEntity
+	{
+        public string CloudServiceName { get; set; }
+        public int CurrentStep { get; set; }
+        public bool IsAuthenticated { get; set; }
+
+        public CloudConnectEntity()
+        {
+            CurrentStep = 1;
+        }
+    }
+}
diff --git a/MPfm/MPfm.MVP/Models/CloudPreferencesEntity.cs b/MPfm/MPfm.MVP/Models/CloudPreferencesEntity.cs
new file mode 100644
index 00000000..b67cb2d1
--- /dev/null
+++ b/MPfm/MPfm.MVP/Models/CloudPreferencesEntity.cs
@@ -0,0 +1,31 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+
+namespace MPfm.MVP.Models
+{
+	public class CloudPreferencesEntity
+	{
+        public bool IsDropboxResumePlaybackEnabled { get; set; }
+
+	    public CloudPreferencesEntity()
+	    {
+	    }
+    }
+}
diff --git a/MPfm/MPfm.MVP/Models/CloudPreferencesStateEntity.cs b/MPfm/MPfm.MVP/Models/CloudPreferencesStateEntity.cs
new file mode 100644
index 00000000..1aa211bb
--- /dev/null
+++ b/MPfm/MPfm.MVP/Models/CloudPreferencesStateEntity.cs
@@ -0,0 +1,32 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+
+namespace MPfm.MVP.Models
+{
+	public class CloudPreferencesStateEntity
+	{
+	    public bool IsDropboxLinkedToApp { get; set; }
+
+	    public CloudPreferencesStateEntity()
+	    {
+            IsDropboxLinkedToApp = false;
+	    }
+	}
+}
diff --git a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
index 92c6f641..7606b7b2 100644
--- a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
+++ b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
@@ -78,6 +78,8 @@ public abstract class MobileNavigationManager
         private IAddMarkerPresenter _addMarkerPresenter;
         private IResumePlaybackView _resumePlaybackView;
         private IResumePlaybackPresenter _resumePlaybackPresenter;
+        private ICloudConnectView _cloudConnectView;
+        private ICloudConnectPresenter _cloudConnectPresenter;
 
         // Player sub views
         private IPlayerMetadataView _playerMetadataView;
@@ -925,6 +927,34 @@ public virtual void CreateResumePlaybackView()
             CreateResumePlaybackViewInternal(onViewReady);
         }
 
+        protected virtual void CreateCloudConnectViewInternal(Action<IBaseView> onViewReady)
+        {
+            if (_cloudConnectView == null)
+                _cloudConnectView = Bootstrapper.GetContainer().Resolve<ICloudConnectView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
+
+#if !ANDROID
+            PushTabView(MobileNavigationTabType.More, _cloudConnectView);
+#endif
+        }
+
+        public virtual void CreateCloudConnectView()
+        {
+            Action<IBaseView> onViewReady = (view) =>
+            {
+                _cloudConnectView = (ICloudConnectView)view;
+                _cloudConnectView.OnViewDestroy = (view2) =>
+                {
+                    _cloudConnectPresenter.ViewDestroyed();
+                    _cloudConnectPresenter = null;
+                    _cloudConnectView = null;
+                };
+                _cloudConnectPresenter = Bootstrapper.GetContainer().Resolve<ICloudConnectPresenter>();
+                _cloudConnectPresenter.BindView((ICloudConnectView)view);
+            };
+
+            CreateCloudConnectViewInternal(onViewReady);
+        }
+
         protected virtual void CreatePlaylistViewInternal(IBaseView sourceView, Action<IBaseView> onViewReady)
         {
             if (_playlistView == null)
diff --git a/MPfm/MPfm.MVP/Navigation/NavigationManager.cs b/MPfm/MPfm.MVP/Navigation/NavigationManager.cs
index 0ec22e0a..aa379e72 100644
--- a/MPfm/MPfm.MVP/Navigation/NavigationManager.cs
+++ b/MPfm/MPfm.MVP/Navigation/NavigationManager.cs
@@ -64,9 +64,13 @@ public abstract class NavigationManager
 
         IDesktopPreferencesView _preferencesView;
         IAudioPreferencesPresenter _audioPreferencesPresenter;
+        ICloudPreferencesPresenter _cloudPreferencesPresenter;
         IGeneralPreferencesPresenter _generalPreferencesPresenter;
         ILibraryPreferencesPresenter _libraryPreferencesPresenter;
 
+        ICloudConnectView _cloudConnectView;
+        ICloudConnectPresenter _cloudConnectPresenter;
+
         IPlaylistView _playlistView;
         IPlaylistPresenter _playlistPresenter;
 
@@ -167,6 +171,8 @@ public virtual IDesktopPreferencesView CreatePreferencesView()
             Action<IBaseView> onViewReady = (view) => {                    
                 _audioPreferencesPresenter = Bootstrapper.GetContainer().Resolve<IAudioPreferencesPresenter>();
                 _audioPreferencesPresenter.BindView((IAudioPreferencesView)view);
+                _cloudPreferencesPresenter = Bootstrapper.GetContainer().Resolve<ICloudPreferencesPresenter>();
+                _cloudPreferencesPresenter.BindView((ICloudPreferencesView)view);
                 _generalPreferencesPresenter = Bootstrapper.GetContainer().Resolve<IGeneralPreferencesPresenter>();
                 _generalPreferencesPresenter.BindView((IGeneralPreferencesView)view);
                 _libraryPreferencesPresenter = Bootstrapper.GetContainer().Resolve<ILibraryPreferencesPresenter>();
@@ -178,6 +184,8 @@ public virtual IDesktopPreferencesView CreatePreferencesView()
                 _preferencesView = null;
                 _audioPreferencesPresenter.ViewDestroyed();
                 _audioPreferencesPresenter = null;
+                _cloudPreferencesPresenter.ViewDestroyed();
+                _cloudPreferencesPresenter = null;
                 _generalPreferencesPresenter.ViewDestroyed();
                 _generalPreferencesPresenter = null;
                 _libraryBrowserPresenter.ViewDestroyed();
@@ -416,6 +424,33 @@ public virtual IResumePlaybackView CreateResumePlaybackView()
             return _resumePlaybackView;
         }
 
+        public virtual ICloudConnectView CreateCloudConnectView()
+        {
+            // If the view is still visible, just make it the top level window
+            if (_cloudConnectView != null)
+            {
+                _cloudConnectView.ShowView(true);
+                return _cloudConnectView;
+            }
+
+            // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view.
+            Action<IBaseView> onViewReady = (view) =>
+            {
+                _cloudConnectPresenter = Bootstrapper.GetContainer().Resolve<ICloudConnectPresenter>();
+                _cloudConnectPresenter.BindView((ICloudConnectView)view);
+            };
+
+            // Create view and manage view destruction
+            _cloudConnectView = Bootstrapper.GetContainer().Resolve<ICloudConnectView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
+            _cloudConnectView.OnViewDestroy = (view) =>
+            {
+                _cloudConnectPresenter.ViewDestroyed();
+                _cloudConnectPresenter = null;
+                _cloudConnectView = null;
+            };
+            return _cloudConnectView;
+        }
+
         public virtual IDesktopFirstRunView CreateFirstRunView()
         {
             if (_firstRunView != null)
diff --git a/MPfm/MPfm.MVP/Presenters/CloudConnectPresenter.cs b/MPfm/MPfm.MVP/Presenters/CloudConnectPresenter.cs
new file mode 100644
index 00000000..37b5b3d8
--- /dev/null
+++ b/MPfm/MPfm.MVP/Presenters/CloudConnectPresenter.cs
@@ -0,0 +1,108 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Threading.Tasks;
+using Mono.Posix;
+using MPfm.Library.Services.Interfaces;
+using MPfm.MVP.Messages;
+using MPfm.MVP.Models;
+using MPfm.MVP.Presenters.Interfaces;
+using MPfm.MVP.Views;
+using TinyMessenger;
+
+namespace MPfm.MVP.Presenters
+{
+	/// <summary>
+    /// Cloud Connect preferences presenter.
+	/// </summary>
+    public class CloudConnectPresenter : BasePresenter<ICloudConnectView>, ICloudConnectPresenter
+	{
+	    private readonly ITinyMessengerHub _messengerHub;
+	    private readonly ICloudLibraryService _cloudLibraryService;
+
+        public CloudConnectPresenter(ITinyMessengerHub messengerHub, ICloudLibraryService cloudLibraryService)
+        {
+            _messengerHub = messengerHub;
+            _cloudLibraryService = cloudLibraryService;
+            _cloudLibraryService.OnCloudAuthenticationStatusChanged += CloudLibraryServiceOnCloudAuthenticationStatusChanged;
+        }
+
+	    public override void BindView(ICloudConnectView view)
+        {
+            view.OnCheckIfAccountIsLinked = CheckIfAccountIsLinked;
+            base.BindView(view);
+
+            Initialize();
+        }
+
+	    private void Initialize()
+	    {
+            View.RefreshStatus(new CloudConnectEntity()
+            {
+                CloudServiceName = "Dropbox",
+                CurrentStep = 1,
+                IsAuthenticated = false
+            });
+
+	        Task.Factory.StartNew(() =>
+	        {
+	            try
+	            {
+                    _cloudLibraryService.LinkApp(View);
+	            }
+	            catch (Exception ex)
+	            {
+                    View.CloudConnectError(ex);
+	            }
+	        });
+	    }
+
+        private void CloudLibraryServiceOnCloudAuthenticationStatusChanged(CloudAuthenticationStatusType statusType)
+        {
+            Console.WriteLine("CloudConnectPresenter - CloudLibraryServiceOnCloudAuthenticationStatusChanged - statusType: {0}", statusType.ToString());
+            View.RefreshStatus(new CloudConnectEntity()
+            {
+                CloudServiceName = "Dropbox",
+                CurrentStep = ((int)statusType)+2,
+                IsAuthenticated = statusType == CloudAuthenticationStatusType.ConnectedToDropbox
+            });
+            _messengerHub.PublishAsync<CloudConnectStatusChangedMessage>(new CloudConnectStatusChangedMessage(this)
+            {
+                CloudServiceName = "Dropbox",
+                StatusType = statusType,
+                IsApplicationLinked = statusType == CloudAuthenticationStatusType.ConnectedToDropbox
+            });
+        }
+
+        private void CheckIfAccountIsLinked()
+        {
+            Task.Factory.StartNew(() =>
+            {
+                try
+                {
+                    _cloudLibraryService.ContinueLinkApp();
+                }
+                catch (Exception ex)
+                {
+                    // Ignore error since the user may not be logged in yet!
+                    Console.WriteLine("CloudConnectPresenter - CheckIfAccountIsLinked - Exception: {0}", ex);
+                }
+            });
+        }
+	}
+}
diff --git a/MPfm/MPfm.MVP/Presenters/CloudPreferencesPresenter.cs b/MPfm/MPfm.MVP/Presenters/CloudPreferencesPresenter.cs
new file mode 100644
index 00000000..2b7afc8c
--- /dev/null
+++ b/MPfm/MPfm.MVP/Presenters/CloudPreferencesPresenter.cs
@@ -0,0 +1,115 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.ComponentModel;
+using MPfm.Library.Services.Interfaces;
+using MPfm.MVP.Bootstrap;
+using MPfm.MVP.Messages;
+using MPfm.MVP.Models;
+using MPfm.MVP.Navigation;
+using MPfm.MVP.Presenters.Interfaces;
+using MPfm.MVP.Views;
+using TinyMessenger;
+
+namespace MPfm.MVP.Presenters
+{
+	/// <summary>
+    /// Cloud preferences presenter.
+	/// </summary>
+    public class CloudPreferencesPresenter : BasePresenter<ICloudPreferencesView>, ICloudPreferencesPresenter
+	{
+        private readonly MobileNavigationManager _mobileNavigationManager;
+        private readonly NavigationManager _navigationManager;
+	    private readonly ITinyMessengerHub _messengerHub;
+	    private readonly ICloudLibraryService _cloudLibraryService;
+
+	    public CloudPreferencesPresenter(ITinyMessengerHub messengerHub, ICloudLibraryService cloudLibraryService)
+        {
+	        _messengerHub = messengerHub;
+	        _cloudLibraryService = cloudLibraryService;
+
+	        _messengerHub.Subscribe<CloudConnectStatusChangedMessage>(CloudConnectStatusChanged);
+
+#if IOS || ANDROID || WINDOWS_PHONE || WINDOWSSTORE
+            _mobileNavigationManager = Bootstrapper.GetContainer().Resolve<MobileNavigationManager>();
+#else
+            _navigationManager = Bootstrapper.GetContainer().Resolve<NavigationManager>();
+#endif
+        }
+
+	    public override void BindView(ICloudPreferencesView view)
+        {
+            view.OnDropboxLoginLogout = LoginLogoutDropbox;
+            view.OnSetCloudPreferences = SetCloudPreferences;
+            base.BindView(view);
+
+            Initialize();
+        }
+
+	    private void Initialize()
+	    {
+            RefreshPreferences();
+            RefreshState();
+        }
+
+        private void CloudConnectStatusChanged(CloudConnectStatusChangedMessage cloudConnectStatusChangedMessage)
+        {
+            RefreshState();
+        }
+
+        private void SetCloudPreferences(CloudPreferencesEntity entity)
+        {
+        }
+    
+        private void LoginLogoutDropbox()
+        {
+            if (_cloudLibraryService.HasLinkedAccount)
+            {
+                _cloudLibraryService.UnlinkApp();                
+            }
+            else
+            {
+                #if IOS || ANDROID || WINDOWS_PHONE || WINDOWSSTORE
+                _mobileNavigationManager.CreateCloudConnectView();
+                #else
+                _navigationManager.CreateCloudConnectView();
+                #endif                
+            }
+
+            RefreshState();
+        }
+
+	    private void RefreshState()
+	    {
+	        var state = new CloudPreferencesStateEntity()
+	        {
+	            IsDropboxLinkedToApp = _cloudLibraryService.HasLinkedAccount
+	        };
+	        View.RefreshCloudPreferencesState(state);
+	    }
+
+        private void RefreshPreferences()
+        {
+            var entity = new CloudPreferencesEntity()
+            {
+                IsDropboxResumePlaybackEnabled = false
+            };
+            View.RefreshCloudPreferences(entity);
+        }
+    }
+}
diff --git a/MPfm/MPfm.MVP/Presenters/Interfaces/ICloudConnectPresenter.cs b/MPfm/MPfm.MVP/Presenters/Interfaces/ICloudConnectPresenter.cs
new file mode 100644
index 00000000..3ce18cf4
--- /dev/null
+++ b/MPfm/MPfm.MVP/Presenters/Interfaces/ICloudConnectPresenter.cs
@@ -0,0 +1,29 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using MPfm.MVP.Views;
+
+namespace MPfm.MVP.Presenters.Interfaces
+{
+	/// <summary>
+    /// Cloud Connect presenter interface.
+	/// </summary>
+    public interface ICloudConnectPresenter : IBasePresenter<ICloudConnectView>
+	{
+	}
+}
+
diff --git a/MPfm/MPfm.MVP/Presenters/Interfaces/ICloudPreferencesPresenter.cs b/MPfm/MPfm.MVP/Presenters/Interfaces/ICloudPreferencesPresenter.cs
new file mode 100644
index 00000000..4c1182ca
--- /dev/null
+++ b/MPfm/MPfm.MVP/Presenters/Interfaces/ICloudPreferencesPresenter.cs
@@ -0,0 +1,28 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using MPfm.MVP.Views;
+
+namespace MPfm.MVP.Presenters.Interfaces
+{
+	/// <summary>
+    /// Cloud preferences presenter interface.
+	/// </summary>
+    public interface ICloudPreferencesPresenter : IBasePresenter<ICloudPreferencesView>
+	{
+	}
+}
diff --git a/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs b/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs
index d847fe53..d369f7bd 100644
--- a/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs
@@ -18,6 +18,7 @@
 using System;
 using MPfm.Core;
 using MPfm.Library.Services.Interfaces;
+using MPfm.Library.UpdateLibrary;
 using MPfm.MVP.Bootstrap;
 using MPfm.MVP.Navigation;
 using MPfm.MVP.Presenters.Interfaces;
@@ -85,8 +86,12 @@ private void UpdateLibrary()
         {
             try
             {
+#if IOS || ANDROID
                 var view = _mobileNavigationManager.CreateUpdateLibraryView();
                 _mobileNavigationManager.PushDialogView(MobileDialogPresentationType.Standard, "Update Library", View, view);
+#else
+                _navigationManager.CreateUpdateLibraryView(UpdateLibraryMode.WholeLibrary, null, null);
+#endif
             }
             catch(Exception ex)
             {
diff --git a/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs b/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs
index fb165916..2b53d795 100644
--- a/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -17,7 +17,9 @@
 
 using System;
 using MPfm.Library.Objects;
+using MPfm.Library.Services.Exceptions;
 using MPfm.MVP.Presenters.Interfaces;
+using MPfm.MVP.Services.Interfaces;
 using MPfm.MVP.Views;
 using MPfm.Library.Services.Interfaces;
 using System.Threading.Tasks;
@@ -39,18 +41,21 @@ public class ResumePlaybackPresenter : BasePresenter<IResumePlaybackView>, IResu
         private readonly NavigationManager _navigationManager;
         private readonly ITinyMessengerHub _messengerHub;
         private readonly ICloudLibraryService _cloudLibrary;
-        private readonly IAudioFileCacheService _audioFileCacheService;
+	    private readonly IPlayerService _playerService;
+	    private readonly IAudioFileCacheService _audioFileCacheService;
+	    private bool _canRefreshCloudLoginStatus;
 
-        public ResumePlaybackPresenter(ITinyMessengerHub messengerHub, IAudioFileCacheService audioFileCacheService, ICloudLibraryService cloudLibrary)
+	    public ResumePlaybackPresenter(ITinyMessengerHub messengerHub, IAudioFileCacheService audioFileCacheService, ICloudLibraryService cloudLibrary, IPlayerService playerService)
 		{
             _messengerHub = messengerHub;
             _audioFileCacheService = audioFileCacheService;
             _cloudLibrary = cloudLibrary;
-            _cloudLibrary.OnDropboxDataChanged += (data) => {
+            _playerService = playerService;
+            _cloudLibrary.OnCloudDataChanged += (data) => {
                 Task.Factory.StartNew(() => {
-                    Console.WriteLine("ResumePlaybackPresenter - OnDropboxDataChanged - Sleeping...");
+                    Console.WriteLine("ResumePlaybackPresenter - OnCloudDataChanged - Sleeping...");
                     Thread.Sleep(500); // TODO: Wait for download to finish with listener (see Dropbox docs)
-                    Console.WriteLine("ResumePlaybackPresenter - OnDropboxDataChanged - Fetching device infos...");
+                    Console.WriteLine("ResumePlaybackPresenter - OnCloudDataChanged - Fetching device infos...");
                     RefreshDevices();
                 });
             };
@@ -64,26 +69,52 @@ public ResumePlaybackPresenter(ITinyMessengerHub messengerHub, IAudioFileCacheSe
 
         public override void BindView(IResumePlaybackView view)
         {
+            view.OnResumePlayback = ResumePlayback;
+            view.OnOpenPreferencesView = OpenPreferencesView;
+            view.OnCheckCloudLoginStatus = CheckCloudLoginStatus;
             base.BindView(view);
 
-            view.OnResumePlayback = ResumePlayback;
+            Task.Factory.StartNew(RefreshDevices);
+        }
 
-            Task.Factory.StartNew(() => {
-                RefreshDevices();
-            });
-        }     
+	    private void OpenPreferencesView()
+	    {            
+#if IOS || ANDROID || WINDOWS_PHONE || WINDOWSSTORE
+            _mobileNavigationManager.CreateCloudPreferencesView();
+#else
+	        _navigationManager.CreatePreferencesView();
+#endif
+	    }
 
-        private void RefreshDevices()
+        private void CheckCloudLoginStatus()
         {
-            try
-            {
-                var devices = _cloudLibrary.PullDeviceInfos();
-                View.RefreshDevices(devices.OrderBy(x => x.DeviceName).ToList());
-            } 
+            if (!_canRefreshCloudLoginStatus)
+                return;
+
+            View.RefreshAppLinkedStatus(_cloudLibrary.HasLinkedAccount);
+        }
+
+	    private void RefreshDevices()
+	    {
+            // Prevent login status change during loading
+	        _canRefreshCloudLoginStatus = false;
+
+	        try
+	        {
+	            var devices = _cloudLibrary.PullDeviceInfos();
+	            View.RefreshDevices(devices.OrderBy(x => x.DeviceName).ToList());
+                View.RefreshAppLinkedStatus(true);
+	        }
+	        catch (CloudAppNotLinkedException ex)
+	        {
+	            View.RefreshAppLinkedStatus(false);
+	        }
             catch (Exception ex)
             {
                 View.ResumePlaybackError(ex);
             }
+
+	        _canRefreshCloudLoginStatus = true;
         }
 
         private void ResumePlayback(CloudDeviceInfo device)
@@ -104,10 +135,15 @@ private void ResumePlayback(CloudDeviceInfo device)
                 FilePath = audioFile != null ? audioFile.FilePath : string.Empty
             });
 
+            // Only need to create the Player view on mobile devices
             #if IOS || ANDROID || WINDOWS_PHONE || WINDOWSSTORE
             _mobileNavigationManager.CreatePlayerView(MobileNavigationTabType.More, onViewBindedToPresenter);
             #else
-            _navigationManager.CreateSyncMenuView(device);
+            var audioFiles = _audioFileCacheService.SelectAudioFiles(new LibraryQuery() {
+                ArtistName = device.ArtistName,
+                AlbumTitle = device.AlbumTitle
+            });
+            _playerService.Play(audioFiles, audioFile != null ? audioFile.FilePath : string.Empty);
             #endif
         }
 	}
diff --git a/MPfm/MPfm.MVP/Services/InitializationService.cs b/MPfm/MPfm.MVP/Services/InitializationService.cs
index 7d2bbedf..20778532 100644
--- a/MPfm/MPfm.MVP/Services/InitializationService.cs
+++ b/MPfm/MPfm.MVP/Services/InitializationService.cs
@@ -21,6 +21,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using MPfm.Core;
+using MPfm.Core.Helpers;
 using MPfm.Library;
 using MPfm.Library.Database;
 using MPfm.Library.Objects;
@@ -87,10 +88,10 @@ private void CreateTraceListener()
         {            
 #if (!IOS && !ANDROID && !WINDOWSSTORE && !WINDOWS_PHONE)
             // Check if trace file exists
-            if (!File.Exists(ConfigurationHelper.LogFilePath))
-                _fileTracing = File.Create(ConfigurationHelper.LogFilePath);
+            if (!File.Exists(PathHelper.LogFilePath))
+                _fileTracing = File.Create(PathHelper.LogFilePath);
             else
-                _fileTracing = File.Open(ConfigurationHelper.LogFilePath, FileMode.Append);
+                _fileTracing = File.Open(PathHelper.LogFilePath, FileMode.Append);
             textTraceListener = new TextWriterTraceListener(_fileTracing);
             Trace.Listeners.Add(textTraceListener);
 #endif
@@ -105,10 +106,10 @@ private void CreateDirectories()
             //
 #else
             // Create missing directories
-            if(!Directory.Exists(ConfigurationHelper.HomeDirectory))
-                Directory.CreateDirectory(ConfigurationHelper.HomeDirectory);
-            if (!Directory.Exists(ConfigurationHelper.PeakFileDirectory))
-                Directory.CreateDirectory(ConfigurationHelper.PeakFileDirectory);
+            if(!Directory.Exists(PathHelper.HomeDirectory))
+                Directory.CreateDirectory(PathHelper.HomeDirectory);
+            if (!Directory.Exists(PathHelper.PeakFileDirectory))
+                Directory.CreateDirectory(PathHelper.PeakFileDirectory);
 #endif
         }
 
@@ -117,7 +118,7 @@ private void LoadConfiguration()
             Tracing.Log("InitializationService.CreateConfiguration -- Checking for configuration file...");
             AppConfigManager.Instance.Load();
 
-            //ConfigurationHelper.Save(ConfigurationHelper.ConfigurationFilePath, AppConfigManager.Instance);
+            //PathHelper.Save(PathHelper.ConfigurationFilePath, AppConfigManager.Instance);
             //EQPreset preset = EQPresetHelper.Load("/Users/animal/Documents/test.txt");
             //EQPresetHelper.Save("/Users/animal/Documents/test.txt", new EQPreset());
 		}
@@ -145,23 +146,23 @@ private void LoadDatabase()
             try
             {
 #if WINDOWSSTORE
-                Tracing.Log(string.Format("InitializationService.CreateLibrary -- Checking if the database file exists ({0})...", ConfigurationHelper.DatabaseFilePath));
+                Tracing.Log(string.Format("InitializationService.CreateLibrary -- Checking if the database file exists ({0})...", PathHelper.DatabaseFilePath));
                 var storageFolder = ApplicationData.Current.LocalFolder;
-                var task = storageFolder.FileExistsAsync(Path.GetFileName(ConfigurationHelper.DatabaseFilePath));
+                var task = storageFolder.FileExistsAsync(Path.GetFileName(PathHelper.DatabaseFilePath));
                 bool databaseExists = task.Result;
                 if (!databaseExists)
                 {
                     // Create database file
                     Tracing.Log("InitializationService.CreateLibrary -- Creating new database file...");
-                    CreateDatabaseFile(ConfigurationHelper.DatabaseFilePath);
+                    CreateDatabaseFile(PathHelper.DatabaseFilePath);
                 }                
 #else
-                Tracing.Log(string.Format("InitializationService.CreateLibrary -- Checking if the database file exists ({0})...", ConfigurationHelper.DatabaseFilePath));
-                if (!File.Exists(ConfigurationHelper.DatabaseFilePath))
+                Tracing.Log(string.Format("InitializationService.CreateLibrary -- Checking if the database file exists ({0})...", PathHelper.DatabaseFilePath));
+                if (!File.Exists(PathHelper.DatabaseFilePath))
                 {
                     // Create database file
                     Tracing.Log("InitializationService.CreateLibrary -- Creating new database file...");
-                    CreateDatabaseFile(ConfigurationHelper.DatabaseFilePath);
+                    CreateDatabaseFile(PathHelper.DatabaseFilePath);
                 }
 #endif
             }
@@ -172,7 +173,7 @@ private void LoadDatabase()
 			
             try
             {
-                string databaseVersion = GetDatabaseVersion(ConfigurationHelper.DatabaseFilePath);
+                string databaseVersion = GetDatabaseVersion(PathHelper.DatabaseFilePath);
                 string[] currentVersionSplit = databaseVersion.Split('.');
 
                 // Check integrity of the setting value (should be split in 2)
@@ -193,7 +194,7 @@ private void LoadDatabase()
 
                 // Check if the database needs to be updated
                 Tracing.Log("InitializationService.CreateLibrary -- Database version is " + databaseVersion + ". Checking if the database version needs to be updated...");
-                CheckIfDatabaseVersionNeedsToBeUpdated(ConfigurationHelper.DatabaseFilePath);
+                CheckIfDatabaseVersionNeedsToBeUpdated(PathHelper.DatabaseFilePath);
             }
             catch (Exception ex)
             {
diff --git a/MPfm/MPfm.MVP/Views/ICloudConnectView.cs b/MPfm/MPfm.MVP/Views/ICloudConnectView.cs
new file mode 100644
index 00000000..5df603d7
--- /dev/null
+++ b/MPfm/MPfm.MVP/Views/ICloudConnectView.cs
@@ -0,0 +1,33 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using MPfm.MVP.Models;
+
+namespace MPfm.MVP.Views
+{
+	/// <summary>
+    /// Cloud Connect view interface.
+	/// </summary>
+    public interface ICloudConnectView : IBaseView
+	{
+        Action OnCheckIfAccountIsLinked { get; set; }
+
+	    void CloudConnectError(Exception ex);
+	    void RefreshStatus(CloudConnectEntity entity);
+	}
+}
diff --git a/MPfm/MPfm.MVP/Views/ICloudPreferencesView.cs b/MPfm/MPfm.MVP/Views/ICloudPreferencesView.cs
new file mode 100644
index 00000000..1a573da6
--- /dev/null
+++ b/MPfm/MPfm.MVP/Views/ICloudPreferencesView.cs
@@ -0,0 +1,35 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using MPfm.MVP.Models;
+
+namespace MPfm.MVP.Views
+{
+	/// <summary>
+    /// Cloud preferences view interface.
+	/// </summary>
+    public interface ICloudPreferencesView : IBaseView
+	{
+        Action<CloudPreferencesEntity> OnSetCloudPreferences { get; set; }
+        Action OnDropboxLoginLogout { get; set; }
+
+	    void CloudPreferencesError(Exception ex);
+	    void RefreshCloudPreferences(CloudPreferencesEntity entity);
+	    void RefreshCloudPreferencesState(CloudPreferencesStateEntity entity);
+	}
+}
diff --git a/MPfm/MPfm.MVP/Views/IDesktopPreferencesView.cs b/MPfm/MPfm.MVP/Views/IDesktopPreferencesView.cs
index 444be083..f97134ac 100644
--- a/MPfm/MPfm.MVP/Views/IDesktopPreferencesView.cs
+++ b/MPfm/MPfm.MVP/Views/IDesktopPreferencesView.cs
@@ -1,29 +1,29 @@
-// Copyright © 2011-2013 Yanick Castonguay
-//
-// This file is part of MPfm.
-//
-// MPfm is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// MPfm is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
-
-using System;
-using System.Collections.Generic;
-
-namespace MPfm.MVP.Views
-{
-	/// <summary>
-    /// Preferences view for desktop (combines audio/general/library preferences)
-	/// </summary>
-    public interface IDesktopPreferencesView : IAudioPreferencesView, IGeneralPreferencesView, ILibraryPreferencesView
-	{
-    }
-}
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+
+namespace MPfm.MVP.Views
+{
+	/// <summary>
+    /// Preferences view for desktop (combines audio/cloud/general/library preferences)
+	/// </summary>
+    public interface IDesktopPreferencesView : IAudioPreferencesView, ICloudPreferencesView, IGeneralPreferencesView, ILibraryPreferencesView
+	{
+    }
+}
diff --git a/MPfm/MPfm.MVP/Views/IResumePlaybackView.cs b/MPfm/MPfm.MVP/Views/IResumePlaybackView.cs
index d4f44abc..38b66e3f 100644
--- a/MPfm/MPfm.MVP/Views/IResumePlaybackView.cs
+++ b/MPfm/MPfm.MVP/Views/IResumePlaybackView.cs
@@ -27,8 +27,11 @@ namespace MPfm.MVP.Views
     public interface IResumePlaybackView : IBaseView
 	{
         Action<CloudDeviceInfo> OnResumePlayback { get; set; }
+        Action OnOpenPreferencesView { get; set; }
+        Action OnCheckCloudLoginStatus { get; set; }
 
         void ResumePlaybackError(Exception ex);
+	    void RefreshAppLinkedStatus(bool isAppLinked);
         void RefreshDevices(IEnumerable<CloudDeviceInfo> devices);
 	}
 }
diff --git a/MPfm/MPfm.WPF/Classes/App.xaml b/MPfm/MPfm.WPF/Classes/App.xaml
index ba3d953b..7412f682 100644
--- a/MPfm/MPfm.WPF/Classes/App.xaml
+++ b/MPfm/MPfm.WPF/Classes/App.xaml
@@ -2,10 +2,16 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Startup="App_Startup">
-    <Application.Resources>
+    <Application.Resources>        
+        <!--<Style TargetType="ProgressBar">
+            <Setter Property="OverridesDefaultStyle" Value="True" />
+            <Setter Property="Background" Value="#FF242F35" />
+            <Setter Property="Foreground" Value="#FFE74C3C" />
+            <Setter Property="BorderBrush" Value="#FF242F35" />
+        </Style>-->
         <Style TargetType="Button">
             <!--Set to true to not get any properties from the themes.-->
-            <Setter Property="OverridesDefaultStyle" Value="True"/>
+            <Setter Property="OverridesDefaultStyle" Value="True" />
             <Setter Property="Foreground" Value="White" />
             <Setter Property="Padding" Value="6" />
             <Setter Property="Margin" Value="2" />
@@ -81,6 +87,46 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        <Style TargetType="Button" x:Key="TabButton">
+            <!--Set to true to not get any properties from the themes.-->
+            <Setter Property="OverridesDefaultStyle" Value="True"/>
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="FontFamily" Value="/Resources/Fonts/#TitilliumText22L Lt" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Grid>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Normal"/>
+                                    <VisualState x:Name="MouseOver">
+                                        <Storyboard>
+                                            <ColorAnimation Duration="0" To="#FF687985" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" Storyboard.TargetName="borderButton" />
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Pressed">
+                                        <Storyboard>
+                                            <ColorAnimation Duration="0" To="#FF687985" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" Storyboard.TargetName="borderButton" />
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Disabled">
+                                        <Storyboard>
+                                            <ColorAnimation Duration="0" To="#FF455865" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" Storyboard.TargetName="borderButton" />
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                            <StackPanel Background="#FF455865">
+                                <Border x:Name="borderButton" Background="#FF455865" Padding="4">
+                                    <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                </Border>
+                            </StackPanel>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <Style TargetType="Button" x:Key="HeaderImageButton">
             <!--Set to true to not get any properties from the themes.-->
             <Setter Property="OverridesDefaultStyle" Value="True"/>
diff --git a/MPfm/MPfm.WPF/Classes/App.xaml.cs b/MPfm/MPfm.WPF/Classes/App.xaml.cs
index f6d8cd03..b1c1d728 100644
--- a/MPfm/MPfm.WPF/Classes/App.xaml.cs
+++ b/MPfm/MPfm.WPF/Classes/App.xaml.cs
@@ -73,7 +73,7 @@ private void RegisterIoC()
         {
             // Finish IoC registration
             Bootstrapper.GetContainer().Register<ISyncDeviceSpecifications, WindowsSyncDeviceSpecifications>().AsSingleton();
-            Bootstrapper.GetContainer().Register<IDropboxService, DropboxCoreService>().AsSingleton();
+            Bootstrapper.GetContainer().Register<ICloudLibraryService, DropboxCoreService>().AsSingleton();
             Bootstrapper.GetContainer().Register<IAppConfigProvider, XmlAppConfigProvider>().AsSingleton();
             Bootstrapper.GetContainer().Register<NavigationManager, WindowsNavigationManager>().AsSingleton();
             Bootstrapper.GetContainer().Register<ISplashView, SplashWindow>().AsMultiInstance();
@@ -86,6 +86,7 @@ private void RegisterIoC()
             Bootstrapper.GetContainer().Register<IPlaylistView, PlaylistWindow>().AsMultiInstance();
             Bootstrapper.GetContainer().Register<IDesktopEffectsView, EffectsWindow>().AsMultiInstance();
             Bootstrapper.GetContainer().Register<IDesktopPreferencesView, PreferencesWindow>().AsMultiInstance();
+            Bootstrapper.GetContainer().Register<ICloudConnectView, CloudConnectWindow>().AsMultiInstance();
             Bootstrapper.GetContainer().Register<ISyncView, SyncWindow>().AsMultiInstance();
             Bootstrapper.GetContainer().Register<ISyncCloudView, SyncCloudWindow>().AsMultiInstance();
             Bootstrapper.GetContainer().Register<ISyncMenuView, SyncMenuWindow>().AsMultiInstance();
diff --git a/MPfm/MPfm.WPF/Classes/Specifications/WindowsSyncDeviceSpecifications.cs b/MPfm/MPfm.WPF/Classes/Specifications/WindowsSyncDeviceSpecifications.cs
index 1f65b732..7b206a56 100644
--- a/MPfm/MPfm.WPF/Classes/Specifications/WindowsSyncDeviceSpecifications.cs
+++ b/MPfm/MPfm.WPF/Classes/Specifications/WindowsSyncDeviceSpecifications.cs
@@ -36,16 +36,17 @@ public SyncDeviceType GetDeviceType()
             return SyncDeviceType.Windows;
         }
 
-        string _deviceName = string.Empty;
         public string GetDeviceName()
         {
-            _deviceName = System.Environment.MachineName;
-            return _deviceName;
+            return System.Environment.MachineName;;
         }
 
         public string GetDeviceUniqueId()
         {
-            return string.Empty;
+            string machineName = System.Environment.MachineName;
+            machineName = machineName.Replace(" ", "");
+            machineName = machineName.Normalize();
+            return machineName;
         }
 
         public long GetFreeSpace()
diff --git a/MPfm/MPfm.WPF/Classes/Windows/CloudConnectWindow.xaml b/MPfm/MPfm.WPF/Classes/Windows/CloudConnectWindow.xaml
new file mode 100644
index 00000000..4fea9ea5
--- /dev/null
+++ b/MPfm/MPfm.WPF/Classes/Windows/CloudConnectWindow.xaml
@@ -0,0 +1,37 @@
+<base:BaseWindow x:Class="MPfm.WPF.Classes.Windows.CloudConnectWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"        
+        xmlns:base="clr-namespace:MPfm.WPF.Classes.Windows.Base"
+        xmlns:controls="clr-namespace:MPfm.WPF.Classes.Controls"
+        WindowStartupLocation="CenterScreen" Background="#FF242F35"
+        Title="Connect to" Height="300" Width="540" Icon="/MPfm.WPF;component/Resources/Icon.ico" ResizeMode="NoResize">
+    <Grid Margin="0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Label Grid.Row="0" x:Name="lblTitle" Content="Connect to" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+        <StackPanel Grid.Row="1" Margin="6">
+            <ProgressBar x:Name="progressBar" Height="20" IsIndeterminate="true" Background="#FF242F35" BorderBrush="#FF242F35" Foreground="#FFE74C3C" Margin="5,8,5,8" VerticalContentAlignment="Center" />
+            <Label x:Name="lblStep1" Content="Step 1: Fetch request token from Dropbox API" Foreground="#999999" FontSize="13" FontFamily="/Resources/Fonts/#Junction" />
+            <Label x:Name="lblStep2" Content="Step 2: Enter credentials in web browser" Foreground="#999999" FontSize="13" FontFamily="/Resources/Fonts/#Junction" />
+            <Label x:Name="lblStep2B" Content="Return to this window once you are logged in to the cloud service." Foreground="#999999" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Margin="10,0,0,0" />
+            <Label x:Name="lblStep3" Content="Step 3: Request access token from Dropbox API" Foreground="#999999" FontSize="13" FontFamily="/Resources/Fonts/#Junction" />
+            <Label x:Name="lblStep4" Content="Step 4: Connect to Dropbox" Foreground="#999999" FontSize="13" FontFamily="/Resources/Fonts/#Junction" />
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <Button x:Name="btnOK" Width="120" Margin="10" IsEnabled="false" Click="btnOK_OnClick">
+                    <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                        <Image x:Name="imageButtonOK" Source="/Resources/Images/Buttons/ok.png" Stretch="None" Opacity="0.5" />
+                        <Label x:Name="lblButtonOK" FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0" Opacity="0.5">OK</Label>
+                    </StackPanel>
+                </Button>
+                <Button x:Name="btnCancel" Width="120" Margin="10" Click="btnCancel_OnClick">
+                    <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                        <Image Source="/Resources/Images/Buttons/cancel.png" Stretch="None" />
+                        <Label FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0">Cancel</Label>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</base:BaseWindow>
diff --git a/MPfm/MPfm.WPF/Classes/Windows/CloudConnectWindow.xaml.cs b/MPfm/MPfm.WPF/Classes/Windows/CloudConnectWindow.xaml.cs
new file mode 100644
index 00000000..3f91413b
--- /dev/null
+++ b/MPfm/MPfm.WPF/Classes/Windows/CloudConnectWindow.xaml.cs
@@ -0,0 +1,101 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Threading;
+using MPfm.MVP.Models;
+using MPfm.MVP.Views;
+using MPfm.WPF.Classes.Windows.Base;
+
+namespace MPfm.WPF.Classes.Windows
+{
+    public partial class CloudConnectWindow : BaseWindow, ICloudConnectView
+    {
+        private bool _canCheckForAuthentication = false;
+
+        public CloudConnectWindow(Action<IBaseView> onViewReady) 
+            : base (onViewReady)
+        {
+            InitializeComponent();
+            ViewIsReady();
+        }
+
+        private void btnOK_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void btnCancel_OnClick(object sender, RoutedEventArgs e)
+        {
+            // Add canceling when it will be implemented
+            Close();
+        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+
+            if (!_canCheckForAuthentication)
+                return;
+
+            OnCheckIfAccountIsLinked();
+        }
+
+        #region ICloudConnectView implementation
+
+        public Action OnCheckIfAccountIsLinked { get; set; }
+
+        public void CloudConnectError(Exception ex)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                MessageBox.Show(this, string.Format("An error occured in SyncDownload: {0}", ex), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }));
+        }
+
+        public void RefreshStatus(CloudConnectEntity entity)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                string title = string.Format("Connect to {0}", entity.CloudServiceName);
+                this.Title = title;
+                lblTitle.Content = title;
+
+                _canCheckForAuthentication = entity.CurrentStep > 1;
+                lblStep1.Foreground = entity.CurrentStep > 1 ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromRgb(153, 153, 153));
+                lblStep2.Foreground = entity.CurrentStep > 2 ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromRgb(153, 153, 153));
+                lblStep2B.Foreground = entity.CurrentStep > 2 ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromRgb(153, 153, 153));
+                lblStep3.Foreground = entity.CurrentStep > 3 ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromRgb(153, 153, 153));
+                lblStep4.Foreground = entity.IsAuthenticated ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Color.FromRgb(153, 153, 153));
+                btnOK.IsEnabled = entity.IsAuthenticated;
+                lblButtonOK.Opacity = entity.IsAuthenticated ? 1 : 0.5;
+                imageButtonOK.Opacity = entity.IsAuthenticated ? 1 : 0.5;
+
+                if (entity.IsAuthenticated)
+                {
+                    progressBar.IsIndeterminate = false;
+                    progressBar.Value = 100;
+                }
+            }));
+        }
+
+        #endregion
+
+    }
+}
diff --git a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml
index 67ef2929..a47151a7 100644
--- a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml
+++ b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml
@@ -3,22 +3,150 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"        
         xmlns:base="clr-namespace:MPfm.WPF.Classes.Windows.Base"
         xmlns:controls="clr-namespace:MPfm.WPF.Classes.Controls"
+        xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
         WindowStartupLocation="CenterScreen" Background="#FF242F35"
-        Title="Preferences" Height="426" Width="677.9" Icon="/MPfm.WPF;component/Resources/Icon.ico">
+        Title="Preferences" Height="500" Width="680" Icon="/MPfm.WPF;component/Resources/Icon.ico">
     <Grid Margin="0">
-        <TabControl Grid.Row="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="668" BorderBrush="#FF344046" Background="#FF344046">
-            <TabItem Header="General">
-                <Grid />
-            </TabItem>
-            <TabItem Header="Audio">
-                <Grid />
-            </TabItem>
-            <TabItem Header="Library">
-                <Grid />
-            </TabItem>
-            <TabItem Header="Cloud">
-                <Grid />
-            </TabItem>
-        </TabControl>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Orientation="Horizontal">
+            <Button x:Name="btnTabGeneral" Click="btnTab_OnClick" Style="{StaticResource TabButton}">
+                <StackPanel Orientation="Horizontal" Margin="0">
+                    <Image Source="/Resources/Images/Buttons/preferences.png" Stretch="None" />
+                    <Label FontSize="13" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" VerticalContentAlignment="Center" Foreground="White" Margin="4,0,0,0">General</Label>
+                </StackPanel>
+            </Button>
+            <Button x:Name="btnTabAudio" Click="btnTab_OnClick" Style="{StaticResource TabButton}" Margin="0">
+                <StackPanel Orientation="Horizontal" Margin="0">
+                    <Image Source="/Resources/Images/Buttons/audio.png" Stretch="None" />
+                    <Label FontSize="13" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" VerticalContentAlignment="Center" Foreground="White" Margin="4,0,0,0">Audio</Label>
+                </StackPanel>
+            </Button>
+            <Button x:Name="btnTabLibrary" Click="btnTab_OnClick" Style="{StaticResource TabButton}">
+                <StackPanel Orientation="Horizontal" Margin="0">
+                    <Image Source="/Resources/Images/Buttons/library.png" Stretch="None" />
+                    <Label FontSize="13" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" VerticalContentAlignment="Center" Foreground="White" Margin="4,0,0,0">Library</Label>
+                </StackPanel>
+            </Button>
+            <Button x:Name="btnTabCloud" Click="btnTab_OnClick" Style="{StaticResource TabButton}">
+                <StackPanel Orientation="Horizontal" Margin="0">
+                    <Image Source="/Resources/Images/Buttons/cloud.png" Stretch="None" />
+                    <Label FontSize="13" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" VerticalContentAlignment="Center" Foreground="White" Margin="4,0,0,0">Cloud</Label>
+                </StackPanel>
+            </Button>
+        </StackPanel>
+        <Label Grid.Row="1" x:Name="lblTitle" Content="General Preferences" Background="#FF455865" Foreground="White" FontSize="16" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+        <StackPanel Grid.Row="2" x:Name="gridAudio" Visibility="Hidden">
+            <StackPanel Background="White" Margin="8,8,8,0">
+                <Label Content="Output" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <CheckBox VerticalContentAlignment="Center" Margin="4" Content="TBD" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+            </StackPanel>
+            <StackPanel Background="White" Margin="8,8,8,0" Orientation="Vertical">
+                <Label Content="Mixer" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <CheckBox VerticalContentAlignment="Center" Margin="4" Content="TBD" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+            </StackPanel>
+            <StackPanel Background="White" Margin="8,8,8,0" Orientation="Vertical">
+                <Label Content="Status" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <CheckBox VerticalContentAlignment="Center" Margin="4" Content="TBD" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+            </StackPanel>
+        </StackPanel>
+        <StackPanel Grid.Row="2" x:Name="gridLibrary" Visibility="Hidden">
+            <Grid Background="White" Margin="8,8,8,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="250" />
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Content="Folders" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <StackPanel Grid.Row="1" Orientation="Horizontal">
+                    <Button Margin="0" HorizontalAlignment="Left" Click="btnAddFolder_OnClick">
+                        <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                            <Image Source="/Resources/Images/Buttons/add.png" Stretch="None" />
+                            <Label FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0">Add folder</Label>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0" HorizontalAlignment="Left" Click="btnRemoveFolder_OnClick">
+                        <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                            <Image Source="/Resources/Images/Buttons/delete.png" Stretch="None" />
+                            <Label FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0">Remove folder(s)</Label>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0" HorizontalAlignment="Left" Click="btnUpdateLibrary_OnClick">
+                        <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                            <Image Source="/Resources/Images/Buttons/refresh.png" Stretch="None" />
+                            <Label FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0">Update Library</Label>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0" HorizontalAlignment="Left" Click="btnResetLibrary_OnClick">
+                        <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                            <Image Source="/Resources/Images/Buttons/reset.png" Stretch="None" />
+                            <Label FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0">Reset Library</Label>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+                <ListView Grid.Row="2" />
+            </Grid>
+        </StackPanel>
+        <StackPanel Grid.Row="2" x:Name="gridCloud" Visibility="Visible">
+            <!--<StackPanel Background="White" Margin="8,8,8,0">
+                <Label Content="General" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <CheckBox VerticalContentAlignment="Center" Margin="4" Content="Enable synchronization" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+            </StackPanel>-->
+            <StackPanel Background="White" Margin="8,8,8,0" Orientation="Vertical">
+                <Label Content="Dropbox" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <StackPanel Orientation="Horizontal">
+                    <Button Margin="0" HorizontalAlignment="Left" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Click="btnDropboxLoginLogout_OnClick">
+                        <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                            <Image Source="/Resources/Images/Buttons/dropbox.png" Stretch="None" />
+                            <Label x:Name="lblDropbox_Login" FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0">Login to Dropbox</Label>
+                        </StackPanel>
+                    </Button>
+                    <Label Content="Authenticated:" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" />
+                    <Label x:Name="lblDropbox_Authenticated" Content="False" Foreground="Black" FontSize="12" FontWeight="Bold" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" />                                        
+                </StackPanel>
+                <CheckBox x:Name="chkDropbox_ResumePlayback" VerticalContentAlignment="Center" Margin="4" Content="Enable Resume Playback with Dropbox" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" Checked="chkDropboxResumePlayback_OnChecked" />
+                <Label Content="Note: This will take a small amount of bandwidth (about 1 kilobyte) every time the player switches to a new song." Foreground="#666666" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Margin="25,0,0,5" Padding="0" />
+            </StackPanel>
+        </StackPanel>
+        <StackPanel Grid.Row="2" x:Name="gridGeneral" Visibility="Hidden">
+            <StackPanel Background="White" Margin="8,8,8,0">
+                <Label Content="Update Frequency" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <StackPanel Orientation="Horizontal">
+                    <Label Content="Song position:" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                    <Slider Width="200" Margin="4" />
+                    <Label Content="every" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                    <TextBox x:Name="txtUpdateFrequency_SongPosition" Width="60" FontSize="12" Margin="4" />
+                    <Label Content="ms" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Label Content="Output meter:" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                    <Slider Width="200" Margin="4" />
+                    <Label Content="every" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                    <TextBox x:Name="txtUpdateFrequency_OutputMeter" Width="60" FontSize="12" Margin="4" />
+                    <Label Content="ms" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                </StackPanel>
+            </StackPanel>
+            <StackPanel Background="White" Margin="8,8,8,0">
+                <Label Content="User Interface" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <CheckBox VerticalContentAlignment="Center" Margin="4" Content="Show tooltips" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                <CheckBox VerticalContentAlignment="Center" Margin="4" Content="Show application in system tray" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                <CheckBox VerticalContentAlignment="Center" Margin="24,4,4,4" Content="Minimize in system tray when the app is closed" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+            </StackPanel>
+            <StackPanel Background="White" Margin="8,8,8,0">
+                <Label Content="Peak Files" Background="#FF455865" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+                <RadioButton x:Name="radioPeakFiles_UseDefaultDirectory" VerticalContentAlignment="Center" Margin="4" Content="Use default directory ([dir])" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                <RadioButton x:Name="radioPeakFiles_UseCustomDirectory" VerticalContentAlignment="Center" Margin="4" Content="Use custom directory:" Foreground="Black" FontSize="12" FontFamily="/Resources/Fonts/#Junction" />
+                <StackPanel Orientation="Vertical">
+                    <StackPanel Orientation="Horizontal" Margin="24,0,0,0">
+                        <TextBox x:Name="txtPeakFiles_CustomDirectory" Width="300" Height="24" FontSize="12" />
+                        <Button Content="Browse..." Width="80" Height="32" Margin="0" FontSize="11" FontFamily="/Resources/Fonts/#Junction" />
+                    </StackPanel>
+                    <Label Content="Note: You will need to launch the app as administrator to use a custom directory." Foreground="#666666" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Margin="19,0,0,0" />
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>        
     </Grid>
 </base:BaseWindow>
diff --git a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs
index ed017099..4560c680 100644
--- a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs
+++ b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs
@@ -16,16 +16,10 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Threading;
-using MPfm.Library.Objects;
-using MPfm.MVP.Messages;
 using MPfm.MVP.Models;
-using MPfm.MVP.Presenters;
 using MPfm.MVP.Views;
-using MPfm.Player.Objects;
-using MPfm.Sound.AudioFiles;
 using MPfm.WPF.Classes.Windows.Base;
 
 namespace MPfm.WPF.Classes.Windows
@@ -39,7 +33,57 @@ public PreferencesWindow(Action<IBaseView> onViewReady)
             ViewIsReady();
         }
 
-        #region IDesktopPreferencesView implementation
+        private void btnTab_OnClick(object sender, RoutedEventArgs e)
+        {
+            gridGeneral.Visibility = sender == btnTabGeneral ? Visibility.Visible : Visibility.Hidden;
+            gridAudio.Visibility = sender == btnTabAudio ? Visibility.Visible : Visibility.Hidden;
+            gridLibrary.Visibility = sender == btnTabLibrary ? Visibility.Visible : Visibility.Hidden;
+            gridCloud.Visibility = sender == btnTabCloud ? Visibility.Visible : Visibility.Hidden;
+
+            if (sender == btnTabGeneral)
+                lblTitle.Content = "General Preferences";
+            else if (sender == btnTabAudio)
+                lblTitle.Content = "Audio Preferences";
+            else if (sender == btnTabLibrary)
+                lblTitle.Content = "Library Preferences";
+            else if (sender == btnTabCloud)
+                lblTitle.Content = "Cloud Preferences";
+        }
+
+        private void btnAddFolder_OnClick(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void btnRemoveFolder_OnClick(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void btnUpdateLibrary_OnClick(object sender, RoutedEventArgs e)
+        {
+            OnUpdateLibrary();
+        }
+
+        private void btnResetLibrary_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show(this, "Are you sure you wish to reset your library?\nThis will *NOT* delete audio files from your hard disk.", "Reset confirmation", MessageBoxButton.OKCancel, MessageBoxImage.Warning) == MessageBoxResult.Cancel)
+                return;
+
+            OnResetLibrary();
+        }
+
+        private void btnDropboxLoginLogout_OnClick(object sender, RoutedEventArgs e)
+        {
+            OnDropboxLoginLogout();
+        }
+
+        private void chkDropboxResumePlayback_OnChecked(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        #region ILibraryPreferencesView implementation
 
         public Action OnResetLibrary { get; set; }
         public Action OnUpdateLibrary { get; set; }
@@ -57,5 +101,46 @@ public void LibraryPreferencesError(Exception ex)
 
         #endregion
 
+        #region ICloudPreferencesView implementation
+
+        public Action<CloudPreferencesEntity> OnSetCloudPreferences { get; set; }
+        public Action OnDropboxLoginLogout { get; set; }
+
+        public void CloudPreferencesError(Exception ex)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                MessageBox.Show(this, string.Format("An error occured in CloudPreferences: {0}", ex), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }));
+        }
+
+        public void RefreshCloudPreferences(CloudPreferencesEntity entity)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                chkDropbox_ResumePlayback.IsChecked = entity.IsDropboxResumePlaybackEnabled;
+            }));
+        }
+
+        public void RefreshCloudPreferencesState(CloudPreferencesStateEntity entity)
+        {
+            Console.WriteLine("PreferencesWindow - IsDropboxLinkedToApp: {0}", entity.IsDropboxLinkedToApp);
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                if (entity.IsDropboxLinkedToApp)
+                {
+                    lblDropbox_Authenticated.Content = "True";
+                    lblDropbox_Login.Content = "Logout from Dropbox";
+                }
+                else
+                {
+                    lblDropbox_Authenticated.Content = "False";
+                    lblDropbox_Login.Content = "Login to Dropbox";
+                }
+            }));            
+        }
+
+        #endregion
+
     }
 }
diff --git a/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml b/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml
index e34d6b4d..a0870bd7 100644
--- a/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml
+++ b/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml
@@ -3,47 +3,83 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"        
         xmlns:base="clr-namespace:MPfm.WPF.Classes.Windows.Base"
         xmlns:controls="clr-namespace:MPfm.WPF.Classes.Controls"
+        xmlns:models="clr-namespace:MPfm.Library.Objects;assembly=MPfm.Library"
         WindowStartupLocation="CenterScreen" Background="#FF242F35"
         Title="Resume Playback" Height="426" Width="677.9" Icon="/MPfm.WPF;component/Resources/Icon.ico">
     <Grid Margin="0">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Vertical" Margin="4">
-            <Label Content="Resume Playback" Foreground="White" FontSize="16" FontWeight="Bold" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" Padding="4,2,4,2" />
-            <Label x:Name="lblIPAddress" Content="My IP address is" Foreground="#FFCCCCCC" FontSize="12" FontFamily="/Resources/Fonts/#Junction" Padding="4,2,4,2" />
-        </StackPanel>
-        <ListView Grid.Row="1">
-        </ListView>
-        <Grid Grid.Row="2" Margin="2">
+        <Grid Grid.Row="0" Background="#FF455865">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
                 <ColumnDefinition />
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" x:Name="btnRefresh">
-                <StackPanel Orientation="Horizontal" Margin="8">
-                    <Image Source="/Resources/Images/Buttons/refresh.png" Stretch="None" />
-                    <TextBlock Margin="6,0,0,0">Refresh devices</TextBlock>
-                </StackPanel>
-            </Button>
-            <StackPanel Grid.Column="1"></StackPanel>
-            <Button Grid.Column="2" x:Name="btnManualConnect">
-                <StackPanel Orientation="Horizontal" Margin="8">
-                    <Image Source="/Resources/Images/Buttons/connect.png" Stretch="None" />
-                    <TextBlock Margin="6,0,0,0">Connect manually to device</TextBlock>
-                </StackPanel>
-            </Button>
-            <Button Grid.Column="3" x:Name="btnConnect">
-                <StackPanel Orientation="Horizontal" Margin="8">
-                    <Image Source="/Resources/Images/Buttons/connect.png" Stretch="None" />
-                    <TextBlock Margin="6,0,0,0">Connect to device</TextBlock>
+            <Label Grid.Column="0" x:Name="lblTitle" Content="Resume Playback" Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" />
+            <Button Grid.Column="1" Style="{StaticResource HeaderImageButton}" Click="btnResume_OnClick">
+                <StackPanel Orientation="Horizontal" Margin="4">
+                    <Image Source="/Resources/Images/Buttons/play.png" Stretch="None" />
+                    <TextBlock Margin="6,1,0,0">Resume</TextBlock>
                 </StackPanel>
             </Button>
         </Grid>        
+        <Grid x:Name="gridLoading" Grid.Row="1" Visibility="Visible">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" />
+            <StackPanel Grid.Row="1">
+                <Label Content="Loading..." Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" HorizontalContentAlignment="Center" />
+                <ProgressBar Height="20" IsIndeterminate="true" Background="#FF242F35" BorderBrush="#FF242F35" Foreground="#FFE74C3C" Margin="5,2,5,2" VerticalContentAlignment="Center" />
+            </StackPanel>
+            <StackPanel Grid.Row="2" />
+        </Grid>
+        <Grid x:Name="gridLogin" Grid.Row="1" Visibility="Hidden">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" />
+            <StackPanel Grid.Row="1">
+                <Label Content="This application is not linked with a Dropbox account." Foreground="White" FontSize="14" FontFamily="/Resources/Fonts/#TitilliumText22L Lt" HorizontalContentAlignment="Center" />
+                <Button Margin="0" HorizontalAlignment="Center" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Click="btnOpenPreferencesWindow_OnClick">
+                    <StackPanel Orientation="Horizontal" Margin="8,4,8,4">
+                        <Image Source="/Resources/Images/Buttons/preferences.png" Stretch="None" />
+                        <Label FontSize="11" FontFamily="/Resources/Fonts/#Junction" VerticalContentAlignment="Center" Foreground="White" Margin="6,0,0,0">Open Preferences Window</Label>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+            <StackPanel Grid.Row="2" />
+        </Grid>
+        <Grid x:Name="gridResumePlayback" Grid.Row="1" Visibility="Hidden">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Label Grid.Row="0" Content="Select a device from the list to resume playback:" Foreground="#FFCCCCCC" FontSize="12" FontFamily="/Resources/Fonts/#Junction" Padding="6,8,4,8" />
+            <ListView Grid.Row="1"  x:Name="listView">
+                <ListView.Resources>
+                    <HierarchicalDataTemplate DataType="{x:Type models:CloudDeviceInfo}" ItemsSource="{Binding SubItems}">
+                        <StackPanel Orientation="Vertical" Margin="4">
+                            <TextBlock Text="{Binding DeviceName}" FontSize="13" FontWeight="Bold" FontFamily="/Resources/Fonts/#Junction" Foreground="Black" Margin="0" />
+                            <TextBlock Text="On-the-fly Playlist" FontSize="12" FontFamily="/Resources/Fonts/#Junction" Foreground="#333333" Margin="0" />
+                            <StackPanel Orientation="Horizontal">
+                                <StackPanel Background="DarkSlateGray" Width="54" Height="54" Margin="0,4,8,4"></StackPanel>
+                                <StackPanel Orientation="Vertical" VerticalAlignment="Center">
+                                    <TextBlock Text="{Binding ArtistName}" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Foreground="#333333" Margin="0" />
+                                    <TextBlock Text="{Binding AlbumTitle}" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Foreground="#555555" Margin="0" />
+                                    <TextBlock Text="{Binding SongTitle}" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Foreground="#777777" Margin="0" />
+                                </StackPanel>
+                            </StackPanel>
+                            <TextBlock Text="{Binding Timestamp}" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Foreground="#999999" Margin="0" />
+                        </StackPanel>
+                    </HierarchicalDataTemplate>
+                </ListView.Resources>            
+            </ListView>
+        </Grid>
     </Grid>
 </base:BaseWindow>
diff --git a/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml.cs b/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml.cs
index 6dddb168..dfe44cd0 100644
--- a/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml.cs
+++ b/MPfm/MPfm.WPF/Classes/Windows/ResumePlaybackWindow.xaml.cs
@@ -17,26 +17,79 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Threading;
 using MPfm.Library.Objects;
-using MPfm.MVP.Messages;
-using MPfm.MVP.Models;
-using MPfm.MVP.Presenters;
 using MPfm.MVP.Views;
-using MPfm.Player.Objects;
-using MPfm.Sound.AudioFiles;
 using MPfm.WPF.Classes.Windows.Base;
 
 namespace MPfm.WPF.Classes.Windows
 {
     public partial class ResumePlaybackWindow : BaseWindow, IResumePlaybackView
     {
+        private List<CloudDeviceInfo> _devices;
+
         public ResumePlaybackWindow(Action<IBaseView> onViewReady) 
             : base (onViewReady)
         {
             InitializeComponent();
             ViewIsReady();
         }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+            OnCheckCloudLoginStatus();
+        }
+
+        private void btnResume_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (listView.SelectedItems.Count == 0)
+                return;
+
+            OnResumePlayback((CloudDeviceInfo) listView.SelectedItems[0]);
+        }
+
+        private void btnOpenPreferencesWindow_OnClick(object sender, RoutedEventArgs e)
+        {
+            OnOpenPreferencesView();
+        }
+
+        #region IResumePlaybackView implementation
+
+        public Action<CloudDeviceInfo> OnResumePlayback { get; set; }
+        public Action OnOpenPreferencesView { get; set; }
+        public Action OnCheckCloudLoginStatus { get; set; }
+
+        public void ResumePlaybackError(Exception ex)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                MessageBox.Show(this, string.Format("An error occured in ResumePlayback: {0}", ex), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }));
+        }
+
+        public void RefreshAppLinkedStatus(bool isAppLinked)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                gridLoading.Visibility = Visibility.Hidden; // No more loading from that point
+                gridLogin.Visibility = isAppLinked ? Visibility.Hidden : Visibility.Visible;
+                gridResumePlayback.Visibility = isAppLinked ? Visibility.Visible : Visibility.Hidden;
+            }));            
+        }
+
+        public void RefreshDevices(IEnumerable<CloudDeviceInfo> devices)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                _devices = devices.ToList();
+                listView.ItemsSource = _devices;
+            }));
+        }
+
+        #endregion
+
     }
 }
diff --git a/MPfm/MPfm.WPF/MPfm.WPF.csproj b/MPfm/MPfm.WPF/MPfm.WPF.csproj
index 4cc2c01d..aa7c2fba 100644
--- a/MPfm/MPfm.WPF/MPfm.WPF.csproj
+++ b/MPfm/MPfm.WPF/MPfm.WPF.csproj
@@ -41,6 +41,9 @@
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Accessibility" />
+    <Reference Include="PresentationUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="ReachFramework" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.76.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
@@ -50,7 +53,9 @@
     <Reference Include="System.Data.SQLite.Linq">
       <HintPath>..\MPfm.Library\Lib\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
+    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Printing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -64,6 +69,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MPfm.Core\Lib\TinyIoC.dll</HintPath>
     </Reference>
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -78,6 +85,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Classes\Windows\CloudConnectWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Classes\Windows\SyncMenuWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -140,6 +151,9 @@
     <Compile Include="Classes\Windows\SyncCloudWindow.xaml.cs">
       <DependentUpon>SyncCloudWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Classes\Windows\CloudConnectWindow.xaml.cs">
+      <DependentUpon>CloudConnectWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Classes\Windows\SyncMenuWindow.xaml.cs">
       <DependentUpon>SyncMenuWindow.xaml</DependentUpon>
     </Compile>
@@ -309,6 +323,17 @@
   <ItemGroup>
     <Resource Include="Resources\Images\Buttons\ok.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Buttons\cloud.png" />
+    <Resource Include="Resources\Images\Buttons\library.png" />
+    <Resource Include="Resources\Images\Buttons\preferences.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Buttons\audio.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Buttons\dropbox.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
diff --git a/MPfm/MPfm.WPF/Resources/Images/Buttons/audio.png b/MPfm/MPfm.WPF/Resources/Images/Buttons/audio.png
new file mode 100644
index 00000000..7d8171db
Binary files /dev/null and b/MPfm/MPfm.WPF/Resources/Images/Buttons/audio.png differ
diff --git a/MPfm/MPfm.WPF/Resources/Images/Buttons/cloud.png b/MPfm/MPfm.WPF/Resources/Images/Buttons/cloud.png
new file mode 100644
index 00000000..9ad259ba
Binary files /dev/null and b/MPfm/MPfm.WPF/Resources/Images/Buttons/cloud.png differ
diff --git a/MPfm/MPfm.WPF/Resources/Images/Buttons/dropbox.png b/MPfm/MPfm.WPF/Resources/Images/Buttons/dropbox.png
new file mode 100644
index 00000000..4a822dbc
Binary files /dev/null and b/MPfm/MPfm.WPF/Resources/Images/Buttons/dropbox.png differ
diff --git a/MPfm/MPfm.WPF/Resources/Images/Buttons/library.png b/MPfm/MPfm.WPF/Resources/Images/Buttons/library.png
new file mode 100644
index 00000000..143a2f2b
Binary files /dev/null and b/MPfm/MPfm.WPF/Resources/Images/Buttons/library.png differ
diff --git a/MPfm/MPfm.WPF/Resources/Images/Buttons/preferences.png b/MPfm/MPfm.WPF/Resources/Images/Buttons/preferences.png
new file mode 100644
index 00000000..b20059db
Binary files /dev/null and b/MPfm/MPfm.WPF/Resources/Images/Buttons/preferences.png differ
diff --git a/MPfm/MPfm.Windows/Classes/Forms/frmResumePlayback.cs b/MPfm/MPfm.Windows/Classes/Forms/frmResumePlayback.cs
index 575ee8d0..fb3f9e56 100644
--- a/MPfm/MPfm.Windows/Classes/Forms/frmResumePlayback.cs
+++ b/MPfm/MPfm.Windows/Classes/Forms/frmResumePlayback.cs
@@ -48,5 +48,15 @@ private void btnResumePlayback_Click(object sender, EventArgs e)
         {
 
         }
+
+        public Action<CloudDeviceInfo> OnResumePlayback { get; set; }
+
+        public void ResumePlaybackError(Exception ex)
+        {
+        }
+
+        public void RefreshDevices(IEnumerable<CloudDeviceInfo> devices)
+        {
+        }
     }
 }
diff --git a/MPfm/MPfm.Windows/Classes/Forms/frmSync.cs b/MPfm/MPfm.Windows/Classes/Forms/frmSync.cs
index 36bb626b..b0c65c80 100644
--- a/MPfm/MPfm.Windows/Classes/Forms/frmSync.cs
+++ b/MPfm/MPfm.Windows/Classes/Forms/frmSync.cs
@@ -69,7 +69,7 @@ private void btnConnect_Click(object sender, EventArgs e)
 
         private void btnConnectManual_Click(object sender, EventArgs e)
         {
-            var dropbox = Bootstrapper.GetContainer().Resolve<IDropboxService>();
+            var dropbox = Bootstrapper.GetContainer().Resolve<ICloudLibraryService>();
             dropbox.LinkApp(this);
         }
 
diff --git a/MPfm/MPfm.Windows/Classes/Forms/frmSyncCloud.cs b/MPfm/MPfm.Windows/Classes/Forms/frmSyncCloud.cs
index f8d2bcf6..8a18b2fa 100644
--- a/MPfm/MPfm.Windows/Classes/Forms/frmSyncCloud.cs
+++ b/MPfm/MPfm.Windows/Classes/Forms/frmSyncCloud.cs
@@ -37,7 +37,7 @@ namespace MPfm.Windows.Classes.Forms
 {
     public partial class frmSyncCloud : BaseForm, ISyncCloudView
     {
-        private IDropboxService _dropbox;
+        private ICloudLibraryService _dropbox;
         private bool _isDiscovering;
 
         public frmSyncCloud(Action<IBaseView> onViewReady)
@@ -45,7 +45,7 @@ public frmSyncCloud(Action<IBaseView> onViewReady)
         {
             InitializeComponent();
 
-            _dropbox = Bootstrapper.GetContainer().Resolve<IDropboxService>();
+            _dropbox = Bootstrapper.GetContainer().Resolve<ICloudLibraryService>();
 
             ViewIsReady();
         }
diff --git a/MPfm/MPfm.Windows/Classes/Program.cs b/MPfm/MPfm.Windows/Classes/Program.cs
index 4e67e841..9f2ba012 100644
--- a/MPfm/MPfm.Windows/Classes/Program.cs
+++ b/MPfm/MPfm.Windows/Classes/Program.cs
@@ -59,7 +59,7 @@ static void Main()
 
             // Finish IoC registration
             Bootstrapper.GetContainer().Register<ISyncDeviceSpecifications, WindowsSyncDeviceSpecifications>().AsSingleton();
-            Bootstrapper.GetContainer().Register<IDropboxService, DropboxCoreService>().AsSingleton();
+            Bootstrapper.GetContainer().Register<ICloudLibraryService, DropboxCoreService>().AsSingleton();
             Bootstrapper.GetContainer().Register<IAppConfigProvider, XmlAppConfigProvider>().AsSingleton();
             Bootstrapper.GetContainer().Register<NavigationManager, WindowsNavigationManager>().AsSingleton();
             Bootstrapper.GetContainer().Register<ISplashView, frmSplash>().AsMultiInstance();
diff --git a/MPfm/MPfm.WindowsControls/Audio/WaveFormDisplay.cs b/MPfm/MPfm.WindowsControls/Audio/WaveFormDisplay.cs
index 195d6631..f30c9c43 100644
--- a/MPfm/MPfm.WindowsControls/Audio/WaveFormDisplay.cs
+++ b/MPfm/MPfm.WindowsControls/Audio/WaveFormDisplay.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -29,6 +29,7 @@
 using MPfm.Sound;
 using MPfm.Sound.AudioFiles;
 using MPfm.Sound.PeakFiles;
+using MPfm.Core.Helpers;
 
 namespace MPfm.WindowsControls
 {
@@ -944,8 +945,8 @@ public void LoadWaveForm(string filePath)
             //}
 
             // Build peak file path
-            //peakFilePath = ConfigurationHelper. PeakFileDirectory + filePath.Replace(@"\", "_").Replace(":", "_").Replace(".", "_") + ".mpfmPeak";
-            peakFilePath = Path.Combine(ConfigurationHelper.PeakFileDirectory, filePath.Replace(@"\", "_").Replace(":", "_").Replace(".", "_") + ".mpfmPeak");
+            //peakFilePath = PathHelper. PeakFileDirectory + filePath.Replace(@"\", "_").Replace(":", "_").Replace(".", "_") + ".mpfmPeak";
+            peakFilePath = Path.Combine(PathHelper.PeakFileDirectory, filePath.Replace(@"\", "_").Replace(":", "_").Replace(".", "_") + ".mpfmPeak");
 
             // Clear history
             WaveDataHistory.Clear();