diff --git a/MediaBrowser.Api/SystemService.cs b/MediaBrowser.Api/SystemService.cs
index dae603dc89..23d64e89b5 100644
--- a/MediaBrowser.Api/SystemService.cs
+++ b/MediaBrowser.Api/SystemService.cs
@@ -124,9 +124,11 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public object Get(GetConfiguration request)
         {
-            var dateModified = _fileSystem.GetLastWriteTimeUtc(_configurationManager.ApplicationPaths.SystemConfigurationFilePath);
+            var configPath = _configurationManager.ApplicationPaths.SystemConfigurationFilePath;
 
-            var cacheKey = (_configurationManager.ApplicationPaths.SystemConfigurationFilePath + dateModified.Ticks).GetMD5();
+            var dateModified = _fileSystem.GetLastWriteTimeUtc(configPath);
+
+            var cacheKey = (configPath + dateModified.Ticks).GetMD5();
 
             return ToOptimizedResultUsingCache(cacheKey, dateModified, null, () => _configurationManager.Configuration);
         }
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
index 213942c9dc..668b1395d8 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
@@ -140,10 +140,6 @@ namespace MediaBrowser.Common.Implementations
             }
         }
 
-        /// <summary>
-        /// The _configuration directory path
-        /// </summary>
-        private string _configurationDirectoryPath;
         /// <summary>
         /// Gets the path to the application configuration root directory
         /// </summary>
@@ -152,12 +148,7 @@ namespace MediaBrowser.Common.Implementations
         {
             get
             {
-                if (_configurationDirectoryPath == null)
-                {
-                    _configurationDirectoryPath = Path.Combine(ProgramDataPath, "config");
-                    Directory.CreateDirectory(_configurationDirectoryPath);
-                }
-                return _configurationDirectoryPath;
+                return Path.Combine(ProgramDataPath, "config");
             }
         }
 
@@ -218,7 +209,7 @@ namespace MediaBrowser.Common.Implementations
         /// <returns>System.String.</returns>
         private string GetProgramDataPath()
         {
-            var programDataPath = _useDebugPath ? ConfigurationManager.AppSettings["DebugProgramDataPath"] : Path.Combine(ConfigurationManager.AppSettings["ReleaseProgramDataPath"], ConfigurationManager.AppSettings["ProgramDataFolderName"]);
+            var programDataPath = _useDebugPath ? ConfigurationManager.AppSettings["DebugProgramDataPath"] : ConfigurationManager.AppSettings["ReleaseProgramDataPath"];
 
             programDataPath = programDataPath.Replace("%ApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
 
diff --git a/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs b/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs
index 3c00673baa..8c4840ea71 100644
--- a/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs
+++ b/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs
@@ -99,9 +99,13 @@ namespace MediaBrowser.Common.Implementations.Configuration
         /// </summary>
         public void SaveConfiguration()
         {
+            var path = CommonApplicationPaths.SystemConfigurationFilePath;
+
+            Directory.CreateDirectory(Path.GetDirectoryName(path));
+
             lock (_configurationSaveLock)
             {
-                XmlSerializer.SerializeToFile(CommonConfiguration, CommonApplicationPaths.SystemConfigurationFilePath);
+                XmlSerializer.SerializeToFile(CommonConfiguration, path);
             }
 
             OnConfigurationUpdated();
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 2406d0470e..477dc4aee5 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -121,7 +121,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
             {
                 LazyInitializer.EnsureInitialized(ref _lastExecutionResult, ref _lastExecutionResultinitialized, ref _lastExecutionResultSyncLock, () =>
                 {
-                    var path = GetHistoryFilePath(false);
+                    var path = GetHistoryFilePath();
 
                     try
                     {
@@ -432,43 +432,28 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
         /// <summary>
         /// Gets the scheduled tasks configuration directory.
         /// </summary>
-        /// <param name="create">if set to <c>true</c> [create].</param>
         /// <returns>System.String.</returns>
-        private string GetScheduledTasksConfigurationDirectory(bool create)
+        private string GetScheduledTasksConfigurationDirectory()
         {
-            var path = Path.Combine(ApplicationPaths.ConfigurationDirectoryPath, "ScheduledTasks");
-
-            if (create)
-            {
-                Directory.CreateDirectory(path);
-            }
-
-            return path;
+            return Path.Combine(ApplicationPaths.ConfigurationDirectoryPath, "ScheduledTasks");
         }
 
         /// <summary>
         /// Gets the scheduled tasks data directory.
         /// </summary>
-        /// <param name="create">if set to <c>true</c> [create].</param>
         /// <returns>System.String.</returns>
-        private string GetScheduledTasksDataDirectory(bool create)
+        private string GetScheduledTasksDataDirectory()
         {
-            var path = Path.Combine(ApplicationPaths.DataPath, "ScheduledTasks");
-
-            if (create)
-            {
-                Directory.CreateDirectory(path);
-            }
-            return path;
+            return Path.Combine(ApplicationPaths.DataPath, "ScheduledTasks");
         }
 
         /// <summary>
         /// Gets the history file path.
         /// </summary>
         /// <value>The history file path.</value>
-        private string GetHistoryFilePath(bool createDirectory)
+        private string GetHistoryFilePath()
         {
-            return Path.Combine(GetScheduledTasksDataDirectory(createDirectory), Id + ".js");
+            return Path.Combine(GetScheduledTasksDataDirectory(), Id + ".js");
         }
 
         /// <summary>
@@ -477,7 +462,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
         /// <returns>System.String.</returns>
         private string GetConfigurationFilePath()
         {
-            return Path.Combine(GetScheduledTasksConfigurationDirectory(false), Id + ".js");
+            return Path.Combine(GetScheduledTasksConfigurationDirectory(), Id + ".js");
         }
 
         /// <summary>
@@ -512,9 +497,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
         {
             var path = GetConfigurationFilePath();
 
-            var parentPath = Path.GetDirectoryName(path);
-
-            Directory.CreateDirectory(parentPath);
+            Directory.CreateDirectory(Path.GetDirectoryName(path));
 
             JsonSerializer.SerializeToFile(triggers.Select(ScheduledTaskHelpers.GetTriggerInfo), path);
         }
@@ -545,7 +528,10 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
                 result.ErrorMessage = ex.Message;
             }
 
-            JsonSerializer.SerializeToFile(result, GetHistoryFilePath(true));
+            var path = GetHistoryFilePath();
+            Directory.CreateDirectory(Path.GetDirectoryName(path));
+
+            JsonSerializer.SerializeToFile(result, path);
 
             LastExecutionResult = result;
 
diff --git a/MediaBrowser.Common.Implementations/Security/MBLicenseFile.cs b/MediaBrowser.Common.Implementations/Security/MBLicenseFile.cs
index 163a368bfb..c5d5f28d60 100644
--- a/MediaBrowser.Common.Implementations/Security/MBLicenseFile.cs
+++ b/MediaBrowser.Common.Implementations/Security/MBLicenseFile.cs
@@ -11,7 +11,6 @@ namespace MediaBrowser.Common.Implementations.Security
     {
         private readonly IApplicationPaths _appPaths;
 
-        private readonly string _filename;
         public string RegKey
         {
             get { return _regKey; }
@@ -26,6 +25,14 @@ namespace MediaBrowser.Common.Implementations.Security
             }
         }
 
+        private string Filename
+        {
+            get
+            {
+                return Path.Combine(_appPaths.ConfigurationDirectoryPath, "mb.lic");
+            }
+        }
+
         public string LegacyKey { get; set; }
         private Dictionary<Guid, DateTime> UpdateRecords { get; set; }
         private readonly object _lck = new object();
@@ -35,8 +42,6 @@ namespace MediaBrowser.Common.Implementations.Security
         {
             _appPaths = appPaths;
 
-            _filename = Path.Combine(_appPaths.ConfigurationDirectoryPath, "mb.lic");
-
             UpdateRecords = new Dictionary<Guid, DateTime>();
             Load();
         }
@@ -64,15 +69,16 @@ namespace MediaBrowser.Common.Implementations.Security
         private void Load()
         {
             string[] contents = null;
+            var licenseFile = Filename;
             lock (_lck)
             {
                 try
                 {
-                    contents = File.ReadAllLines(_filename);
+                    contents = File.ReadAllLines(licenseFile);
                 }
                 catch (FileNotFoundException)
                 {
-                    (File.Create(_filename)).Close();
+                    (File.Create(licenseFile)).Close();
                 }
             }
             if (contents != null && contents.Length > 0)
@@ -100,7 +106,9 @@ namespace MediaBrowser.Common.Implementations.Security
                 lines.Add(pair.Value.Ticks.ToString());
             }
 
-            lock(_lck) File.WriteAllLines(_filename, lines);
+            var licenseFile = Filename;
+            Directory.CreateDirectory(Path.GetDirectoryName(licenseFile));
+            lock (_lck) File.WriteAllLines(licenseFile, lines);
         }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 0a935cd0de..466e709dd0 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -76,14 +76,6 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         private UserRootFolder _rootFolder;
         /// <summary>
-        /// The _user root folder initialized
-        /// </summary>
-        private bool _userRootFolderInitialized;
-        /// <summary>
-        /// The _user root folder sync lock
-        /// </summary>
-        private object _userRootFolderSyncLock = new object();
-        /// <summary>
         /// Gets the root folder.
         /// </summary>
         /// <value>The root folder.</value>
@@ -92,17 +84,11 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _rootFolder, ref _userRootFolderInitialized, ref _userRootFolderSyncLock, () => LibraryManager.GetUserRootFolder(RootFolderPath));
-                return _rootFolder;
+                return _rootFolder ?? (LibraryManager.GetUserRootFolder(RootFolderPath));
             }
             private set
             {
                 _rootFolder = value;
-
-                if (_rootFolder == null)
-                {
-                    _userRootFolderInitialized = false;
-                }
             }
         }
 
@@ -153,22 +139,6 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        /// <summary>
-        /// Gets the last date modified of the configuration
-        /// </summary>
-        /// <value>The configuration date last modified.</value>
-        [IgnoreDataMember]
-        public DateTime ConfigurationDateLastModified
-        {
-            get
-            {
-                // Ensure it's been lazy loaded
-                var config = Configuration;
-
-                return FileSystem.GetLastWriteTimeUtc(ConfigurationFilePath);
-            }
-        }
-
         /// <summary>
         /// Reloads the root media folder
         /// </summary>
@@ -203,13 +173,22 @@ namespace MediaBrowser.Controller.Entities
             {
                 // Move configuration
                 var newConfigDirectory = GetConfigurationDirectoryPath(newName);
+                var oldConfigurationDirectory = ConfigurationDirectoryPath;
 
                 // Exceptions will be thrown if these paths already exist
                 if (Directory.Exists(newConfigDirectory))
                 {
                     Directory.Delete(newConfigDirectory, true);
                 }
-                Directory.Move(ConfigurationDirectoryPath, newConfigDirectory);
+
+                if (Directory.Exists(oldConfigurationDirectory))
+                {
+                    Directory.Move(oldConfigurationDirectory, newConfigDirectory);
+                }
+                else
+                {
+                    Directory.CreateDirectory(newConfigDirectory);
+                }
 
                 var customLibraryPath = GetRootFolderPath(Name);
 
@@ -228,7 +207,6 @@ namespace MediaBrowser.Controller.Entities
             Name = newName;
 
             // Force these to be lazy loaded again
-            _configurationDirectoryPath = null;
             RootFolder = null;
 
             // Kick off a task to validate the media library
@@ -237,26 +215,16 @@ namespace MediaBrowser.Controller.Entities
             return RefreshMetadata(CancellationToken.None, forceSave: true, forceRefresh: true);
         }
 
-        /// <summary>
-        /// The _configuration directory path
-        /// </summary>
-        private string _configurationDirectoryPath;
         /// <summary>
         /// Gets the path to the user's configuration directory
         /// </summary>
         /// <value>The configuration directory path.</value>
+        [IgnoreDataMember]
         private string ConfigurationDirectoryPath
         {
             get
             {
-                if (_configurationDirectoryPath == null)
-                {
-                    _configurationDirectoryPath = GetConfigurationDirectoryPath(Name);
-
-                    Directory.CreateDirectory(_configurationDirectoryPath);
-                }
-
-                return _configurationDirectoryPath;
+                return GetConfigurationDirectoryPath(Name);
             }
         }
 
@@ -281,6 +249,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets the path to the user's configuration file
         /// </summary>
         /// <value>The configuration file path.</value>
+        [IgnoreDataMember]
         public string ConfigurationFilePath
         {
             get
@@ -294,7 +263,9 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         public void SaveConfiguration(IXmlSerializer serializer)
         {
-            serializer.SerializeToFile(Configuration, ConfigurationFilePath);
+            var xmlPath = ConfigurationFilePath;
+            Directory.CreateDirectory(System.IO.Path.GetDirectoryName(xmlPath));
+            serializer.SerializeToFile(Configuration, xmlPath);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Mono.userprefs b/MediaBrowser.Mono.userprefs
index 98959b10ad..3ca97e6bdd 100644
--- a/MediaBrowser.Mono.userprefs
+++ b/MediaBrowser.Mono.userprefs
@@ -2,10 +2,7 @@
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release Mono" />
   <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mono\app.config">
     <Files>
-      <File FileName="MediaBrowser.Server.Mono\app.config" Line="15" Column="3" />
-      <File FileName="MediaBrowser.Server.Mono\FFMpeg\FFMpegDownloadInfo.cs" Line="1" Column="1" />
-      <File FileName="MediaBrowser.Server.Mono\Program.cs" Line="1" Column="1" />
-      <File FileName="MediaBrowser.Server.Implementations\Library\UserManager.cs" Line="1" Column="1" />
+      <File FileName="MediaBrowser.Server.Mono\app.config" Line="1" Column="39" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs
index a2a4d5bbf4..8e07bc2667 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs
@@ -377,7 +377,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
                     if (!string.IsNullOrEmpty(genres))
                     {
-                        video.Genres = genres.Split(new[] { ';', '/' }, StringSplitOptions.RemoveEmptyEntries)
+                        video.Genres = genres.Split(new[] { ';', '/', ',' }, StringSplitOptions.RemoveEmptyEntries)
                             .Where(i => !string.IsNullOrWhiteSpace(i))
                             .Select(i => i.Trim())
                             .ToList();
diff --git a/MediaBrowser.Server.Mono/app.config b/MediaBrowser.Server.Mono/app.config
index 7a240c6dd7..c5abd3a20e 100644
--- a/MediaBrowser.Server.Mono/app.config
+++ b/MediaBrowser.Server.Mono/app.config
@@ -8,7 +8,6 @@
   </nlog>
   <appSettings>
     <add key="DebugProgramDataPath" value="ProgramData-Server" />
-    <add key="ReleaseProgramDataPath" value="" />
-    <add key="ProgramDataFolderName" value="ProgramData-Server" />
+    <add key="ReleaseProgramDataPath" value="ProgramData-Server" />
   </appSettings>
 </configuration>
diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config
index 217d3d2760..53788e09af 100644
--- a/MediaBrowser.ServerApplication/App.config
+++ b/MediaBrowser.ServerApplication/App.config
@@ -11,8 +11,7 @@
   </nlog>
   <appSettings>
     <add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
-    <add key="ReleaseProgramDataPath" value="%ApplicationData%" />
-    <add key="ProgramDataFolderName" value="MediaBrowser-Server" />
+    <add key="ReleaseProgramDataPath" value="%ApplicationData%\MediaBrowser-Server" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <startup useLegacyV2RuntimeActivationPolicy="true">
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 935067a336..514fbe6c1b 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -590,7 +590,8 @@ namespace MediaBrowser.ServerApplication
             {
                 return Directory.EnumerateFiles(ApplicationPaths.PluginsPath, "*.dll", SearchOption.TopDirectoryOnly)
                     .Select(LoadAssembly)
-                    .Where(a => a != null);
+                    .Where(a => a != null)
+                    .ToList();
             }
             catch (DirectoryNotFoundException)
             {
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 50d25de269..e11c8390f1 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -94,9 +94,6 @@
     <Content Include="dashboard-ui\css\images\clients\xbmc.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\images\editor.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\images\icons\audiocd.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -193,9 +190,6 @@
     <Content Include="dashboard-ui\css\images\editor\missingtrailer.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\images\remote.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\metadataeditor.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -208,9 +202,6 @@
     <Content Include="dashboard-ui\css\detailtable.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\images\bgflip.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\images\clients\chrome.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -289,9 +280,6 @@
     <Content Include="dashboard-ui\css\images\rotten.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\images\searchbutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\images\currentuserdefaultblack.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1486,11 +1474,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\css\images\toolswhite.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="dashboard-ui\css\images\rightarrow.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1573,11 +1556,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\css\images\bg.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="dashboard-ui\plugincatalog.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1586,21 +1564,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\css\images\leftarrowblack.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\css\images\leftarrowwhite.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\css\images\toolsblack.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="dashboard-ui\scheduledtasks.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1765,11 +1728,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\css\images\home.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="dashboard-ui\css\images\notifications\done.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>