diff --git a/MPfm/MPfm.Library/Services/Interfaces/IUpdateLibraryService.cs b/MPfm/MPfm.Library/Services/Interfaces/IUpdateLibraryService.cs
index 670b748a..c5a10a48 100644
--- a/MPfm/MPfm.Library/Services/Interfaces/IUpdateLibraryService.cs
+++ b/MPfm/MPfm.Library/Services/Interfaces/IUpdateLibraryService.cs
@@ -1,39 +1,39 @@
-// 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;
-using MPfm.Library.UpdateLibrary;
-using MPfm.Library.Services.Events;
-
-namespace MPfm.Library.Services.Interfaces
-{
-	/// <summary>
-	/// Update Library window presenter interface.
-	/// </summary>
-	public interface IUpdateLibraryService
-	{
-        event EventHandler<RefreshStatusEventArgs> RaiseRefreshStatusEvent;
-        event EventHandler<ProcessEndedEventArgs> RaiseProcessEndedEvent;
-		
-		void Dispose();
-		void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string folderPath);
-		void Cancel();
-		void SaveLog(string filePath);		
-	}
-}
-
+// 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;
+using MPfm.Library.Objects;
+using MPfm.Library.UpdateLibrary;
+using MPfm.Library.Services.Events;
+
+namespace MPfm.Library.Services.Interfaces
+{
+	/// <summary>
+	/// Update Library window presenter interface.
+	/// </summary>
+	public interface IUpdateLibraryService
+	{
+        event EventHandler<RefreshStatusEventArgs> RaiseRefreshStatusEvent;
+        event EventHandler<ProcessEndedEventArgs> RaiseProcessEndedEvent;
+		
+		void UpdateLibrary(List<string> filePaths, List<Folder> folderPaths);
+		void Cancel();
+		void SaveLog(string filePath);		
+	}
+}
+
diff --git a/MPfm/MPfm.Library/Services/UpdateLibraryService.cs b/MPfm/MPfm.Library/Services/UpdateLibraryService.cs
index 03e870d8..17e41058 100644
--- a/MPfm/MPfm.Library/Services/UpdateLibraryService.cs
+++ b/MPfm/MPfm.Library/Services/UpdateLibraryService.cs
@@ -20,58 +20,47 @@
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using MPfm.Library.Objects;
+using MPfm.Library.Services.Events;
+using MPfm.Library.Services.Interfaces;
 using MPfm.Library.UpdateLibrary;
 using MPfm.Sound.AudioFiles;
-using System.Text.RegularExpressions;
-using MPfm.Library.Services.Interfaces;
-using MPfm.Library.Services.Events;
 
 #if (MACOSX || LINUX)
 using Mono.Unix;
 using Mono.Unix.Native;
 #endif
 
-namespace MPfm.MVP.Services
+namespace MPfm.Library.Services
 {
 	/// <summary>
 	///	Service used for updating the library with new audio files using a background worker.
 	/// </summary>
 	public class UpdateLibraryService : IUpdateLibraryService
 	{
-		private ILibraryService libraryService = null;		
-		private BackgroundWorker workerUpdateLibrary = null;
-		private bool cancelUpdateLibrary = false;
+		private readonly ILibraryService _libraryService = null;		
+		private BackgroundWorker _workerUpdateLibrary = null;
+		private bool _cancelUpdateLibrary = false;
 		
 		public event EventHandler<RefreshStatusEventArgs> RaiseRefreshStatusEvent;	
 		public event EventHandler<ProcessEndedEventArgs> RaiseProcessEndedEvent;
 		
-		#region Constructor and Dispose
-
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MPfm.UI.UpdateLibraryService"/> class.
 		/// </summary>
 		public UpdateLibraryService(ILibraryService libraryService)
 		{
 			if(libraryService == null)
-				throw new ArgumentNullException("The libraryService parameter cannot be null!");
-
-			this.libraryService = libraryService;
-					
-			workerUpdateLibrary = new BackgroundWorker();
-            workerUpdateLibrary.WorkerReportsProgress = true;
-            workerUpdateLibrary.WorkerSupportsCancellation = true;
-            workerUpdateLibrary.DoWork += new DoWorkEventHandler(workerUpdateLibrary_DoWork);
-            workerUpdateLibrary.RunWorkerCompleted += new RunWorkerCompletedEventHandler(workerUpdateLibrary_RunWorkerCompleted);
-		}
+				throw new ArgumentNullException("The _libraryService parameter cannot be null!");
 
-		public void Dispose()
-		{
+			_libraryService = libraryService;
+			_workerUpdateLibrary = new BackgroundWorker();
+            _workerUpdateLibrary.WorkerReportsProgress = true;
+            _workerUpdateLibrary.WorkerSupportsCancellation = true;
+            _workerUpdateLibrary.DoWork += new DoWorkEventHandler(workerUpdateLibrary_DoWork);
+            _workerUpdateLibrary.RunWorkerCompleted += new RunWorkerCompletedEventHandler(workerUpdateLibrary_RunWorkerCompleted);
 		}
-
-		#endregion
-		
-		#region Events
 		
 		/// <summary>
 		/// Raises the refresh status event. Wraps the event invocation by
@@ -96,17 +85,13 @@ protected virtual void OnRaiseProcessEndedEvent(ProcessEndedEventArgs e)
 				handler(this, e);
 		}
 		
-		#endregion
-		
-		#region IUpdateLibraryPresenter implementation
-		
 		/// <summary>
 		/// Cancels the update library process.
 		/// </summary>
 		public void Cancel()
 		{			
 			// Cancel process
-			cancelUpdateLibrary = true;
+			_cancelUpdateLibrary = true;
 		}
 
 		/// <summary>
@@ -138,31 +123,17 @@ public void SaveLog(string filePath)
             //        tw.Close();
             //    }
 		}
-			
-		#endregion
 		
-		/// <summary>
-		/// Starts the update library process in a background thread.		
-		/// </summary>
-		/// <param name='mode'>Update library mode</param>
-		/// <param name='filePaths'>Audio file paths to add to the database</param>
-		/// <param name='folderPath'>Folder path to add to the database</param>
-		public void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string folderPath)
+		public void UpdateLibrary(List<string> filePaths, List<Folder> folderPaths)
 		{					
-            UpdateLibraryArgument arg = new UpdateLibraryArgument();
-            arg.Mode = mode;
+            var arg = new UpdateLibraryArgument();
             arg.FilePaths = filePaths;
-            arg.FolderPath = folderPath;
+            arg.FolderPaths = folderPaths;
 			
-			cancelUpdateLibrary = false;
-
-            if (mode == UpdateLibraryMode.SpecificFolder)
-				libraryService.AddFolder(folderPath, true);
-			else if(mode == UpdateLibraryMode.SpecificFiles)
-				libraryService.AddFiles(filePaths);
+			_cancelUpdateLibrary = false;
 
             // Start the background process
-            workerUpdateLibrary.RunWorkerAsync(arg);
+            _workerUpdateLibrary.RunWorkerAsync(arg);
 
             // TODO: Add time elapsed/time remaining
             //    //            // Set start time when the process has finished finding the files and is ready to add files into library
@@ -219,46 +190,31 @@ protected void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
         {
             List<string> filePaths = new List<string>();    
             UpdateLibraryArgument arg = (UpdateLibraryArgument)e.Argument;
+            filePaths.AddRange(arg.FilePaths);
 						
 			try
 			{			
-            	if (cancelUpdateLibrary) throw new UpdateLibraryException();
-                if (arg.Mode == UpdateLibraryMode.WholeLibrary)
-                {
-                    // Remove broken songs from the library
-					OnRaiseRefreshStatusEvent(new UpdateLibraryEntity() {
-						Title = "Checking for broken file paths",
-						Subtitle = "Checking if songs have been deleted on your hard disk but not removed from the library..",
-						PercentageDone = 0
-					});
-                    libraryService.RemoveAudioFilesWithBrokenFilePaths();
+                // Remove broken songs from the library
+				OnRaiseRefreshStatusEvent(new UpdateLibraryEntity() {
+					Title = "Checking for broken file paths",
+					Subtitle = "Checking if songs have been deleted on your hard disk but not removed from the library..",
+					PercentageDone = 0
+				});
+                _libraryService.RemoveAudioFilesWithBrokenFilePaths();
 
-                    if (cancelUpdateLibrary) throw new UpdateLibraryException();
+                if (_cancelUpdateLibrary) throw new UpdateLibraryException();
 
-                    filePaths = SearchMediaFilesInFolders();
-                }
-                else if (arg.Mode == UpdateLibraryMode.SpecificFiles)
-                {           
-                    // Set the media files passed in the argument
-                    filePaths = arg.FilePaths;
-                }
-                else if (arg.Mode == UpdateLibraryMode.SpecificFolder)
-                {
-                    // Search the files in the specified folder                 
-                    Console.WriteLine("UpdateLibraryService - Looking for audio files in {0}...", arg.FolderPath);
-                    filePaths = SearchMediaFilesInFolders(arg.FolderPath, true);
-                    Console.WriteLine("UpdateLibraryService - Found {0} audio files in {0}", filePaths.Count, arg.FolderPath);
-                }
+                filePaths = SearchMediaFilesInFolders(arg.FolderPaths);
 				
-                if (cancelUpdateLibrary) throw new UpdateLibraryException();
+                if (_cancelUpdateLibrary) throw new UpdateLibraryException();
 				
 				// Get the list of audio files from the database
-				IEnumerable<string> filePathsDatabase = libraryService.SelectFilePaths();				
+				IEnumerable<string> filePathsDatabase = _libraryService.SelectFilePaths();				
 				IEnumerable<string> filePathsToUpdate = filePaths.Except(filePathsDatabase);
 					
 		        for(int a = 0; a < filePathsToUpdate.Count(); a++)
 		        {
-	                if (cancelUpdateLibrary) throw new UpdateLibraryException();							           				
+	                if (_cancelUpdateLibrary) throw new UpdateLibraryException();							           				
 						
 					// Get current file path and calculate stats
 					string filePath = filePathsToUpdate.ElementAt(a);											
@@ -273,12 +229,12 @@ protected void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
 		                    filePath.ToUpper().Contains(".XSPF"))
 		                {
 		                    PlaylistFile playlistFile = new PlaylistFile(filePath);
-	                    	libraryService.InsertPlaylistFile(playlistFile);							
+	                    	_libraryService.InsertPlaylistFile(playlistFile);							
 		                }
 		                else
 		                {
 		                    AudioFile audioFile = new AudioFile(filePath, Guid.NewGuid(), true);	                    
-	                    	libraryService.InsertAudioFile(audioFile);
+	                    	_libraryService.InsertAudioFile(audioFile);
 		                }
 						
 						// Display update
@@ -308,7 +264,7 @@ protected void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
 		        }
 
                 // Cancel thread if necessary
-                if (cancelUpdateLibrary) throw new UpdateLibraryException();
+                if (_cancelUpdateLibrary) throw new UpdateLibraryException();
 
                 // Compact database						
 				OnRaiseRefreshStatusEvent(new UpdateLibraryEntity() {
@@ -316,7 +272,7 @@ protected void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
 					Subtitle = "Compacting database...",
 					PercentageDone = 1
 				});                
-                libraryService.CompactDatabase();
+                _libraryService.CompactDatabase();
 			}
 			catch (UpdateLibraryException ex)
             {
@@ -345,16 +301,10 @@ private void workerUpdateLibrary_RunWorkerCompleted(object sender, RunWorkerComp
 			OnRaiseProcessEndedEvent(new ProcessEndedEventArgs(e.Cancelled));
         }
 				
-        /// <summary>
-        /// Searches for songs in all configured folders.
-        /// </summary>
-        /// <returns>List of songs (file paths)</returns>
-        public List<string> SearchMediaFilesInFolders()
+        public List<string> SearchMediaFilesInFolders(List<Folder> folders)
         {
             List<string> files = new List<string>();            
-            IEnumerable<Folder> folders = libraryService.SelectFolders();
-
-            foreach (Folder folder in folders)
+            foreach (var folder in folders)
             {
                 List<string> newFiles = SearchMediaFilesInFolders(folder.FolderPath, (bool)folder.IsRecursive);
                 files.AddRange(newFiles);
diff --git a/MPfm/MPfm.Library/UpdateLibrary/UpdateLibraryArgument.cs b/MPfm/MPfm.Library/UpdateLibrary/UpdateLibraryArgument.cs
index cd3899b7..48531823 100644
--- a/MPfm/MPfm.Library/UpdateLibrary/UpdateLibraryArgument.cs
+++ b/MPfm/MPfm.Library/UpdateLibrary/UpdateLibraryArgument.cs
@@ -1,51 +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 System.Collections.Generic;
-
-namespace MPfm.Library.UpdateLibrary
-{
-    /// <summary>
-    /// Arguments for the background worker that updates the library.
-    /// </summary>
-    public class UpdateLibraryArgument
-    {
-        /// <summary>
-        /// Update library mode.
-        /// </summary>
-        public UpdateLibraryMode Mode { get; set; }
-        /// <summary>
-        /// List of files to update (necessary for the SpecificFiles update library mode).
-        /// </summary>
-        public List<string> FilePaths { get; set; }
-        /// <summary>
-        /// Folder path to update (necessary for the SpecificFolder update library mode).
-        /// </summary>
-        public string FolderPath { get; set; }
-
-        /// <summary>
-        /// Constructor for UpdateLibraryArguments.
-        /// </summary>
-        public UpdateLibraryArgument()
-        {
-            // Set default arguments
-            Mode = UpdateLibraryMode.WholeLibrary;
-            FilePaths = new List<string>();
-            FolderPath = string.Empty;
-        }
-    }
-}
+// 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 MPfm.Library.Objects;
+
+namespace MPfm.Library.UpdateLibrary
+{
+    /// <summary>
+    /// Arguments for the background worker that updates the library.
+    /// </summary>
+    public class UpdateLibraryArgument
+    {
+        public List<string> FilePaths { get; set; }
+        public List<Folder> FolderPaths { get; set; }
+
+        public UpdateLibraryArgument()
+        {
+            FilePaths = new List<string>();
+            FolderPaths = new List<Folder>();
+        }
+    }
+}
diff --git a/MPfm/MPfm.MVP/Config/Models/LibraryAppConfig.cs b/MPfm/MPfm.MVP/Config/Models/LibraryAppConfig.cs
new file mode 100644
index 00000000..49f25485
--- /dev/null
+++ b/MPfm/MPfm.MVP/Config/Models/LibraryAppConfig.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.Collections.Generic;
+using MPfm.Library.Objects;
+
+namespace MPfm.MVP.Config.Models
+{
+    /// <summary>
+    /// Class containing all library settings.
+    /// </summary>
+    public class LibraryAppConfig : IAppConfig
+    {
+        public List<Folder> Folders { get; set; }
+
+        public LibraryAppConfig()
+        {
+            Folders = new List<Folder>();
+        }        
+    }
+}
diff --git a/MPfm/MPfm.MVP/Config/Models/RootAppConfig.cs b/MPfm/MPfm.MVP/Config/Models/RootAppConfig.cs
index a974360b..ba81049e 100644
--- a/MPfm/MPfm.MVP/Config/Models/RootAppConfig.cs
+++ b/MPfm/MPfm.MVP/Config/Models/RootAppConfig.cs
@@ -36,6 +36,7 @@ public class RootAppConfig : IAppConfig
 
         public AudioAppConfig Audio { get; set; }
         public CloudAppConfig Cloud { get; set; }
+        public LibraryAppConfig Library { get; set; }
         public ControlsAppConfig Controls { get; set; }       
         public WindowsAppConfig Windows { get; set; }
 
@@ -50,6 +51,7 @@ public RootAppConfig()
             Audio = new AudioAppConfig();
             Cloud = new CloudAppConfig();
             Controls = new ControlsAppConfig();
+            Library = new LibraryAppConfig();            
             Windows = new WindowsAppConfig();
         }
     }
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.csproj b/MPfm/MPfm.MVP/MPfm.MVP.csproj
index d233e57d..d51b9168 100644
--- a/MPfm/MPfm.MVP/MPfm.MVP.csproj
+++ b/MPfm/MPfm.MVP/MPfm.MVP.csproj
@@ -128,6 +128,7 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Config\AppConfigManager.cs" />
+    <Compile Include="Config\Models\LibraryAppConfig.cs" />
     <Compile Include="Config\Models\CloudAppConfig.cs" />
     <Compile Include="Config\Models\IAppConfig.cs" />
     <Compile Include="Messages\CloudConnectStatusChangedMessage.cs" />
diff --git a/MPfm/MPfm.MVP/Navigation/NavigationManager.cs b/MPfm/MPfm.MVP/Navigation/NavigationManager.cs
index aa379e72..1bb9f450 100644
--- a/MPfm/MPfm.MVP/Navigation/NavigationManager.cs
+++ b/MPfm/MPfm.MVP/Navigation/NavigationManager.cs
@@ -372,7 +372,7 @@ public virtual IPlaylistView CreatePlaylistView()
             return _playlistView;
         }
 
-        public virtual IUpdateLibraryView CreateUpdateLibraryView(UpdateLibraryMode mode, List<string> filePaths, string folderPath)
+        public virtual IUpdateLibraryView CreateUpdateLibraryView(List<string> filePaths, List<Folder> folderPaths)
         {
             if (_updateLibraryView != null)
             {
@@ -384,7 +384,7 @@ public virtual IUpdateLibraryView CreateUpdateLibraryView(UpdateLibraryMode mode
             {
                 _updateLibraryPresenter = Bootstrapper.GetContainer().Resolve<IUpdateLibraryPresenter>();
                 _updateLibraryPresenter.BindView((IUpdateLibraryView)view);
-                _updateLibraryPresenter.UpdateLibrary(mode, filePaths, folderPath);
+                _updateLibraryPresenter.UpdateLibrary(filePaths, folderPaths);
             };
 
             _updateLibraryView = Bootstrapper.GetContainer().Resolve<IUpdateLibraryView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
diff --git a/MPfm/MPfm.MVP/Presenters/Interfaces/IUpdateLibraryPresenter.cs b/MPfm/MPfm.MVP/Presenters/Interfaces/IUpdateLibraryPresenter.cs
index 406bdc8f..0de36c09 100644
--- a/MPfm/MPfm.MVP/Presenters/Interfaces/IUpdateLibraryPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/Interfaces/IUpdateLibraryPresenter.cs
@@ -1,34 +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.Collections.Generic;
-using MPfm.Library.UpdateLibrary;
-using MPfm.MVP.Views;
-
-namespace MPfm.MVP.Presenters.Interfaces
-{
-	/// <summary>
-	/// Update Library window presenter interface.
-	/// </summary>
-    public interface IUpdateLibraryPresenter : IBasePresenter<IUpdateLibraryView>
-	{		
-		void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string folderPath);
-		void Cancel();
-		void SaveLog(string filePath);		
-	}
-}
-
+// 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 MPfm.Library.Objects;
+using MPfm.Library.UpdateLibrary;
+using MPfm.MVP.Views;
+
+namespace MPfm.MVP.Presenters.Interfaces
+{
+	/// <summary>
+	/// Update Library window presenter interface.
+	/// </summary>
+    public interface IUpdateLibraryPresenter : IBasePresenter<IUpdateLibraryView>
+	{		
+		void UpdateLibrary(List<string> filePaths, List<Folder> folderPaths);
+		void Cancel();
+		void SaveLog(string filePath);		
+	}
+}
+
diff --git a/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs b/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs
index d369f7bd..3dd1b6e2 100644
--- a/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/LibraryPreferencesPresenter.cs
@@ -16,10 +16,13 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.Collections.Generic;
 using MPfm.Core;
 using MPfm.Library.Services.Interfaces;
 using MPfm.Library.UpdateLibrary;
 using MPfm.MVP.Bootstrap;
+using MPfm.MVP.Config;
+using MPfm.MVP.Config.Models;
 using MPfm.MVP.Navigation;
 using MPfm.MVP.Presenters.Interfaces;
 using MPfm.MVP.Views;
@@ -53,6 +56,7 @@ public class LibraryPreferencesPresenter : BasePresenter<ILibraryPreferencesView
 
         public override void BindView(ILibraryPreferencesView view)
         {
+            view.OnSetLibraryPreferences = SetLibraryPreferences;
             view.OnResetLibrary = ResetLibrary;
             view.OnUpdateLibrary = UpdateLibrary;
             view.OnSelectFolders = SelectFolders;
@@ -60,12 +64,28 @@ public override void BindView(ILibraryPreferencesView view)
             view.OnEnableSyncListener = EnableSyncListener;
             view.OnSetSyncListenerPort = SetSyncListenerPort;
             base.BindView(view);
-            
-            Initialize();
+
+            RefreshPreferences();
+        }
+
+        private void SetLibraryPreferences(LibraryAppConfig libraryAppConfig)
+        {
+            try
+            {
+                AppConfigManager.Instance.Root.Library = libraryAppConfig;
+                AppConfigManager.Instance.Save();
+                RefreshPreferences();
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("LibraryPreferencesPresenter - SetLibraryPreferences - Failed to set preferences: {0}", ex);
+                View.LibraryPreferencesError(ex);
+            }
         }
 
-	    private void Initialize()
+        private void RefreshPreferences()
         {
+            View.RefreshLibraryPreferences(AppConfigManager.Instance.Root.Library);
         }
 
         private void ResetLibrary()
@@ -90,7 +110,7 @@ private void UpdateLibrary()
                 var view = _mobileNavigationManager.CreateUpdateLibraryView();
                 _mobileNavigationManager.PushDialogView(MobileDialogPresentationType.Standard, "Update Library", View, view);
 #else
-                _navigationManager.CreateUpdateLibraryView(UpdateLibraryMode.WholeLibrary, null, null);
+                _navigationManager.CreateUpdateLibraryView(new List<string>(), AppConfigManager.Instance.Root.Library.Folders);
 #endif
             }
             catch(Exception ex)
diff --git a/MPfm/MPfm.MVP/Presenters/MainPresenter.cs b/MPfm/MPfm.MVP/Presenters/MainPresenter.cs
index fd26a68a..13094b0c 100644
--- a/MPfm/MPfm.MVP/Presenters/MainPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/MainPresenter.cs
@@ -16,7 +16,10 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System.Collections.Generic;
+using System.Linq;
+using MPfm.Library.Objects;
 using MPfm.Library.UpdateLibrary;
+using MPfm.MVP.Config;
 using MPfm.MVP.Navigation;
 using MPfm.MVP.Presenters.Interfaces;
 using MPfm.MVP.Views;
@@ -44,9 +47,28 @@ public override void BindView(IMainView view)
             view.OnOpenSyncCloudWindow = () => _navigationManager.CreateSyncCloudView();
             view.OnOpenSyncWebBrowserWindow = () => _navigationManager.CreateSyncWebBrowserView();
             view.OnOpenResumePlayback = () => _navigationManager.CreateResumePlaybackView();
-            view.OnAddFilesToLibrary = (filePaths) => _navigationManager.CreateUpdateLibraryView(UpdateLibraryMode.SpecificFiles, filePaths, null);
-            view.OnAddFolderToLibrary = (folderPath) => _navigationManager.CreateUpdateLibraryView(UpdateLibraryMode.SpecificFolder, null, folderPath);
-            view.OnUpdateLibrary = () => _navigationManager.CreateUpdateLibraryView(UpdateLibraryMode.WholeLibrary, null, null);
+            view.OnAddFilesToLibrary = (filePaths) => _navigationManager.CreateUpdateLibraryView(filePaths, new List<Folder>());
+            view.OnAddFolderToLibrary = (folderPath) =>
+            {
+                var folders = new List<Folder>();
+                folders.Add(new Folder()
+                {
+                    FolderPath = folderPath,
+                    IsRecursive = true
+                });
+
+                // Add to list of configured folders
+                var foundFolder = AppConfigManager.Instance.Root.Library.Folders.FirstOrDefault(x => x.FolderPath == folderPath);
+                if (foundFolder == null)
+                {
+                    AppConfigManager.Instance.Root.Library.Folders.Add(folders[0]);
+                    AppConfigManager.Instance.Save();
+                }
+
+                // Start update library
+                _navigationManager.CreateUpdateLibraryView(new List<string>(), folders);
+            };
+            view.OnUpdateLibrary = () => _navigationManager.CreateUpdateLibraryView(new List<string>(), AppConfigManager.Instance.Root.Library.Folders);
 
 			base.BindView(view);
 		}
diff --git a/MPfm/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs b/MPfm/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs
index 3f01a661..39be2c1b 100644
--- a/MPfm/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using MPfm.Library.Objects;
 using MPfm.Library.UpdateLibrary;
 using MPfm.MVP.Presenters.Interfaces;
 using MPfm.MVP.Services.Interfaces;
@@ -77,16 +78,9 @@ public override void BindView(IUpdateLibraryView view)
             view.OnSaveLog = SaveLog;
         }
 		
-		/// <summary>
-		/// Starts the update library process in a background thread. 
-		/// The Update Library view will be updated during progress.
-		/// </summary>
-		/// <param name='mode'>Update library mode</param>
-		/// <param name='filePaths'>Audio file paths to add to the database</param>
-		/// <param name='folderPath'>Folder path to add to the database</param>
-		public void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string folderPath)
+		public void UpdateLibrary(List<string> filePaths, List<Folder> folderPaths)
 		{
-			_updateLibraryService.UpdateLibrary(mode, filePaths, folderPath);
+			_updateLibraryService.UpdateLibrary(filePaths, folderPaths);
 		}
 		
 		/// <summary>
diff --git a/MPfm/MPfm.MVP/Views/ILibraryPreferencesView.cs b/MPfm/MPfm.MVP/Views/ILibraryPreferencesView.cs
index d7b3f2de..e824977b 100644
--- a/MPfm/MPfm.MVP/Views/ILibraryPreferencesView.cs
+++ b/MPfm/MPfm.MVP/Views/ILibraryPreferencesView.cs
@@ -14,7 +14,10 @@
 //
 // 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;
+using MPfm.MVP.Config.Models;
 
 namespace MPfm.MVP.Views
 {
@@ -23,6 +26,7 @@ namespace MPfm.MVP.Views
 	/// </summary>
     public interface ILibraryPreferencesView : IBaseView
 	{
+        Action<LibraryAppConfig> OnSetLibraryPreferences { get; set; }
         Action OnSelectFolders { get; set; }
         Action OnResetLibrary { get; set; }
         Action OnUpdateLibrary { get; set; }
@@ -30,5 +34,6 @@ public interface ILibraryPreferencesView : IBaseView
         Action<int> OnSetSyncListenerPort { get; set; }
 
         void LibraryPreferencesError(Exception ex);
+        void RefreshLibraryPreferences(LibraryAppConfig config);
 	}
 }
diff --git a/MPfm/MPfm.MVP/Views/IUpdateLibraryView.cs b/MPfm/MPfm.MVP/Views/IUpdateLibraryView.cs
index 230ad832..78b5495b 100644
--- a/MPfm/MPfm.MVP/Views/IUpdateLibraryView.cs
+++ b/MPfm/MPfm.MVP/Views/IUpdateLibraryView.cs
@@ -28,7 +28,7 @@ namespace MPfm.MVP.Views
 	/// </summary>
     public interface IUpdateLibraryView : IBaseView
 	{
-        Action<UpdateLibraryMode, List<string>, string> OnStartUpdateLibrary { get; set; }
+        Action<List<string>, List<Folder>> OnStartUpdateLibrary { get; set; }
         Action OnCancelUpdateLibrary { get; set; }
 	    Action<string> OnSaveLog { get; set; }
 
diff --git a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml
index a47151a7..9312d094 100644
--- a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml
+++ b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml
@@ -4,6 +4,7 @@
         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"
+        xmlns:models="clr-namespace:MPfm.Library.Objects;assembly=MPfm.Library"
         WindowStartupLocation="CenterScreen" Background="#FF242F35"
         Title="Preferences" Height="500" Width="680" Icon="/MPfm.WPF;component/Resources/Icon.ico">
     <Grid Margin="0">
@@ -53,7 +54,7 @@
                 <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">
+        <StackPanel Grid.Row="2" x:Name="gridLibrary" Visibility="Visible">
             <Grid Background="White" Margin="8,8,8,0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -61,36 +62,51 @@
                     <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">
+                <Grid Grid.Row="1" Margin="2,2,2,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button Grid.Column="0" 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">
+                    <Button Grid.Column="1" 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">
+                    <Button Grid.Column="2" 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">
+                    <Button Grid.Column="3" 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>
+                <ListView Grid.Row="2" x:Name="listViewFolders" FontSize="12" FontFamily="/Resources/Fonts/#Junction" Margin="6">
+                    <ListView.Resources>
+                        <HierarchicalDataTemplate DataType="{x:Type models:Folder}">
+                            <StackPanel Orientation="Horizontal" Margin="4">
+                                <Image Source="/Resources/Images/Icons/folder.png" Stretch="Uniform" />
+                                <TextBlock Text="{Binding FolderPath}" FontSize="11" FontFamily="/Resources/Fonts/#Junction" Foreground="#333333" Margin="6,0,0,0" />
+                            </StackPanel>
+                        </HierarchicalDataTemplate>
+                    </ListView.Resources>
+                </ListView>
             </Grid>
         </StackPanel>
-        <StackPanel Grid.Row="2" x:Name="gridCloud" Visibility="Visible">
+        <StackPanel Grid.Row="2" x:Name="gridCloud" Visibility="Hidden">
             <!--<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" />
diff --git a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs
index e8a1e38f..9f7f5f51 100644
--- a/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs
+++ b/MPfm/MPfm.WPF/Classes/Windows/PreferencesWindow.xaml.cs
@@ -16,8 +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.Config.Models;
 using MPfm.MVP.Models;
 using MPfm.MVP.Views;
@@ -28,6 +30,7 @@ namespace MPfm.WPF.Classes.Windows
     public partial class PreferencesWindow : BaseWindow, IDesktopPreferencesView
     {
         private CloudAppConfig _cloudAppConfig;
+        private LibraryAppConfig _libraryAppConfig;
 
         public PreferencesWindow(Action<IBaseView> onViewReady) 
             : base (onViewReady)
@@ -55,12 +58,38 @@ private void btnTab_OnClick(object sender, RoutedEventArgs e)
 
         private void btnAddFolder_OnClick(object sender, RoutedEventArgs e)
         {
+            var dialog = new System.Windows.Forms.FolderBrowserDialog();
+            dialog.Description = "Please select a folder to add to the music library";
+            dialog.ShowNewFolderButton = false;
+            if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.Cancel)
+                return;
 
+            _libraryAppConfig.Folders.Add(new Folder()
+            {
+                FolderPath = dialog.SelectedPath,
+                IsRecursive = true
+            });
+            OnSetLibraryPreferences(_libraryAppConfig);
         }
 
         private void btnRemoveFolder_OnClick(object sender, RoutedEventArgs e)
         {
+            if (listViewFolders.SelectedItem == null)
+                return;
+
+            var result = MessageBox.Show(this, "Do you wish to also remove the audio files from your library?\nNote: This will only remove audio files from the application, not from your hard disk.", "Folder removal confirmation", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning);
+            if(result == MessageBoxResult.Cancel)
+                return;
+
+            if (result == MessageBoxResult.Yes)
+            {
+                // TODO: Remove files from library
+            }
 
+            var folders = listViewFolders.SelectedItems;
+            foreach (Folder folder in folders)
+                _libraryAppConfig.Folders.Remove(folder);
+            OnSetLibraryPreferences(_libraryAppConfig);
         }
 
         private void btnUpdateLibrary_OnClick(object sender, RoutedEventArgs e)
@@ -70,7 +99,7 @@ private void btnUpdateLibrary_OnClick(object sender, RoutedEventArgs e)
 
         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)
+            if (MessageBox.Show(this, "Are you sure you wish to reset your library?\nNote: This will only remove audio files from the application, not from your hard disk.", "Reset confirmation", MessageBoxButton.OKCancel, MessageBoxImage.Warning) == MessageBoxResult.Cancel)
                 return;
 
             OnResetLibrary();
@@ -90,6 +119,7 @@ private void chkDropboxResumePlayback_OnChecked(object sender, RoutedEventArgs e
 
         #region ILibraryPreferencesView implementation
 
+        public Action<LibraryAppConfig> OnSetLibraryPreferences { get; set; }
         public Action OnResetLibrary { get; set; }
         public Action OnUpdateLibrary { get; set; }
         public Action OnSelectFolders { get; set; }
@@ -104,6 +134,16 @@ public void LibraryPreferencesError(Exception ex)
             }));
         }
 
+        public void RefreshLibraryPreferences(LibraryAppConfig config)
+        {
+            Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>
+            {
+                _libraryAppConfig = config;
+                listViewFolders.ItemsSource = config.Folders;
+                listViewFolders.Items.Refresh();
+            }));
+        }
+
         #endregion
 
         #region ICloudPreferencesView implementation
diff --git a/MPfm/MPfm.WPF/Classes/Windows/UpdateLibraryWindow.xaml.cs b/MPfm/MPfm.WPF/Classes/Windows/UpdateLibraryWindow.xaml.cs
index 78f9940e..c1a74ec8 100644
--- a/MPfm/MPfm.WPF/Classes/Windows/UpdateLibraryWindow.xaml.cs
+++ b/MPfm/MPfm.WPF/Classes/Windows/UpdateLibraryWindow.xaml.cs
@@ -21,12 +21,7 @@
 using System.Windows.Threading;
 using MPfm.Library.Objects;
 using MPfm.Library.UpdateLibrary;
-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
@@ -56,7 +51,7 @@ private void btnSaveLog_OnClick(object sender, RoutedEventArgs e)
 
         #region IUpdateLibraryView implementation
 
-        public Action<UpdateLibraryMode, List<string>, string> OnStartUpdateLibrary { get; set; }
+        public Action<List<string>, List<Folder>> OnStartUpdateLibrary { get; set; }
         public Action OnCancelUpdateLibrary { get; set; }
         public Action<string> OnSaveLog { get; set; }
 
diff --git a/MPfm/MPfm.WPF/MPfm.WPF.csproj b/MPfm/MPfm.WPF/MPfm.WPF.csproj
index aa7c2fba..0cb0b191 100644
--- a/MPfm/MPfm.WPF/MPfm.WPF.csproj
+++ b/MPfm/MPfm.WPF/MPfm.WPF.csproj
@@ -334,6 +334,9 @@
   <ItemGroup>
     <Resource Include="Resources\Images\Buttons\dropbox.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Icons\folder.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/Icons/folder.png b/MPfm/MPfm.WPF/Resources/Images/Icons/folder.png
new file mode 100644
index 00000000..b7329b3c
Binary files /dev/null and b/MPfm/MPfm.WPF/Resources/Images/Icons/folder.png differ