From 46efa464d851d3f78b74ac02d061388115cf6d66 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 3 Nov 2016 21:18:51 -0400
Subject: move classes

---
 .../HttpServer/IHttpListener.cs                    |  46 ++++
 .../HttpServer/Security/AuthService.cs             | 246 +++++++++++++++++++++
 .../HttpServer/Security/AuthorizationContext.cs    | 195 ++++++++++++++++
 .../HttpServer/Security/SessionContext.cs          |  67 ++++++
 .../HttpServer/StreamWriter.cs                     | 127 +++++++++++
 5 files changed, 681 insertions(+)
 create mode 100644 Emby.Server.Implementations/HttpServer/IHttpListener.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/Security/AuthService.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/StreamWriter.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/HttpServer/IHttpListener.cs b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
new file mode 100644
index 000000000..9f96a8e49
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
@@ -0,0 +1,46 @@
+using MediaBrowser.Controller.Net;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    public interface IHttpListener : IDisposable
+    {
+        /// <summary>
+        /// Gets or sets the error handler.
+        /// </summary>
+        /// <value>The error handler.</value>
+        Action<Exception, IRequest> ErrorHandler { get; set; }
+
+        /// <summary>
+        /// Gets or sets the request handler.
+        /// </summary>
+        /// <value>The request handler.</value>
+        Func<IHttpRequest, Uri, Task> RequestHandler { get; set; }
+
+        /// <summary>
+        /// Gets or sets the web socket handler.
+        /// </summary>
+        /// <value>The web socket handler.</value>
+        Action<WebSocketConnectEventArgs> WebSocketConnected { get; set; }
+
+        /// <summary>
+        /// Gets or sets the web socket connecting.
+        /// </summary>
+        /// <value>The web socket connecting.</value>
+        Action<WebSocketConnectingEventArgs> WebSocketConnecting { get; set; }
+        
+        /// <summary>
+        /// Starts this instance.
+        /// </summary>
+        /// <param name="urlPrefixes">The URL prefixes.</param>
+        void Start(IEnumerable<string> urlPrefixes);
+
+        /// <summary>
+        /// Stops this instance.
+        /// </summary>
+        void Stop();
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
new file mode 100644
index 000000000..4d00c9b19
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -0,0 +1,246 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Connect;
+using MediaBrowser.Controller.Devices;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Controller.Session;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Emby.Server.Implementations.HttpServer.Security
+{
+    public class AuthService : IAuthService
+    {
+        private readonly IServerConfigurationManager _config;
+
+        public AuthService(IUserManager userManager, IAuthorizationContext authorizationContext, IServerConfigurationManager config, IConnectManager connectManager, ISessionManager sessionManager, IDeviceManager deviceManager)
+        {
+            AuthorizationContext = authorizationContext;
+            _config = config;
+            DeviceManager = deviceManager;
+            SessionManager = sessionManager;
+            ConnectManager = connectManager;
+            UserManager = userManager;
+        }
+
+        public IUserManager UserManager { get; private set; }
+        public IAuthorizationContext AuthorizationContext { get; private set; }
+        public IConnectManager ConnectManager { get; private set; }
+        public ISessionManager SessionManager { get; private set; }
+        public IDeviceManager DeviceManager { get; private set; }
+
+        /// <summary>
+        /// Redirect the client to a specific URL if authentication failed.
+        /// If this property is null, simply `401 Unauthorized` is returned.
+        /// </summary>
+        public string HtmlRedirect { get; set; }
+
+        public void Authenticate(IServiceRequest request,
+            IAuthenticationAttributes authAttribtues)
+        {
+            ValidateUser(request, authAttribtues);
+        }
+
+        private void ValidateUser(IServiceRequest request,
+            IAuthenticationAttributes authAttribtues)
+        {
+            // This code is executed before the service
+            var auth = AuthorizationContext.GetAuthorizationInfo(request);
+
+            if (!IsExemptFromAuthenticationToken(auth, authAttribtues))
+            {
+                var valid = IsValidConnectKey(auth.Token);
+
+                if (!valid)
+                {
+                    ValidateSecurityToken(request, auth.Token);
+                }
+            }
+
+            var user = string.IsNullOrWhiteSpace(auth.UserId)
+                ? null
+                : UserManager.GetUserById(auth.UserId);
+
+            if (user == null & !string.IsNullOrWhiteSpace(auth.UserId))
+            {
+                throw new SecurityException("User with Id " + auth.UserId + " not found");
+            }
+
+            if (user != null)
+            {
+                ValidateUserAccess(user, request, authAttribtues, auth);
+            }
+
+            var info = GetTokenInfo(request);
+
+            if (!IsExemptFromRoles(auth, authAttribtues, info))
+            {
+                var roles = authAttribtues.GetRoles().ToList();
+
+                ValidateRoles(roles, user);
+            }
+
+            if (!string.IsNullOrWhiteSpace(auth.DeviceId) &&
+                !string.IsNullOrWhiteSpace(auth.Client) &&
+                !string.IsNullOrWhiteSpace(auth.Device))
+            {
+                SessionManager.LogSessionActivity(auth.Client,
+                    auth.Version,
+                    auth.DeviceId,
+                    auth.Device,
+                    request.RemoteIp,
+                    user);
+            }
+        }
+
+        private void ValidateUserAccess(User user, IServiceRequest request,
+            IAuthenticationAttributes authAttribtues,
+            AuthorizationInfo auth)
+        {
+            if (user.Policy.IsDisabled)
+            {
+                throw new SecurityException("User account has been disabled.")
+                {
+                    SecurityExceptionType = SecurityExceptionType.Unauthenticated
+                };
+            }
+
+            if (!user.Policy.IsAdministrator &&
+                !authAttribtues.EscapeParentalControl &&
+                !user.IsParentalScheduleAllowed())
+            {
+                request.AddResponseHeader("X-Application-Error-Code", "ParentalControl");
+
+                throw new SecurityException("This user account is not allowed access at this time.")
+                {
+                    SecurityExceptionType = SecurityExceptionType.ParentalControl
+                };
+            }
+
+            if (!string.IsNullOrWhiteSpace(auth.DeviceId))
+            {
+                if (!DeviceManager.CanAccessDevice(user.Id.ToString("N"), auth.DeviceId))
+                {
+                    throw new SecurityException("User is not allowed access from this device.")
+                    {
+                        SecurityExceptionType = SecurityExceptionType.ParentalControl
+                    };
+                }
+            }
+        }
+
+        private bool IsExemptFromAuthenticationToken(AuthorizationInfo auth, IAuthenticationAttributes authAttribtues)
+        {
+            if (!_config.Configuration.IsStartupWizardCompleted && authAttribtues.AllowBeforeStartupWizard)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool IsExemptFromRoles(AuthorizationInfo auth, IAuthenticationAttributes authAttribtues, AuthenticationInfo tokenInfo)
+        {
+            if (!_config.Configuration.IsStartupWizardCompleted && authAttribtues.AllowBeforeStartupWizard)
+            {
+                return true;
+            }
+
+            if (string.IsNullOrWhiteSpace(auth.Token))
+            {
+                return true;
+            }
+
+            if (tokenInfo != null && string.IsNullOrWhiteSpace(tokenInfo.UserId))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private void ValidateRoles(List<string> roles, User user)
+        {
+            if (roles.Contains("admin", StringComparer.OrdinalIgnoreCase))
+            {
+                if (user == null || !user.Policy.IsAdministrator)
+                {
+                    throw new SecurityException("User does not have admin access.")
+                    {
+                        SecurityExceptionType = SecurityExceptionType.Unauthenticated
+                    };
+                }
+            }
+            if (roles.Contains("delete", StringComparer.OrdinalIgnoreCase))
+            {
+                if (user == null || !user.Policy.EnableContentDeletion)
+                {
+                    throw new SecurityException("User does not have delete access.")
+                    {
+                        SecurityExceptionType = SecurityExceptionType.Unauthenticated
+                    };
+                }
+            }
+            if (roles.Contains("download", StringComparer.OrdinalIgnoreCase))
+            {
+                if (user == null || !user.Policy.EnableContentDownloading)
+                {
+                    throw new SecurityException("User does not have download access.")
+                    {
+                        SecurityExceptionType = SecurityExceptionType.Unauthenticated
+                    };
+                }
+            }
+        }
+
+        private AuthenticationInfo GetTokenInfo(IServiceRequest request)
+        {
+            object info;
+            request.Items.TryGetValue("OriginalAuthenticationInfo", out info);
+            return info as AuthenticationInfo;
+        }
+
+        private bool IsValidConnectKey(string token)
+        {
+            if (string.IsNullOrEmpty(token))
+            {
+                return false;
+            }
+
+            return ConnectManager.IsAuthorizationTokenValid(token);
+        }
+
+        private void ValidateSecurityToken(IServiceRequest request, string token)
+        {
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                throw new SecurityException("Access token is required.");
+            }
+
+            var info = GetTokenInfo(request);
+
+            if (info == null)
+            {
+                throw new SecurityException("Access token is invalid or expired.");
+            }
+
+            if (!info.IsActive)
+            {
+                throw new SecurityException("Access token has expired.");
+            }
+
+            //if (!string.IsNullOrWhiteSpace(info.UserId))
+            //{
+            //    var user = _userManager.GetUserById(info.UserId);
+
+            //    if (user == null || user.Configuration.IsDisabled)
+            //    {
+            //        throw new SecurityException("User account has been disabled.");
+            //    }
+            //}
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
new file mode 100644
index 000000000..ec3dfeb60
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -0,0 +1,195 @@
+using MediaBrowser.Controller.Connect;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Security;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer.Security
+{
+    public class AuthorizationContext : IAuthorizationContext
+    {
+        private readonly IAuthenticationRepository _authRepo;
+        private readonly IConnectManager _connectManager;
+
+        public AuthorizationContext(IAuthenticationRepository authRepo, IConnectManager connectManager)
+        {
+            _authRepo = authRepo;
+            _connectManager = connectManager;
+        }
+
+        public AuthorizationInfo GetAuthorizationInfo(object requestContext)
+        {
+            var req = new ServiceRequest((IRequest)requestContext);
+            return GetAuthorizationInfo(req);
+        }
+
+        public AuthorizationInfo GetAuthorizationInfo(IServiceRequest requestContext)
+        {
+            object cached;
+            if (requestContext.Items.TryGetValue("AuthorizationInfo", out cached))
+            {
+                return (AuthorizationInfo)cached;
+            }
+
+            return GetAuthorization(requestContext);
+        }
+
+        /// <summary>
+        /// Gets the authorization.
+        /// </summary>
+        /// <param name="httpReq">The HTTP req.</param>
+        /// <returns>Dictionary{System.StringSystem.String}.</returns>
+        private AuthorizationInfo GetAuthorization(IServiceRequest httpReq)
+        {
+            var auth = GetAuthorizationDictionary(httpReq);
+
+            string deviceId = null;
+            string device = null;
+            string client = null;
+            string version = null;
+
+            if (auth != null)
+            {
+                auth.TryGetValue("DeviceId", out deviceId);
+                auth.TryGetValue("Device", out device);
+                auth.TryGetValue("Client", out client);
+                auth.TryGetValue("Version", out version);
+            }
+
+            var token = httpReq.Headers["X-Emby-Token"];
+
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                token = httpReq.Headers["X-MediaBrowser-Token"];
+            }
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                token = httpReq.QueryString["api_key"];
+            }
+
+            var info = new AuthorizationInfo
+            {
+                Client = client,
+                Device = device,
+                DeviceId = deviceId,
+                Version = version,
+                Token = token
+            };
+
+            if (!string.IsNullOrWhiteSpace(token))
+            {
+                var result = _authRepo.Get(new AuthenticationInfoQuery
+                {
+                    AccessToken = token
+                });
+
+                var tokenInfo = result.Items.FirstOrDefault();
+
+                if (tokenInfo != null)
+                {
+                    info.UserId = tokenInfo.UserId;
+
+                    // TODO: Remove these checks for IsNullOrWhiteSpace
+                    if (string.IsNullOrWhiteSpace(info.Client))
+                    {
+                        info.Client = tokenInfo.AppName;
+                    }
+                    if (string.IsNullOrWhiteSpace(info.Device))
+                    {
+                        info.Device = tokenInfo.DeviceName;
+                    }
+                    if (string.IsNullOrWhiteSpace(info.DeviceId))
+                    {
+                        info.DeviceId = tokenInfo.DeviceId;
+                    }
+                    if (string.IsNullOrWhiteSpace(info.Version))
+                    {
+                        info.Version = tokenInfo.AppVersion;
+                    }
+                }
+                else
+                {
+                    var user = _connectManager.GetUserFromExchangeToken(token);
+                    if (user != null)
+                    {
+                        info.UserId = user.Id.ToString("N");
+                    }
+                }
+                httpReq.Items["OriginalAuthenticationInfo"] = tokenInfo;
+            }
+
+            httpReq.Items["AuthorizationInfo"] = info;
+
+            return info;
+        }
+
+        /// <summary>
+        /// Gets the auth.
+        /// </summary>
+        /// <param name="httpReq">The HTTP req.</param>
+        /// <returns>Dictionary{System.StringSystem.String}.</returns>
+        private Dictionary<string, string> GetAuthorizationDictionary(IServiceRequest httpReq)
+        {
+            var auth = httpReq.Headers["X-Emby-Authorization"];
+
+            if (string.IsNullOrWhiteSpace(auth))
+            {
+                auth = httpReq.Headers["Authorization"];
+            }
+
+            return GetAuthorization(auth);
+        }
+
+        /// <summary>
+        /// Gets the authorization.
+        /// </summary>
+        /// <param name="authorizationHeader">The authorization header.</param>
+        /// <returns>Dictionary{System.StringSystem.String}.</returns>
+        private Dictionary<string, string> GetAuthorization(string authorizationHeader)
+        {
+            if (authorizationHeader == null) return null;
+
+            var parts = authorizationHeader.Split(new[] { ' ' }, 2);
+
+            // There should be at least to parts
+            if (parts.Length != 2) return null;
+
+            // It has to be a digest request
+            if (!string.Equals(parts[0], "MediaBrowser", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Remove uptil the first space
+            authorizationHeader = parts[1];
+            parts = authorizationHeader.Split(',');
+
+            var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var item in parts)
+            {
+                var param = item.Trim().Split(new[] { '=' }, 2);
+
+                if (param.Length == 2)
+                {
+					var value = NormalizeValue (param[1].Trim(new[] { '"' }));
+                    result.Add(param[0], value);
+                }
+            }
+
+            return result;
+        }
+
+		private string NormalizeValue(string value)
+		{
+			if (string.IsNullOrWhiteSpace (value)) 
+			{
+				return value;
+			}
+
+			return System.Net.WebUtility.HtmlEncode(value);
+		}
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
new file mode 100644
index 000000000..33dd4e2d7
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -0,0 +1,67 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Controller.Session;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer.Security
+{
+    public class SessionContext : ISessionContext
+    {
+        private readonly IUserManager _userManager;
+        private readonly ISessionManager _sessionManager;
+        private readonly IAuthorizationContext _authContext;
+
+        public SessionContext(IUserManager userManager, IAuthorizationContext authContext, ISessionManager sessionManager)
+        {
+            _userManager = userManager;
+            _authContext = authContext;
+            _sessionManager = sessionManager;
+        }
+
+        public Task<SessionInfo> GetSession(IServiceRequest requestContext)
+        {
+            var authorization = _authContext.GetAuthorizationInfo(requestContext);
+
+            //if (!string.IsNullOrWhiteSpace(authorization.Token))
+            //{
+            //    var auth = GetTokenInfo(requestContext);
+            //    if (auth != null)
+            //    {
+            //        return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
+            //    }
+            //}
+
+            var user = string.IsNullOrWhiteSpace(authorization.UserId) ? null : _userManager.GetUserById(authorization.UserId);
+            return _sessionManager.LogSessionActivity(authorization.Client, authorization.Version, authorization.DeviceId, authorization.Device, requestContext.RemoteIp, user);
+        }
+
+        private AuthenticationInfo GetTokenInfo(IServiceRequest request)
+        {
+            object info;
+            request.Items.TryGetValue("OriginalAuthenticationInfo", out info);
+            return info as AuthenticationInfo;
+        }
+
+        public Task<SessionInfo> GetSession(object requestContext)
+        {
+            var req = new ServiceRequest((IRequest)requestContext);
+            return GetSession(req);
+        }
+
+        public async Task<User> GetUser(IServiceRequest requestContext)
+        {
+            var session = await GetSession(requestContext).ConfigureAwait(false);
+
+            return session == null || !session.UserId.HasValue ? null : _userManager.GetUserById(session.UserId.Value);
+        }
+
+        public Task<User> GetUser(object requestContext)
+        {
+            var req = new ServiceRequest((IRequest)requestContext);
+            return GetUser(req);
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/StreamWriter.cs b/Emby.Server.Implementations/HttpServer/StreamWriter.cs
new file mode 100644
index 000000000..15488abaa
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/StreamWriter.cs
@@ -0,0 +1,127 @@
+using MediaBrowser.Model.Logging;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    /// <summary>
+    /// Class StreamWriter
+    /// </summary>
+    public class StreamWriter : IAsyncStreamWriter, IHasHeaders
+    {
+        private ILogger Logger { get; set; }
+
+        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
+        /// <summary>
+        /// Gets or sets the source stream.
+        /// </summary>
+        /// <value>The source stream.</value>
+        private Stream SourceStream { get; set; }
+
+        /// <summary>
+        /// The _options
+        /// </summary>
+        private readonly IDictionary<string, string> _options = new Dictionary<string, string>();
+        /// <summary>
+        /// Gets the options.
+        /// </summary>
+        /// <value>The options.</value>
+        public IDictionary<string, string> Headers
+        {
+            get { return _options; }
+        }
+
+        public Action OnComplete { get; set; }
+        public Action OnError { get; set; }
+        private readonly byte[] _bytes;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamWriter" /> class.
+        /// </summary>
+        /// <param name="source">The source.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <param name="logger">The logger.</param>
+        public StreamWriter(Stream source, string contentType, ILogger logger)
+        {
+            if (string.IsNullOrEmpty(contentType))
+            {
+                throw new ArgumentNullException("contentType");
+            }
+
+            SourceStream = source;
+            Logger = logger;
+
+            Headers["Content-Type"] = contentType;
+
+            if (source.CanSeek)
+            {
+                Headers["Content-Length"] = source.Length.ToString(UsCulture);
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamWriter"/> class.
+        /// </summary>
+        /// <param name="source">The source.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <param name="logger">The logger.</param>
+        public StreamWriter(byte[] source, string contentType, ILogger logger)
+            : this(new MemoryStream(source), contentType, logger)
+        {
+            if (string.IsNullOrEmpty(contentType))
+            {
+                throw new ArgumentNullException("contentType");
+            }
+
+            _bytes = source;
+            Logger = logger;
+
+            Headers["Content-Type"] = contentType;
+
+            Headers["Content-Length"] = source.Length.ToString(UsCulture);
+        }
+
+        public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
+        {
+            try
+            {
+                if (_bytes != null)
+                {
+                    await responseStream.WriteAsync(_bytes, 0, _bytes.Length);
+                }
+                else
+                {
+                    using (var src = SourceStream)
+                    {
+                        await src.CopyToAsync(responseStream).ConfigureAwait(false);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error streaming data", ex);
+
+                if (OnError != null)
+                {
+                    OnError();
+                }
+
+                throw;
+            }
+            finally
+            {
+                if (OnComplete != null)
+                {
+                    OnComplete();
+                }
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From 3c1447804b5de9a7d840c7158c3cb4e0a27f76e1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 4 Nov 2016 22:17:18 -0400
Subject: move localization classes

---
 Emby.Dlna/Didl/DidlBuilder.cs                      |   8 +-
 .../Emby.Server.Implementations.csproj             | 246 +++++-
 .../HttpServer/GetSwaggerResource.cs               |  17 +
 .../HttpServer/SocketSharp/HttpUtility.cs          | 922 ++++++++++++++++++++
 .../HttpServer/SwaggerService.cs                   |  46 +
 .../Localization/Core/ar.json                      | 178 ++++
 .../Localization/Core/bg-BG.json                   | 178 ++++
 .../Localization/Core/ca.json                      | 178 ++++
 .../Localization/Core/core.json                    | 179 ++++
 .../Localization/Core/cs.json                      | 178 ++++
 .../Localization/Core/da.json                      | 178 ++++
 .../Localization/Core/de.json                      | 178 ++++
 .../Localization/Core/el.json                      | 178 ++++
 .../Localization/Core/en-GB.json                   | 178 ++++
 .../Localization/Core/en-US.json                   | 178 ++++
 .../Localization/Core/es-AR.json                   | 178 ++++
 .../Localization/Core/es-MX.json                   | 178 ++++
 .../Localization/Core/es.json                      | 178 ++++
 .../Localization/Core/fi.json                      | 178 ++++
 .../Localization/Core/fr-CA.json                   | 178 ++++
 .../Localization/Core/fr.json                      | 178 ++++
 .../Localization/Core/gsw.json                     | 178 ++++
 .../Localization/Core/he.json                      | 178 ++++
 .../Localization/Core/hr.json                      | 178 ++++
 .../Localization/Core/hu.json                      | 178 ++++
 .../Localization/Core/id.json                      | 178 ++++
 .../Localization/Core/it.json                      | 178 ++++
 .../Localization/Core/kk.json                      | 178 ++++
 .../Localization/Core/ko.json                      | 178 ++++
 .../Localization/Core/ms.json                      | 178 ++++
 .../Localization/Core/nb.json                      | 178 ++++
 .../Localization/Core/nl.json                      | 178 ++++
 .../Localization/Core/pl.json                      | 178 ++++
 .../Localization/Core/pt-BR.json                   | 178 ++++
 .../Localization/Core/pt-PT.json                   | 178 ++++
 .../Localization/Core/ro.json                      | 178 ++++
 .../Localization/Core/ru.json                      | 178 ++++
 .../Localization/Core/sl-SI.json                   | 178 ++++
 .../Localization/Core/sv.json                      | 178 ++++
 .../Localization/Core/tr.json                      | 178 ++++
 .../Localization/Core/uk.json                      | 178 ++++
 .../Localization/Core/vi.json                      | 178 ++++
 .../Localization/Core/zh-CN.json                   | 178 ++++
 .../Localization/Core/zh-HK.json                   | 178 ++++
 .../Localization/Core/zh-TW.json                   | 178 ++++
 .../Localization/LocalizationManager.cs            | 433 ++++++++++
 .../Localization/Ratings/au.txt                    |   8 +
 .../Localization/Ratings/be.txt                    |   6 +
 .../Localization/Ratings/br.txt                    |   6 +
 .../Localization/Ratings/ca.txt                    |   6 +
 .../Localization/Ratings/co.txt                    |   8 +
 .../Localization/Ratings/de.txt                    |  10 +
 .../Localization/Ratings/dk.txt                    |   4 +
 .../Localization/Ratings/fr.txt                    |   5 +
 .../Localization/Ratings/gb.txt                    |   7 +
 .../Localization/Ratings/ie.txt                    |   6 +
 .../Localization/Ratings/jp.txt                    |   4 +
 .../Localization/Ratings/kz.txt                    |   6 +
 .../Localization/Ratings/mx.txt                    |   6 +
 .../Localization/Ratings/nl.txt                    |   6 +
 .../Localization/Ratings/nz.txt                    |  10 +
 .../Localization/Ratings/ru.txt                    |   5 +
 .../Localization/Ratings/us.txt                    |  22 +
 .../Localization/countries.json                    |   1 +
 .../Localization/iso6392.txt                       | 487 +++++++++++
 .../HttpServer/GetSwaggerResource.cs               |  17 -
 .../HttpServer/HttpListenerHost.cs                 |   1 +
 .../HttpServer/SocketSharp/HttpUtility.cs          | 942 ---------------------
 .../SocketSharp/WebSocketSharpRequest.cs           |   1 +
 .../HttpServer/SwaggerService.cs                   |  43 -
 .../Localization/Core/ar.json                      | 178 ----
 .../Localization/Core/bg-BG.json                   | 178 ----
 .../Localization/Core/ca.json                      | 178 ----
 .../Localization/Core/core.json                    | 179 ----
 .../Localization/Core/cs.json                      | 178 ----
 .../Localization/Core/da.json                      | 178 ----
 .../Localization/Core/de.json                      | 178 ----
 .../Localization/Core/el.json                      | 178 ----
 .../Localization/Core/en-GB.json                   | 178 ----
 .../Localization/Core/en-US.json                   | 178 ----
 .../Localization/Core/es-AR.json                   | 178 ----
 .../Localization/Core/es-MX.json                   | 178 ----
 .../Localization/Core/es.json                      | 178 ----
 .../Localization/Core/fi.json                      | 178 ----
 .../Localization/Core/fr-CA.json                   | 178 ----
 .../Localization/Core/fr.json                      | 178 ----
 .../Localization/Core/gsw.json                     | 178 ----
 .../Localization/Core/he.json                      | 178 ----
 .../Localization/Core/hr.json                      | 178 ----
 .../Localization/Core/hu.json                      | 178 ----
 .../Localization/Core/id.json                      | 178 ----
 .../Localization/Core/it.json                      | 178 ----
 .../Localization/Core/kk.json                      | 178 ----
 .../Localization/Core/ko.json                      | 178 ----
 .../Localization/Core/ms.json                      | 178 ----
 .../Localization/Core/nb.json                      | 178 ----
 .../Localization/Core/nl.json                      | 178 ----
 .../Localization/Core/pl.json                      | 178 ----
 .../Localization/Core/pt-BR.json                   | 178 ----
 .../Localization/Core/pt-PT.json                   | 178 ----
 .../Localization/Core/ro.json                      | 178 ----
 .../Localization/Core/ru.json                      | 178 ----
 .../Localization/Core/sl-SI.json                   | 178 ----
 .../Localization/Core/sv.json                      | 178 ----
 .../Localization/Core/tr.json                      | 178 ----
 .../Localization/Core/uk.json                      | 178 ----
 .../Localization/Core/vi.json                      | 178 ----
 .../Localization/Core/zh-CN.json                   | 178 ----
 .../Localization/Core/zh-HK.json                   | 178 ----
 .../Localization/Core/zh-TW.json                   | 178 ----
 .../Localization/LocalizationManager.cs            | 422 ---------
 .../Localization/Ratings/au.txt                    |   8 -
 .../Localization/Ratings/be.txt                    |   6 -
 .../Localization/Ratings/br.txt                    |   6 -
 .../Localization/Ratings/ca.txt                    |   6 -
 .../Localization/Ratings/co.txt                    |   8 -
 .../Localization/Ratings/de.txt                    |  10 -
 .../Localization/Ratings/dk.txt                    |   4 -
 .../Localization/Ratings/fr.txt                    |   5 -
 .../Localization/Ratings/gb.txt                    |   7 -
 .../Localization/Ratings/ie.txt                    |   6 -
 .../Localization/Ratings/jp.txt                    |   4 -
 .../Localization/Ratings/kz.txt                    |   6 -
 .../Localization/Ratings/mx.txt                    |   6 -
 .../Localization/Ratings/nl.txt                    |   6 -
 .../Localization/Ratings/nz.txt                    |  10 -
 .../Localization/Ratings/ru.txt                    |   5 -
 .../Localization/Ratings/us.txt                    |  22 -
 .../Localization/countries.json                    |   1 -
 .../Localization/iso6392.txt                       | 487 -----------
 .../MediaBrowser.Server.Implementations.csproj     | 209 -----
 .../ApplicationHost.cs                             |   9 +-
 .../MediaBrowser.Server.Startup.Common.csproj      |   1 +
 .../TextLocalizer.cs                               |  25 +
 134 files changed, 9434 insertions(+), 9376 deletions(-)
 create mode 100644 Emby.Server.Implementations/HttpServer/GetSwaggerResource.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/SwaggerService.cs
 create mode 100644 Emby.Server.Implementations/Localization/Core/ar.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/bg-BG.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/ca.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/core.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/cs.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/da.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/de.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/el.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/en-GB.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/en-US.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/es-AR.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/es-MX.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/es.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/fi.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/fr-CA.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/fr.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/gsw.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/he.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/hr.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/hu.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/id.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/it.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/kk.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/ko.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/ms.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/nb.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/nl.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/pl.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/pt-BR.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/pt-PT.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/ro.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/ru.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/sl-SI.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/sv.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/tr.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/uk.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/vi.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/zh-CN.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/zh-HK.json
 create mode 100644 Emby.Server.Implementations/Localization/Core/zh-TW.json
 create mode 100644 Emby.Server.Implementations/Localization/LocalizationManager.cs
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/au.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/be.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/br.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/ca.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/co.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/de.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/dk.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/fr.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/gb.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/ie.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/jp.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/kz.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/mx.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/nl.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/nz.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/ru.txt
 create mode 100644 Emby.Server.Implementations/Localization/Ratings/us.txt
 create mode 100644 Emby.Server.Implementations/Localization/countries.json
 create mode 100644 Emby.Server.Implementations/Localization/iso6392.txt
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/ar.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/bg-BG.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/ca.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/core.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/cs.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/da.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/de.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/el.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/en-GB.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/en-US.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/es-AR.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/es-MX.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/es.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/fi.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/fr-CA.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/fr.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/gsw.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/he.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/hr.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/hu.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/id.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/it.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/kk.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/ko.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/ms.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/nb.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/nl.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/pl.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/pt-BR.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/pt-PT.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/ro.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/ru.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/sl-SI.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/sv.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/tr.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/uk.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/vi.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/zh-CN.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/zh-HK.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Core/zh-TW.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/au.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/be.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/br.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/ca.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/co.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/de.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/dk.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/fr.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/gb.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/ie.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/jp.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/kz.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/mx.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/nl.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/nz.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/ru.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/Ratings/us.txt
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/countries.json
 delete mode 100644 MediaBrowser.Server.Implementations/Localization/iso6392.txt
 create mode 100644 MediaBrowser.Server.Startup.Common/TextLocalizer.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
index 50668f555..ee5c8fecd 100644
--- a/Emby.Dlna/Didl/DidlBuilder.cs
+++ b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -104,6 +104,8 @@ namespace Emby.Dlna.Didl
 
             writer.WriteStartElement(string.Empty, "item", NS_DIDL);
 
+            AddGeneralProperties(item, null, context, writer, filter);
+
             writer.WriteAttributeString("restricted", "1");
             writer.WriteAttributeString("id", clientId);
 
@@ -122,8 +124,6 @@ namespace Emby.Dlna.Didl
 
             //AddBookmarkInfo(item, user, element);
 
-            AddGeneralProperties(item, null, context, writer, filter);
-
             // refID?
             // storeAttribute(itemNode, object, ClassProperties.REF_ID, false);
 
@@ -501,6 +501,8 @@ namespace Emby.Dlna.Didl
         {
             writer.WriteStartElement(string.Empty, "container", NS_DIDL);
 
+            AddGeneralProperties(folder, stubType, context, writer, filter);
+
             writer.WriteAttributeString("restricted", "0");
             writer.WriteAttributeString("searchable", "1");
             writer.WriteAttributeString("childCount", childCount.ToString(_usCulture));
@@ -534,8 +536,6 @@ namespace Emby.Dlna.Didl
                 }
             }
 
-            AddCommonFields(folder, stubType, null, writer, filter);
-
             AddCover(folder, context, stubType, writer);
 
             writer.WriteEndElement();
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 8d13d206a..33f29d64d 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -67,11 +67,14 @@
     <Compile Include="FileOrganization\NameUtils.cs" />
     <Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
     <Compile Include="FileOrganization\TvFolderOrganizer.cs" />
+    <Compile Include="HttpServer\GetSwaggerResource.cs" />
+    <Compile Include="HttpServer\SocketSharp\HttpUtility.cs" />
     <Compile Include="HttpServer\IHttpListener.cs" />
     <Compile Include="HttpServer\Security\AuthorizationContext.cs" />
     <Compile Include="HttpServer\Security\AuthService.cs" />
     <Compile Include="HttpServer\Security\SessionContext.cs" />
     <Compile Include="HttpServer\StreamWriter.cs" />
+    <Compile Include="HttpServer\SwaggerService.cs" />
     <Compile Include="Images\BaseDynamicImageProvider.cs" />
     <Compile Include="Intros\DefaultIntroProvider.cs" />
     <Compile Include="IO\FileRefresher.cs" />
@@ -144,6 +147,7 @@
     <Compile Include="LiveTv\TunerHosts\M3UTunerHost.cs" />
     <Compile Include="LiveTv\TunerHosts\MulticastStream.cs" />
     <Compile Include="LiveTv\TunerHosts\QueueStream.cs" />
+    <Compile Include="Localization\LocalizationManager.cs" />
     <Compile Include="Logging\PatternsLogger.cs" />
     <Compile Include="MediaEncoder\EncodingManager.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
@@ -230,7 +234,9 @@
     <Compile Include="UserViews\CollectionFolderImageProvider.cs" />
     <Compile Include="UserViews\DynamicImageProvider.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\iso6392.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
       <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
@@ -266,8 +272,246 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-700.svg">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.svg</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-regular.svg">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.svg</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\images\explorer_icons.png">
+      <Link>swagger-ui\images\explorer_icons.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\images\logo_small.png">
+      <Link>swagger-ui\images\logo_small.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\images\pet_store_api.png">
+      <Link>swagger-ui\images\pet_store_api.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\images\throbber.gif">
+      <Link>swagger-ui\images\throbber.gif</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\images\wordnik_api.png">
+      <Link>swagger-ui\images\wordnik_api.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\index.html">
+      <Link>swagger-ui\index.html</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\backbone-min.js">
+      <Link>swagger-ui\lib\backbone-min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\handlebars-2.0.0.js">
+      <Link>swagger-ui\lib\handlebars-2.0.0.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\highlight.7.3.pack.js">
+      <Link>swagger-ui\lib\highlight.7.3.pack.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\jquery-1.8.0.min.js">
+      <Link>swagger-ui\lib\jquery-1.8.0.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\jquery.ba-bbq.min.js">
+      <Link>swagger-ui\lib\jquery.ba-bbq.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\jquery.slideto.min.js">
+      <Link>swagger-ui\lib\jquery.slideto.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\jquery.wiggle.min.js">
+      <Link>swagger-ui\lib\jquery.wiggle.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\marked.js">
+      <Link>swagger-ui\lib\marked.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\shred.bundle.js">
+      <Link>swagger-ui\lib\shred.bundle.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\shred\content.js">
+      <Link>swagger-ui\lib\shred\content.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\swagger-client.js">
+      <Link>swagger-ui\lib\swagger-client.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\swagger-oauth.js">
+      <Link>swagger-ui\lib\swagger-oauth.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\lib\underscore-min.js">
+      <Link>swagger-ui\lib\underscore-min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\o2c.html">
+      <Link>swagger-ui\o2c.html</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\patch.js">
+      <Link>swagger-ui\patch.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\swagger-ui.js">
+      <Link>swagger-ui\swagger-ui.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\swagger-ui.min.js">
+      <Link>swagger-ui\swagger-ui.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="Localization\Core\ar.json" />
+    <EmbeddedResource Include="Localization\Core\bg-BG.json" />
+    <EmbeddedResource Include="Localization\Core\ca.json" />
+    <EmbeddedResource Include="Localization\Core\core.json" />
+    <EmbeddedResource Include="Localization\Core\cs.json" />
+    <EmbeddedResource Include="Localization\Core\da.json" />
+    <EmbeddedResource Include="Localization\Core\de.json" />
+    <EmbeddedResource Include="Localization\Core\el.json" />
+    <EmbeddedResource Include="Localization\Core\en-GB.json" />
+    <EmbeddedResource Include="Localization\Core\en-US.json" />
+    <EmbeddedResource Include="Localization\Core\es-AR.json" />
+    <EmbeddedResource Include="Localization\Core\es-MX.json" />
+    <EmbeddedResource Include="Localization\Core\es.json" />
+    <EmbeddedResource Include="Localization\Core\fi.json" />
+    <EmbeddedResource Include="Localization\Core\fr-CA.json" />
+    <EmbeddedResource Include="Localization\Core\fr.json" />
+    <EmbeddedResource Include="Localization\Core\gsw.json" />
+    <EmbeddedResource Include="Localization\Core\he.json" />
+    <EmbeddedResource Include="Localization\Core\hr.json" />
+    <EmbeddedResource Include="Localization\Core\hu.json" />
+    <EmbeddedResource Include="Localization\Core\id.json" />
+    <EmbeddedResource Include="Localization\Core\it.json" />
+    <EmbeddedResource Include="Localization\Core\kk.json" />
+    <EmbeddedResource Include="Localization\Core\ko.json" />
+    <EmbeddedResource Include="Localization\Core\ms.json" />
+    <EmbeddedResource Include="Localization\Core\nb.json" />
+    <EmbeddedResource Include="Localization\Core\nl.json" />
+    <EmbeddedResource Include="Localization\Core\pl.json" />
+    <EmbeddedResource Include="Localization\Core\pt-BR.json" />
+    <EmbeddedResource Include="Localization\Core\pt-PT.json" />
+    <EmbeddedResource Include="Localization\Core\ro.json" />
+    <EmbeddedResource Include="Localization\Core\ru.json" />
+    <EmbeddedResource Include="Localization\Core\sl-SI.json" />
+    <EmbeddedResource Include="Localization\Core\sv.json" />
+    <EmbeddedResource Include="Localization\Core\tr.json" />
+    <EmbeddedResource Include="Localization\Core\uk.json" />
+    <EmbeddedResource Include="Localization\Core\vi.json" />
+    <EmbeddedResource Include="Localization\Core\zh-CN.json" />
+    <EmbeddedResource Include="Localization\Core\zh-HK.json" />
+    <EmbeddedResource Include="Localization\Core\zh-TW.json" />
+    <EmbeddedResource Include="Localization\countries.json" />
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-700.eot">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.eot</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-700.ttf">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.ttf</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-700.woff">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-700.woff2">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff2</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-regular.eot">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.eot</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-regular.ttf">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.ttf</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff2">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff2</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\au.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\be.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\br.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\ca.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\co.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\de.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\dk.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\fr.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\gb.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\ie.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\jp.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\kz.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\mx.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\nl.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\nz.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\ru.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\Ratings\us.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\css\reset.css">
+      <Link>swagger-ui\css\reset.css</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\css\screen.css">
+      <Link>swagger-ui\css\screen.css</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\thirdparty\servicestack\swagger-ui\css\typography.css">
+      <Link>swagger-ui\css\typography.css</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.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/Emby.Server.Implementations/HttpServer/GetSwaggerResource.cs b/Emby.Server.Implementations/HttpServer/GetSwaggerResource.cs
new file mode 100644
index 000000000..819ede1ab
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/GetSwaggerResource.cs
@@ -0,0 +1,17 @@
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    /// <summary>
+    /// Class GetDashboardResource
+    /// </summary>
+    [Route("/swagger-ui/{ResourceName*}", "GET")]
+    public class GetSwaggerResource
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string ResourceName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs
new file mode 100644
index 000000000..4fbe0ed94
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs
@@ -0,0 +1,922 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer.SocketSharp
+{
+    public static class MyHttpUtility
+    {
+        // Must be sorted
+        static readonly long[] entities = new long[] {
+			(long)'A' << 56 | (long)'E' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
+			(long)'A' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'A' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'A' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'A' << 56 | (long)'l' << 48 | (long)'p' << 40 | (long)'h' << 32 | (long)'a' << 24, 
+			(long)'A' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'g' << 24, 
+			(long)'A' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
+			(long)'A' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'B' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
+			(long)'C' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'d' << 32 | (long)'i' << 24 | (long)'l' << 16, 
+			(long)'C' << 56 | (long)'h' << 48 | (long)'i' << 40, 
+			(long)'D' << 56 | (long)'a' << 48 | (long)'g' << 40 | (long)'g' << 32 | (long)'e' << 24 | (long)'r' << 16, 
+			(long)'D' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'t' << 32 | (long)'a' << 24, 
+			(long)'E' << 56 | (long)'T' << 48 | (long)'H' << 40, 
+			(long)'E' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'E' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'E' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'E' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
+			(long)'E' << 56 | (long)'t' << 48 | (long)'a' << 40, 
+			(long)'E' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'G' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'m' << 32 | (long)'a' << 24, 
+			(long)'I' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'I' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'I' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'I' << 56 | (long)'o' << 48 | (long)'t' << 40 | (long)'a' << 32, 
+			(long)'I' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'K' << 56 | (long)'a' << 48 | (long)'p' << 40 | (long)'p' << 32 | (long)'a' << 24, 
+			(long)'L' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'b' << 32 | (long)'d' << 24 | (long)'a' << 16, 
+			(long)'M' << 56 | (long)'u' << 48, 
+			(long)'N' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
+			(long)'N' << 56 | (long)'u' << 48, 
+			(long)'O' << 56 | (long)'E' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
+			(long)'O' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'O' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'O' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'O' << 56 | (long)'m' << 48 | (long)'e' << 40 | (long)'g' << 32 | (long)'a' << 24, 
+			(long)'O' << 56 | (long)'m' << 48 | (long)'i' << 40 | (long)'c' << 32 | (long)'r' << 24 | (long)'o' << 16 | (long)'n' << 8, 
+			(long)'O' << 56 | (long)'s' << 48 | (long)'l' << 40 | (long)'a' << 32 | (long)'s' << 24 | (long)'h' << 16, 
+			(long)'O' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
+			(long)'O' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'P' << 56 | (long)'h' << 48 | (long)'i' << 40, 
+			(long)'P' << 56 | (long)'i' << 48, 
+			(long)'P' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'m' << 32 | (long)'e' << 24, 
+			(long)'P' << 56 | (long)'s' << 48 | (long)'i' << 40, 
+			(long)'R' << 56 | (long)'h' << 48 | (long)'o' << 40, 
+			(long)'S' << 56 | (long)'c' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'o' << 24 | (long)'n' << 16, 
+			(long)'S' << 56 | (long)'i' << 48 | (long)'g' << 40 | (long)'m' << 32 | (long)'a' << 24, 
+			(long)'T' << 56 | (long)'H' << 48 | (long)'O' << 40 | (long)'R' << 32 | (long)'N' << 24, 
+			(long)'T' << 56 | (long)'a' << 48 | (long)'u' << 40, 
+			(long)'T' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'t' << 32 | (long)'a' << 24, 
+			(long)'U' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'U' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'U' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'U' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
+			(long)'U' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'X' << 56 | (long)'i' << 48, 
+			(long)'Y' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'Y' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'Z' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
+			(long)'a' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'a' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'a' << 56 | (long)'c' << 48 | (long)'u' << 40 | (long)'t' << 32 | (long)'e' << 24, 
+			(long)'a' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
+			(long)'a' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'a' << 56 | (long)'l' << 48 | (long)'e' << 40 | (long)'f' << 32 | (long)'s' << 24 | (long)'y' << 16 | (long)'m' << 8, 
+			(long)'a' << 56 | (long)'l' << 48 | (long)'p' << 40 | (long)'h' << 32 | (long)'a' << 24, 
+			(long)'a' << 56 | (long)'m' << 48 | (long)'p' << 40, 
+			(long)'a' << 56 | (long)'n' << 48 | (long)'d' << 40, 
+			(long)'a' << 56 | (long)'n' << 48 | (long)'g' << 40, 
+			(long)'a' << 56 | (long)'p' << 48 | (long)'o' << 40 | (long)'s' << 32,
+			(long)'a' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'g' << 24, 
+			(long)'a' << 56 | (long)'s' << 48 | (long)'y' << 40 | (long)'m' << 32 | (long)'p' << 24, 
+			(long)'a' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
+			(long)'a' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'b' << 56 | (long)'d' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'b' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
+			(long)'b' << 56 | (long)'r' << 48 | (long)'v' << 40 | (long)'b' << 32 | (long)'a' << 24 | (long)'r' << 16, 
+			(long)'b' << 56 | (long)'u' << 48 | (long)'l' << 40 | (long)'l' << 32, 
+			(long)'c' << 56 | (long)'a' << 48 | (long)'p' << 40, 
+			(long)'c' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'d' << 32 | (long)'i' << 24 | (long)'l' << 16, 
+			(long)'c' << 56 | (long)'e' << 48 | (long)'d' << 40 | (long)'i' << 32 | (long)'l' << 24, 
+			(long)'c' << 56 | (long)'e' << 48 | (long)'n' << 40 | (long)'t' << 32, 
+			(long)'c' << 56 | (long)'h' << 48 | (long)'i' << 40, 
+			(long)'c' << 56 | (long)'i' << 48 | (long)'r' << 40 | (long)'c' << 32, 
+			(long)'c' << 56 | (long)'l' << 48 | (long)'u' << 40 | (long)'b' << 32 | (long)'s' << 24, 
+			(long)'c' << 56 | (long)'o' << 48 | (long)'n' << 40 | (long)'g' << 32, 
+			(long)'c' << 56 | (long)'o' << 48 | (long)'p' << 40 | (long)'y' << 32, 
+			(long)'c' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'r' << 24, 
+			(long)'c' << 56 | (long)'u' << 48 | (long)'p' << 40, 
+			(long)'c' << 56 | (long)'u' << 48 | (long)'r' << 40 | (long)'r' << 32 | (long)'e' << 24 | (long)'n' << 16, 
+			(long)'d' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'d' << 56 | (long)'a' << 48 | (long)'g' << 40 | (long)'g' << 32 | (long)'e' << 24 | (long)'r' << 16, 
+			(long)'d' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'d' << 56 | (long)'e' << 48 | (long)'g' << 40, 
+			(long)'d' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'t' << 32 | (long)'a' << 24, 
+			(long)'d' << 56 | (long)'i' << 48 | (long)'a' << 40 | (long)'m' << 32 | (long)'s' << 24, 
+			(long)'d' << 56 | (long)'i' << 48 | (long)'v' << 40 | (long)'i' << 32 | (long)'d' << 24 | (long)'e' << 16, 
+			(long)'e' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'e' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'e' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'e' << 56 | (long)'m' << 48 | (long)'p' << 40 | (long)'t' << 32 | (long)'y' << 24, 
+			(long)'e' << 56 | (long)'m' << 48 | (long)'s' << 40 | (long)'p' << 32, 
+			(long)'e' << 56 | (long)'n' << 48 | (long)'s' << 40 | (long)'p' << 32, 
+			(long)'e' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
+			(long)'e' << 56 | (long)'q' << 48 | (long)'u' << 40 | (long)'i' << 32 | (long)'v' << 24, 
+			(long)'e' << 56 | (long)'t' << 48 | (long)'a' << 40, 
+			(long)'e' << 56 | (long)'t' << 48 | (long)'h' << 40, 
+			(long)'e' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'e' << 56 | (long)'u' << 48 | (long)'r' << 40 | (long)'o' << 32, 
+			(long)'e' << 56 | (long)'x' << 48 | (long)'i' << 40 | (long)'s' << 32 | (long)'t' << 24, 
+			(long)'f' << 56 | (long)'n' << 48 | (long)'o' << 40 | (long)'f' << 32, 
+			(long)'f' << 56 | (long)'o' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'l' << 24 | (long)'l' << 16, 
+			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'c' << 32 | (long)'1' << 24 | (long)'2' << 16, 
+			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'c' << 32 | (long)'1' << 24 | (long)'4' << 16, 
+			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'c' << 32 | (long)'3' << 24 | (long)'4' << 16, 
+			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'s' << 32 | (long)'l' << 24, 
+			(long)'g' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'m' << 32 | (long)'a' << 24, 
+			(long)'g' << 56 | (long)'e' << 48, 
+			(long)'g' << 56 | (long)'t' << 48, 
+			(long)'h' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'h' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'h' << 56 | (long)'e' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'t' << 24 | (long)'s' << 16, 
+			(long)'h' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'l' << 32 | (long)'i' << 24 | (long)'p' << 16, 
+			(long)'i' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'i' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'i' << 56 | (long)'e' << 48 | (long)'x' << 40 | (long)'c' << 32 | (long)'l' << 24, 
+			(long)'i' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'i' << 56 | (long)'m' << 48 | (long)'a' << 40 | (long)'g' << 32 | (long)'e' << 24, 
+			(long)'i' << 56 | (long)'n' << 48 | (long)'f' << 40 | (long)'i' << 32 | (long)'n' << 24, 
+			(long)'i' << 56 | (long)'n' << 48 | (long)'t' << 40, 
+			(long)'i' << 56 | (long)'o' << 48 | (long)'t' << 40 | (long)'a' << 32, 
+			(long)'i' << 56 | (long)'q' << 48 | (long)'u' << 40 | (long)'e' << 32 | (long)'s' << 24 | (long)'t' << 16, 
+			(long)'i' << 56 | (long)'s' << 48 | (long)'i' << 40 | (long)'n' << 32, 
+			(long)'i' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'k' << 56 | (long)'a' << 48 | (long)'p' << 40 | (long)'p' << 32 | (long)'a' << 24, 
+			(long)'l' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'l' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'b' << 32 | (long)'d' << 24 | (long)'a' << 16, 
+			(long)'l' << 56 | (long)'a' << 48 | (long)'n' << 40 | (long)'g' << 32, 
+			(long)'l' << 56 | (long)'a' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'l' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'l' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'i' << 32 | (long)'l' << 24, 
+			(long)'l' << 56 | (long)'d' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'l' << 56 | (long)'e' << 48, 
+			(long)'l' << 56 | (long)'f' << 48 | (long)'l' << 40 | (long)'o' << 32 | (long)'o' << 24 | (long)'r' << 16, 
+			(long)'l' << 56 | (long)'o' << 48 | (long)'w' << 40 | (long)'a' << 32 | (long)'s' << 24 | (long)'t' << 16, 
+			(long)'l' << 56 | (long)'o' << 48 | (long)'z' << 40, 
+			(long)'l' << 56 | (long)'r' << 48 | (long)'m' << 40, 
+			(long)'l' << 56 | (long)'s' << 48 | (long)'a' << 40 | (long)'q' << 32 | (long)'u' << 24 | (long)'o' << 16, 
+			(long)'l' << 56 | (long)'s' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'l' << 56 | (long)'t' << 48, 
+			(long)'m' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'r' << 32, 
+			(long)'m' << 56 | (long)'d' << 48 | (long)'a' << 40 | (long)'s' << 32 | (long)'h' << 24, 
+			(long)'m' << 56 | (long)'i' << 48 | (long)'c' << 40 | (long)'r' << 32 | (long)'o' << 24, 
+			(long)'m' << 56 | (long)'i' << 48 | (long)'d' << 40 | (long)'d' << 32 | (long)'o' << 24 | (long)'t' << 16, 
+			(long)'m' << 56 | (long)'i' << 48 | (long)'n' << 40 | (long)'u' << 32 | (long)'s' << 24, 
+			(long)'m' << 56 | (long)'u' << 48, 
+			(long)'n' << 56 | (long)'a' << 48 | (long)'b' << 40 | (long)'l' << 32 | (long)'a' << 24, 
+			(long)'n' << 56 | (long)'b' << 48 | (long)'s' << 40 | (long)'p' << 32, 
+			(long)'n' << 56 | (long)'d' << 48 | (long)'a' << 40 | (long)'s' << 32 | (long)'h' << 24, 
+			(long)'n' << 56 | (long)'e' << 48, 
+			(long)'n' << 56 | (long)'i' << 48, 
+			(long)'n' << 56 | (long)'o' << 48 | (long)'t' << 40, 
+			(long)'n' << 56 | (long)'o' << 48 | (long)'t' << 40 | (long)'i' << 32 | (long)'n' << 24, 
+			(long)'n' << 56 | (long)'s' << 48 | (long)'u' << 40 | (long)'b' << 32, 
+			(long)'n' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
+			(long)'n' << 56 | (long)'u' << 48, 
+			(long)'o' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'o' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'o' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
+			(long)'o' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'o' << 56 | (long)'l' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'e' << 24, 
+			(long)'o' << 56 | (long)'m' << 48 | (long)'e' << 40 | (long)'g' << 32 | (long)'a' << 24, 
+			(long)'o' << 56 | (long)'m' << 48 | (long)'i' << 40 | (long)'c' << 32 | (long)'r' << 24 | (long)'o' << 16 | (long)'n' << 8, 
+			(long)'o' << 56 | (long)'p' << 48 | (long)'l' << 40 | (long)'u' << 32 | (long)'s' << 24, 
+			(long)'o' << 56 | (long)'r' << 48, 
+			(long)'o' << 56 | (long)'r' << 48 | (long)'d' << 40 | (long)'f' << 32, 
+			(long)'o' << 56 | (long)'r' << 48 | (long)'d' << 40 | (long)'m' << 32, 
+			(long)'o' << 56 | (long)'s' << 48 | (long)'l' << 40 | (long)'a' << 32 | (long)'s' << 24 | (long)'h' << 16, 
+			(long)'o' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
+			(long)'o' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'m' << 32 | (long)'e' << 24 | (long)'s' << 16, 
+			(long)'o' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'p' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'a' << 32, 
+			(long)'p' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'t' << 32, 
+			(long)'p' << 56 | (long)'e' << 48 | (long)'r' << 40 | (long)'m' << 32 | (long)'i' << 24 | (long)'l' << 16, 
+			(long)'p' << 56 | (long)'e' << 48 | (long)'r' << 40 | (long)'p' << 32, 
+			(long)'p' << 56 | (long)'h' << 48 | (long)'i' << 40, 
+			(long)'p' << 56 | (long)'i' << 48, 
+			(long)'p' << 56 | (long)'i' << 48 | (long)'v' << 40, 
+			(long)'p' << 56 | (long)'l' << 48 | (long)'u' << 40 | (long)'s' << 32 | (long)'m' << 24 | (long)'n' << 16, 
+			(long)'p' << 56 | (long)'o' << 48 | (long)'u' << 40 | (long)'n' << 32 | (long)'d' << 24, 
+			(long)'p' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'m' << 32 | (long)'e' << 24, 
+			(long)'p' << 56 | (long)'r' << 48 | (long)'o' << 40 | (long)'d' << 32, 
+			(long)'p' << 56 | (long)'r' << 48 | (long)'o' << 40 | (long)'p' << 32, 
+			(long)'p' << 56 | (long)'s' << 48 | (long)'i' << 40, 
+			(long)'q' << 56 | (long)'u' << 48 | (long)'o' << 40 | (long)'t' << 32, 
+			(long)'r' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'r' << 56 | (long)'a' << 48 | (long)'d' << 40 | (long)'i' << 32 | (long)'c' << 24, 
+			(long)'r' << 56 | (long)'a' << 48 | (long)'n' << 40 | (long)'g' << 32, 
+			(long)'r' << 56 | (long)'a' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'r' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'r' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'i' << 32 | (long)'l' << 24, 
+			(long)'r' << 56 | (long)'d' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'r' << 56 | (long)'e' << 48 | (long)'a' << 40 | (long)'l' << 32, 
+			(long)'r' << 56 | (long)'e' << 48 | (long)'g' << 40, 
+			(long)'r' << 56 | (long)'f' << 48 | (long)'l' << 40 | (long)'o' << 32 | (long)'o' << 24 | (long)'r' << 16, 
+			(long)'r' << 56 | (long)'h' << 48 | (long)'o' << 40, 
+			(long)'r' << 56 | (long)'l' << 48 | (long)'m' << 40, 
+			(long)'r' << 56 | (long)'s' << 48 | (long)'a' << 40 | (long)'q' << 32 | (long)'u' << 24 | (long)'o' << 16, 
+			(long)'r' << 56 | (long)'s' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'s' << 56 | (long)'b' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
+			(long)'s' << 56 | (long)'c' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'o' << 24 | (long)'n' << 16, 
+			(long)'s' << 56 | (long)'d' << 48 | (long)'o' << 40 | (long)'t' << 32, 
+			(long)'s' << 56 | (long)'e' << 48 | (long)'c' << 40 | (long)'t' << 32, 
+			(long)'s' << 56 | (long)'h' << 48 | (long)'y' << 40, 
+			(long)'s' << 56 | (long)'i' << 48 | (long)'g' << 40 | (long)'m' << 32 | (long)'a' << 24, 
+			(long)'s' << 56 | (long)'i' << 48 | (long)'g' << 40 | (long)'m' << 32 | (long)'a' << 24 | (long)'f' << 16, 
+			(long)'s' << 56 | (long)'i' << 48 | (long)'m' << 40, 
+			(long)'s' << 56 | (long)'p' << 48 | (long)'a' << 40 | (long)'d' << 32 | (long)'e' << 24 | (long)'s' << 16, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'b' << 40, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'b' << 40 | (long)'e' << 32, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'m' << 40, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'1' << 32, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'2' << 32, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'3' << 32, 
+			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'e' << 32, 
+			(long)'s' << 56 | (long)'z' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
+			(long)'t' << 56 | (long)'a' << 48 | (long)'u' << 40, 
+			(long)'t' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'r' << 32 | (long)'e' << 24 | (long)'4' << 16, 
+			(long)'t' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'t' << 32 | (long)'a' << 24, 
+			(long)'t' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'t' << 32 | (long)'a' << 24 | (long)'s' << 16 | (long)'y' << 8 | (long)'m' << 0, 
+			(long)'t' << 56 | (long)'h' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'s' << 24 | (long)'p' << 16, 
+			(long)'t' << 56 | (long)'h' << 48 | (long)'o' << 40 | (long)'r' << 32 | (long)'n' << 24, 
+			(long)'t' << 56 | (long)'i' << 48 | (long)'l' << 40 | (long)'d' << 32 | (long)'e' << 24, 
+			(long)'t' << 56 | (long)'i' << 48 | (long)'m' << 40 | (long)'e' << 32 | (long)'s' << 24, 
+			(long)'t' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'d' << 32 | (long)'e' << 24, 
+			(long)'u' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'u' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'u' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
+			(long)'u' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
+			(long)'u' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
+			(long)'u' << 56 | (long)'m' << 48 | (long)'l' << 40, 
+			(long)'u' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'h' << 24, 
+			(long)'u' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
+			(long)'u' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'w' << 56 | (long)'e' << 48 | (long)'i' << 40 | (long)'e' << 32 | (long)'r' << 24 | (long)'p' << 16, 
+			(long)'x' << 56 | (long)'i' << 48, 
+			(long)'y' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
+			(long)'y' << 56 | (long)'e' << 48 | (long)'n' << 40, 
+			(long)'y' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
+			(long)'z' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
+			(long)'z' << 56 | (long)'w' << 48 | (long)'j' << 40, 
+			(long)'z' << 56 | (long)'w' << 48 | (long)'n' << 40 | (long)'j' << 32
+		};
+
+        static readonly char[] entities_values = new char[] {
+			'\u00C6',
+			'\u00C1',
+			'\u00C2',
+			'\u00C0',
+			'\u0391',
+			'\u00C5',
+			'\u00C3',
+			'\u00C4',
+			'\u0392',
+			'\u00C7',
+			'\u03A7',
+			'\u2021',
+			'\u0394',
+			'\u00D0',
+			'\u00C9',
+			'\u00CA',
+			'\u00C8',
+			'\u0395',
+			'\u0397',
+			'\u00CB',
+			'\u0393',
+			'\u00CD',
+			'\u00CE',
+			'\u00CC',
+			'\u0399',
+			'\u00CF',
+			'\u039A',
+			'\u039B',
+			'\u039C',
+			'\u00D1',
+			'\u039D',
+			'\u0152',
+			'\u00D3',
+			'\u00D4',
+			'\u00D2',
+			'\u03A9',
+			'\u039F',
+			'\u00D8',
+			'\u00D5',
+			'\u00D6',
+			'\u03A6',
+			'\u03A0',
+			'\u2033',
+			'\u03A8',
+			'\u03A1',
+			'\u0160',
+			'\u03A3',
+			'\u00DE',
+			'\u03A4',
+			'\u0398',
+			'\u00DA',
+			'\u00DB',
+			'\u00D9',
+			'\u03A5',
+			'\u00DC',
+			'\u039E',
+			'\u00DD',
+			'\u0178',
+			'\u0396',
+			'\u00E1',
+			'\u00E2',
+			'\u00B4',
+			'\u00E6',
+			'\u00E0',
+			'\u2135',
+			'\u03B1',
+			'\u0026',
+			'\u2227',
+			'\u2220',
+			'\u0027',
+			'\u00E5',
+			'\u2248',
+			'\u00E3',
+			'\u00E4',
+			'\u201E',
+			'\u03B2',
+			'\u00A6',
+			'\u2022',
+			'\u2229',
+			'\u00E7',
+			'\u00B8',
+			'\u00A2',
+			'\u03C7',
+			'\u02C6',
+			'\u2663',
+			'\u2245',
+			'\u00A9',
+			'\u21B5',
+			'\u222A',
+			'\u00A4',
+			'\u21D3',
+			'\u2020',
+			'\u2193',
+			'\u00B0',
+			'\u03B4',
+			'\u2666',
+			'\u00F7',
+			'\u00E9',
+			'\u00EA',
+			'\u00E8',
+			'\u2205',
+			'\u2003',
+			'\u2002',
+			'\u03B5',
+			'\u2261',
+			'\u03B7',
+			'\u00F0',
+			'\u00EB',
+			'\u20AC',
+			'\u2203',
+			'\u0192',
+			'\u2200',
+			'\u00BD',
+			'\u00BC',
+			'\u00BE',
+			'\u2044',
+			'\u03B3',
+			'\u2265',
+			'\u003E',
+			'\u21D4',
+			'\u2194',
+			'\u2665',
+			'\u2026',
+			'\u00ED',
+			'\u00EE',
+			'\u00A1',
+			'\u00EC',
+			'\u2111',
+			'\u221E',
+			'\u222B',
+			'\u03B9',
+			'\u00BF',
+			'\u2208',
+			'\u00EF',
+			'\u03BA',
+			'\u21D0',
+			'\u03BB',
+			'\u2329',
+			'\u00AB',
+			'\u2190',
+			'\u2308',
+			'\u201C',
+			'\u2264',
+			'\u230A',
+			'\u2217',
+			'\u25CA',
+			'\u200E',
+			'\u2039',
+			'\u2018',
+			'\u003C',
+			'\u00AF',
+			'\u2014',
+			'\u00B5',
+			'\u00B7',
+			'\u2212',
+			'\u03BC',
+			'\u2207',
+			'\u00A0',
+			'\u2013',
+			'\u2260',
+			'\u220B',
+			'\u00AC',
+			'\u2209',
+			'\u2284',
+			'\u00F1',
+			'\u03BD',
+			'\u00F3',
+			'\u00F4',
+			'\u0153',
+			'\u00F2',
+			'\u203E',
+			'\u03C9',
+			'\u03BF',
+			'\u2295',
+			'\u2228',
+			'\u00AA',
+			'\u00BA',
+			'\u00F8',
+			'\u00F5',
+			'\u2297',
+			'\u00F6',
+			'\u00B6',
+			'\u2202',
+			'\u2030',
+			'\u22A5',
+			'\u03C6',
+			'\u03C0',
+			'\u03D6',
+			'\u00B1',
+			'\u00A3',
+			'\u2032',
+			'\u220F',
+			'\u221D',
+			'\u03C8',
+			'\u0022',
+			'\u21D2',
+			'\u221A',
+			'\u232A',
+			'\u00BB',
+			'\u2192',
+			'\u2309',
+			'\u201D',
+			'\u211C',
+			'\u00AE',
+			'\u230B',
+			'\u03C1',
+			'\u200F',
+			'\u203A',
+			'\u2019',
+			'\u201A',
+			'\u0161',
+			'\u22C5',
+			'\u00A7',
+			'\u00AD',
+			'\u03C3',
+			'\u03C2',
+			'\u223C',
+			'\u2660',
+			'\u2282',
+			'\u2286',
+			'\u2211',
+			'\u2283',
+			'\u00B9',
+			'\u00B2',
+			'\u00B3',
+			'\u2287',
+			'\u00DF',
+			'\u03C4',
+			'\u2234',
+			'\u03B8',
+			'\u03D1',
+			'\u2009',
+			'\u00FE',
+			'\u02DC',
+			'\u00D7',
+			'\u2122',
+			'\u21D1',
+			'\u00FA',
+			'\u2191',
+			'\u00FB',
+			'\u00F9',
+			'\u00A8',
+			'\u03D2',
+			'\u03C5',
+			'\u00FC',
+			'\u2118',
+			'\u03BE',
+			'\u00FD',
+			'\u00A5',
+			'\u00FF',
+			'\u03B6',
+			'\u200D',
+			'\u200C'
+		};
+
+        #region Methods
+
+        static void WriteCharBytes(IList buf, char ch, Encoding e)
+        {
+            if (ch > 255)
+            {
+                foreach (byte b in e.GetBytes(new char[] { ch }))
+                    buf.Add(b);
+            }
+            else
+                buf.Add((byte)ch);
+        }
+
+        public static string UrlDecode(string s, Encoding e)
+        {
+            if (null == s)
+                return null;
+
+            if (s.IndexOf('%') == -1 && s.IndexOf('+') == -1)
+                return s;
+
+            if (e == null)
+                e = Encoding.UTF8;
+
+            long len = s.Length;
+            var bytes = new List<byte>();
+            int xchar;
+            char ch;
+
+            for (int i = 0; i < len; i++)
+            {
+                ch = s[i];
+                if (ch == '%' && i + 2 < len && s[i + 1] != '%')
+                {
+                    if (s[i + 1] == 'u' && i + 5 < len)
+                    {
+                        // unicode hex sequence
+                        xchar = GetChar(s, i + 2, 4);
+                        if (xchar != -1)
+                        {
+                            WriteCharBytes(bytes, (char)xchar, e);
+                            i += 5;
+                        }
+                        else
+                            WriteCharBytes(bytes, '%', e);
+                    }
+                    else if ((xchar = GetChar(s, i + 1, 2)) != -1)
+                    {
+                        WriteCharBytes(bytes, (char)xchar, e);
+                        i += 2;
+                    }
+                    else
+                    {
+                        WriteCharBytes(bytes, '%', e);
+                    }
+                    continue;
+                }
+
+                if (ch == '+')
+                    WriteCharBytes(bytes, ' ', e);
+                else
+                    WriteCharBytes(bytes, ch, e);
+            }
+
+            byte[] buf = bytes.ToArray();
+            bytes = null;
+            return e.GetString(buf, 0, buf.Length);
+
+        }
+
+        static int GetInt(byte b)
+        {
+            char c = (char)b;
+            if (c >= '0' && c <= '9')
+                return c - '0';
+
+            if (c >= 'a' && c <= 'f')
+                return c - 'a' + 10;
+
+            if (c >= 'A' && c <= 'F')
+                return c - 'A' + 10;
+
+            return -1;
+        }
+
+        static int GetChar(string str, int offset, int length)
+        {
+            int val = 0;
+            int end = length + offset;
+            for (int i = offset; i < end; i++)
+            {
+                char c = str[i];
+                if (c > 127)
+                    return -1;
+
+                int current = GetInt((byte)c);
+                if (current == -1)
+                    return -1;
+                val = (val << 4) + current;
+            }
+
+            return val;
+        }
+
+        static bool TryConvertKeyToEntity(string key, out char value)
+        {
+            var token = CalculateKeyValue(key);
+            if (token == 0)
+            {
+                value = '\0';
+                return false;
+            }
+
+            var idx = Array.BinarySearch(entities, token);
+            if (idx < 0)
+            {
+                value = '\0';
+                return false;
+            }
+
+            value = entities_values[idx];
+            return true;
+        }
+
+        static long CalculateKeyValue(string s)
+        {
+            if (s.Length > 8)
+                return 0;
+
+            long key = 0;
+            for (int i = 0; i < s.Length; ++i)
+            {
+                long ch = s[i];
+                if (ch > 'z' || ch < '0')
+                    return 0;
+
+                key |= ch << ((7 - i) * 8);
+            }
+
+            return key;
+        }
+
+        /// <summary>
+        /// Decodes an HTML-encoded string and returns the decoded string.
+        /// </summary>
+        /// <param name="s">The HTML string to decode. </param>
+        /// <returns>The decoded text.</returns>
+        public static string HtmlDecode(string s)
+        {
+            if (s == null)
+                throw new ArgumentNullException("s");
+
+            if (s.IndexOf('&') == -1)
+                return s;
+
+            StringBuilder entity = new StringBuilder();
+            StringBuilder output = new StringBuilder();
+            int len = s.Length;
+            // 0 -> nothing,
+            // 1 -> right after '&'
+            // 2 -> between '&' and ';' but no '#'
+            // 3 -> '#' found after '&' and getting numbers
+            int state = 0;
+            int number = 0;
+            int digit_start = 0;
+            bool hex_number = false;
+
+            for (int i = 0; i < len; i++)
+            {
+                char c = s[i];
+                if (state == 0)
+                {
+                    if (c == '&')
+                    {
+                        entity.Append(c);
+                        state = 1;
+                    }
+                    else
+                    {
+                        output.Append(c);
+                    }
+                    continue;
+                }
+
+                if (c == '&')
+                {
+                    state = 1;
+                    if (digit_start > 0)
+                    {
+                        entity.Append(s, digit_start, i - digit_start);
+                        digit_start = 0;
+                    }
+
+                    output.Append(entity.ToString());
+                    entity.Length = 0;
+                    entity.Append('&');
+                    continue;
+                }
+
+                switch (state)
+                {
+                    case 1:
+                        if (c == ';')
+                        {
+                            state = 0;
+                            output.Append(entity.ToString());
+                            output.Append(c);
+                            entity.Length = 0;
+                            break;
+                        }
+
+                        number = 0;
+                        hex_number = false;
+                        if (c != '#')
+                        {
+                            state = 2;
+                        }
+                        else
+                        {
+                            state = 3;
+                        }
+                        entity.Append(c);
+
+                        break;
+                    case 2:
+                        entity.Append(c);
+                        if (c == ';')
+                        {
+                            string key = entity.ToString();
+                            state = 0;
+                            entity.Length = 0;
+
+                            if (key.Length > 1)
+                            {
+                                var skey = key.Substring(1, key.Length - 2);
+                                if (TryConvertKeyToEntity(skey, out c))
+                                {
+                                    output.Append(c);
+                                    break;
+                                }
+                            }
+
+                            output.Append(key);
+                        }
+
+                        break;
+                    case 3:
+                        if (c == ';')
+                        {
+                            if (number < 0x10000)
+                            {
+                                output.Append((char)number);
+                            }
+                            else
+                            {
+                                output.Append((char)(0xd800 + ((number - 0x10000) >> 10)));
+                                output.Append((char)(0xdc00 + ((number - 0x10000) & 0x3ff)));
+                            }
+                            state = 0;
+                            entity.Length = 0;
+                            digit_start = 0;
+                            break;
+                        }
+
+                        if (c == 'x' || c == 'X' && !hex_number)
+                        {
+                            digit_start = i;
+                            hex_number = true;
+                            break;
+                        }
+
+                        if (Char.IsDigit(c))
+                        {
+                            if (digit_start == 0)
+                                digit_start = i;
+
+                            number = number * (hex_number ? 16 : 10) + ((int)c - '0');
+                            break;
+                        }
+
+                        if (hex_number)
+                        {
+                            if (c >= 'a' && c <= 'f')
+                            {
+                                number = number * 16 + 10 + ((int)c - 'a');
+                                break;
+                            }
+                            if (c >= 'A' && c <= 'F')
+                            {
+                                number = number * 16 + 10 + ((int)c - 'A');
+                                break;
+                            }
+                        }
+
+                        state = 2;
+                        if (digit_start > 0)
+                        {
+                            entity.Append(s, digit_start, i - digit_start);
+                            digit_start = 0;
+                        }
+
+                        entity.Append(c);
+                        break;
+                }
+            }
+
+            if (entity.Length > 0)
+            {
+                output.Append(entity);
+            }
+            else if (digit_start > 0)
+            {
+                output.Append(s, digit_start, s.Length - digit_start);
+            }
+            return output.ToString();
+        }
+
+        public static QueryParamCollection ParseQueryString(string query)
+        {
+            return ParseQueryString(query, Encoding.UTF8);
+        }
+
+        public static QueryParamCollection ParseQueryString(string query, Encoding encoding)
+        {
+            if (query == null)
+                throw new ArgumentNullException("query");
+            if (encoding == null)
+                throw new ArgumentNullException("encoding");
+            if (query.Length == 0 || (query.Length == 1 && query[0] == '?'))
+                return new QueryParamCollection();
+            if (query[0] == '?')
+                query = query.Substring(1);
+
+            QueryParamCollection result = new QueryParamCollection();
+            ParseQueryString(query, encoding, result);
+            return result;
+        }
+
+        internal static void ParseQueryString(string query, Encoding encoding, QueryParamCollection result)
+        {
+            if (query.Length == 0)
+                return;
+
+            string decoded = HtmlDecode(query);
+            int decodedLength = decoded.Length;
+            int namePos = 0;
+            bool first = true;
+            while (namePos <= decodedLength)
+            {
+                int valuePos = -1, valueEnd = -1;
+                for (int q = namePos; q < decodedLength; q++)
+                {
+                    if (valuePos == -1 && decoded[q] == '=')
+                    {
+                        valuePos = q + 1;
+                    }
+                    else if (decoded[q] == '&')
+                    {
+                        valueEnd = q;
+                        break;
+                    }
+                }
+
+                if (first)
+                {
+                    first = false;
+                    if (decoded[namePos] == '?')
+                        namePos++;
+                }
+
+                string name, value;
+                if (valuePos == -1)
+                {
+                    name = null;
+                    valuePos = namePos;
+                }
+                else
+                {
+                    name = UrlDecode(decoded.Substring(namePos, valuePos - namePos - 1), encoding);
+                }
+                if (valueEnd < 0)
+                {
+                    namePos = -1;
+                    valueEnd = decoded.Length;
+                }
+                else
+                {
+                    namePos = valueEnd + 1;
+                }
+                value = UrlDecode(decoded.Substring(valuePos, valueEnd - valuePos), encoding);
+
+                result.Add(name, value);
+                if (namePos == -1)
+                    break;
+            }
+        }
+        #endregion // Methods
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/SwaggerService.cs b/Emby.Server.Implementations/HttpServer/SwaggerService.cs
new file mode 100644
index 000000000..3c181e425
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SwaggerService.cs
@@ -0,0 +1,46 @@
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Net;
+using System.IO;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    public class SwaggerService : IHasResultFactory, IService
+    {
+        private readonly IServerApplicationPaths _appPaths;
+        private readonly IFileSystem _fileSystem;
+
+        public SwaggerService(IServerApplicationPaths appPaths, IFileSystem fileSystem)
+        {
+            _appPaths = appPaths;
+            _fileSystem = fileSystem;
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetSwaggerResource request)
+        {
+            var swaggerDirectory = Path.Combine(_appPaths.ApplicationResourcesPath, "swagger-ui");
+
+            var requestedFile = Path.Combine(swaggerDirectory, request.ResourceName.Replace('/', _fileSystem.DirectorySeparatorChar));
+
+            return ResultFactory.GetStaticFileResult(Request, requestedFile).Result;
+        }
+
+        /// <summary>
+        /// Gets or sets the result factory.
+        /// </summary>
+        /// <value>The result factory.</value>
+        public IHttpResultFactory ResultFactory { get; set; }
+
+        /// <summary>
+        /// Gets or sets the request context.
+        /// </summary>
+        /// <value>The request context.</value>
+        public IRequest Request { get; set; }
+    }
+}
diff --git a/Emby.Server.Implementations/Localization/Core/ar.json b/Emby.Server.Implementations/Localization/Core/ar.json
new file mode 100644
index 000000000..28977c4f9
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "\u062e\u0631\u0648\u062c",
+    "LabelVisitCommunity": "\u0632\u064a\u0627\u0631\u0629 \u0627\u0644\u0645\u062c\u062a\u0645\u0639",
+    "LabelGithub": "\u062c\u064a\u062a \u0647\u0628",
+    "LabelApiDocumentation": "\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0645\u062f\u062e\u0644 \u0628\u0631\u0645\u062c\u0629 \u0627\u0644\u062a\u0637\u0628\u064a\u0642",
+    "LabelDeveloperResources": "\u0645\u0643\u062a\u0628\u0629 \u0627\u0644\u0645\u0628\u0631\u0645\u062c",
+    "LabelBrowseLibrary": "\u062a\u0635\u0641\u062d \u0627\u0644\u0645\u0643\u062a\u0628\u0629",
+    "LabelConfigureServer": "\u0625\u0639\u062f\u0627\u062f \u0625\u0645\u0628\u064a",
+    "LabelRestartServer": "\u0627\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u062e\u0627\u062f\u0645",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/bg-BG.json b/Emby.Server.Implementations/Localization/Core/bg-BG.json
new file mode 100644
index 000000000..22b99408d
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/bg-BG.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "\u0421\u043c\u0435\u0441\u0435\u043d\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
+    "FolderTypeMovies": "\u0424\u0438\u043b\u043c\u0438",
+    "FolderTypeMusic": "\u041c\u0443\u0437\u0438\u043a\u0430",
+    "FolderTypeAdultVideos": "\u041a\u043b\u0438\u043f\u043e\u0432\u0435 \u0437\u0430 \u0432\u044a\u0437\u0440\u0430\u0441\u0442\u043d\u0438",
+    "FolderTypePhotos": "\u0421\u043d\u0438\u043c\u043a\u0438",
+    "FolderTypeMusicVideos": "\u041c\u0443\u0437\u0438\u043a\u0430\u043b\u043d\u0438 \u043a\u043b\u0438\u043f\u043e\u0432\u0435",
+    "FolderTypeHomeVideos": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438 \u043a\u043b\u0438\u043f\u043e\u0432\u0435",
+    "FolderTypeGames": "\u0418\u0433\u0440\u0438",
+    "FolderTypeBooks": "\u041a\u043d\u0438\u0433\u0438",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "\u041d\u0430\u0441\u043b\u0435\u0434\u0438",
+    "HeaderCastCrew": "\u0415\u043a\u0438\u043f",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "\u0418\u0437\u0445\u043e\u0434",
+    "LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0442\u0438 \u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e\u0442\u043e",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "API \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
+    "LabelDeveloperResources": "\u0420\u0435\u0441\u0443\u0440\u0441\u0438 \u0437\u0430 \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u0446\u0438",
+    "LabelBrowseLibrary": "\u0420\u0430\u0437\u0433\u043b\u0435\u0434\u0430\u0439 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u0442\u0430",
+    "LabelConfigureServer": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u0439 Emby",
+    "LabelRestartServer": "\u0420\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0441\u044a\u0440\u0432\u044a\u0440\u0430",
+    "CategorySync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437.",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "\u0412\u0435\u0440\u0441\u0438\u044f {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby \u0441\u044a\u0440\u0432\u044a\u0440\u044a\u0442 \u0431\u0435 \u043e\u0431\u043d\u043e\u0432\u0435\u043d.",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "\u0410\u0443\u0434\u0438\u043e",
+    "HeaderVideo": "\u0412\u0438\u0434\u0435\u043e",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "\u0421\u044a\u0441\u0442\u043e\u044f\u043d\u0438\u0435:",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/ca.json b/Emby.Server.Implementations/Localization/Core/ca.json
new file mode 100644
index 000000000..7ca8e1553
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/ca.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Si et plau espera mentre la teva base de dades del Servidor Emby \u00e9s actualitzada. {0}% completat.",
+    "AppDeviceValues": "App: {0}, Dispositiu: {1}",
+    "UserDownloadingItemWithValues": "{0} est\u00e0 descarregant {1}",
+    "FolderTypeMixed": "Contingut barrejat",
+    "FolderTypeMovies": "Pel\u00b7l\u00edcules",
+    "FolderTypeMusic": "M\u00fasica",
+    "FolderTypeAdultVideos": "V\u00eddeos per adults",
+    "FolderTypePhotos": "Fotos",
+    "FolderTypeMusicVideos": "V\u00eddeos musicals",
+    "FolderTypeHomeVideos": "V\u00eddeos dom\u00e8stics",
+    "FolderTypeGames": "Jocs",
+    "FolderTypeBooks": "Llibres",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Heretat",
+    "HeaderCastCrew": "Repartiment i Equip",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Cap\u00edtol {0}",
+    "NameSeasonNumber": "Temporada {0}",
+    "LabelExit": "Sortir",
+    "LabelVisitCommunity": "Visita la Comunitat",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentaci\u00f3 de l'API",
+    "LabelDeveloperResources": "Recursos per a Desenvolupadors",
+    "LabelBrowseLibrary": "Examina la Biblioteca",
+    "LabelConfigureServer": "Configura Emby",
+    "LabelRestartServer": "Reiniciar Servidor",
+    "CategorySync": "Sync",
+    "CategoryUser": "Usuari",
+    "CategorySystem": "Sistema",
+    "CategoryApplication": "Aplicaci\u00f3",
+    "CategoryPlugin": "Complement",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Actualitzaci\u00f3 d'aplicaci\u00f3 disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Actualitzaci\u00f3 d'aplicaci\u00f3 instal\u00b7lada",
+    "NotificationOptionPluginUpdateInstalled": "Actualitzaci\u00f3 de complement instal\u00b7lada",
+    "NotificationOptionPluginInstalled": "Complement instal\u00b7lat",
+    "NotificationOptionPluginUninstalled": "Complement desinstal\u00b7lat",
+    "NotificationOptionVideoPlayback": "Reproducci\u00f3 de v\u00eddeo iniciada",
+    "NotificationOptionAudioPlayback": "Reproducci\u00f3 d'\u00e0udio iniciada",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Reproducci\u00f3 de v\u00eddeo aturada",
+    "NotificationOptionAudioPlaybackStopped": "Reproducci\u00f3 d'\u00e0udio aturada",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Tasca programada fallida",
+    "NotificationOptionInstallationFailed": "Instal\u00b7laci\u00f3 fallida",
+    "NotificationOptionNewLibraryContent": "Nou contingut afegit",
+    "NotificationOptionNewLibraryContentMultiple": "Nous continguts afegits",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "Usuari blocat",
+    "NotificationOptionServerRestartRequired": "Cal reiniciar el servidor",
+    "ViewTypePlaylists": "Llistes de reproducci\u00f3",
+    "ViewTypeMovies": "Pel\u00b7l\u00edcules",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Jocs",
+    "ViewTypeMusic": "M\u00fasica",
+    "ViewTypeMusicGenres": "G\u00e8neres",
+    "ViewTypeMusicArtists": "Artistes",
+    "ViewTypeBoxSets": "Col\u00b7leccions",
+    "ViewTypeChannels": "Canals",
+    "ViewTypeLiveTV": "TV en Directe",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Darrers Jocs",
+    "ViewTypeRecentlyPlayedGames": "Reprodu\u00eft Recentment",
+    "ViewTypeGameFavorites": "Preferits",
+    "ViewTypeGameSystems": "Sistemes de Jocs",
+    "ViewTypeGameGenres": "G\u00e8neres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "A Continuaci\u00f3",
+    "ViewTypeTvLatest": "Darrers",
+    "ViewTypeTvShowSeries": "S\u00e8ries:",
+    "ViewTypeTvGenres": "G\u00e8neres",
+    "ViewTypeTvFavoriteSeries": "S\u00e8ries Preferides",
+    "ViewTypeTvFavoriteEpisodes": "Episodis Preferits",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Darrers",
+    "ViewTypeMovieMovies": "Pel\u00b7l\u00edcules",
+    "ViewTypeMovieCollections": "Col\u00b7leccions",
+    "ViewTypeMovieFavorites": "Preferides",
+    "ViewTypeMovieGenres": "G\u00e8neres",
+    "ViewTypeMusicLatest": "Novetats",
+    "ViewTypeMusicPlaylists": "Llistes de reproducci\u00f3",
+    "ViewTypeMusicAlbums": "\u00c0lbums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Prefer\u00e8ncies de Visualitzaci\u00f3",
+    "ViewTypeMusicSongs": "Can\u00e7ons",
+    "ViewTypeMusicFavorites": "Preferides",
+    "ViewTypeMusicFavoriteAlbums": "\u00c0lbums Preferits",
+    "ViewTypeMusicFavoriteArtists": "Artistes Preferits",
+    "ViewTypeMusicFavoriteSongs": "Can\u00e7ons Preferides",
+    "ViewTypeFolders": "Directoris",
+    "ViewTypeLiveTvRecordingGroups": "Enregistraments",
+    "ViewTypeLiveTvChannels": "Canals",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Versi\u00f3 {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} afegit a la biblioteca",
+    "ItemRemovedWithName": "{0} eliminat de la biblioteca",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Prove\u00efdor: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "L'usuari {0} ha estat eliminat",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} autenticat correctament",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "L'usuari {0} ha estat blocat",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} ha comen\u00e7at a reproduir {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "Usuari",
+    "HeaderName": "Nom",
+    "HeaderDate": "Data",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Data afegida",
+    "HeaderReleaseDate": "Data de publicaci\u00f3",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Temporada",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "S\u00e8ries:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Any:",
+    "HeaderYears": "Anys:",
+    "HeaderParentalRating": "Valoraci\u00f3 Parental",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Tr\u00e0ilers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Sistemes de Jocs",
+    "HeaderPlayers": "Jugadors:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "\u00c0udio",
+    "HeaderVideo": "V\u00eddeo",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subt\u00edtols",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Estat",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "M\u00fasic",
+    "HeaderLocked": "Blocat",
+    "HeaderStudios": "Estudis",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Compositors",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Artista convidat",
+    "HeaderProducer": "Productors",
+    "HeaderWriter": "Escriptors",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Qualificacions de la comunitat",
+    "StartupEmbyServerIsLoading": "El servidor d'Emby s'est&agrave; carregant. Si et plau, tornau-ho a provar de nou en breu."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/core.json b/Emby.Server.Implementations/Localization/Core/core.json
new file mode 100644
index 000000000..976faa8cb
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/core.json
@@ -0,0 +1,179 @@
+{
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Exit",
+    "LabelVisitCommunity": "Visit Community",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Browse Library",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "Restart Server",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly.",
+    "DbUpgradeMessage":  "Please wait while your Emby Server database is upgraded. {0}% complete."
+}
diff --git a/Emby.Server.Implementations/Localization/Core/cs.json b/Emby.Server.Implementations/Localization/Core/cs.json
new file mode 100644
index 000000000..e3055f5ba
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/cs.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Po\u010dkejte pros\u00edm, datab\u00e1ze Emby Serveru je aktualizov\u00e1na na novou verzi. Hotovo {0}%.",
+    "AppDeviceValues": "Aplikace: {0}, Za\u0159\u00edzen\u00ed: {1}",
+    "UserDownloadingItemWithValues": "{0} pr\u00e1v\u011b stahuje {1}",
+    "FolderTypeMixed": "Sm\u00ed\u0161en\u00fd obsah",
+    "FolderTypeMovies": "Filmy",
+    "FolderTypeMusic": "Hudba",
+    "FolderTypeAdultVideos": "Filmy pro dosp\u011bl\u00e9",
+    "FolderTypePhotos": "Fotky",
+    "FolderTypeMusicVideos": "Hudebn\u00ed klipy",
+    "FolderTypeHomeVideos": "Dom\u00e1c\u00ed video",
+    "FolderTypeGames": "Hry",
+    "FolderTypeBooks": "Knihy",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Zd\u011bdit",
+    "HeaderCastCrew": "Herci a obsazen\u00ed",
+    "HeaderPeople": "Lid\u00e9",
+    "ValueSpecialEpisodeName": "Speci\u00e1l - {0}",
+    "LabelChapterName": "Kapitola {0}",
+    "NameSeasonNumber": "Sez\u00f3na {0}",
+    "LabelExit": "Zav\u0159\u00edt",
+    "LabelVisitCommunity": "Nav\u0161t\u00edvit komunitu",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Dokumentace API",
+    "LabelDeveloperResources": "Zdroje v\u00fdvoj\u00e1\u0159\u016f",
+    "LabelBrowseLibrary": "Proch\u00e1zet knihovnu",
+    "LabelConfigureServer": "Konfigurovat Emby",
+    "LabelRestartServer": "Restartovat server",
+    "CategorySync": "Synchronizace",
+    "CategoryUser": "U\u017eivatel:",
+    "CategorySystem": "Syst\u00e9m",
+    "CategoryApplication": "Aplikace",
+    "CategoryPlugin": "Z\u00e1suvn\u00fd modul",
+    "NotificationOptionPluginError": "Chyba z\u00e1suvn\u00e9ho modulu",
+    "NotificationOptionApplicationUpdateAvailable": "Dostupnost aktualizace aplikace",
+    "NotificationOptionApplicationUpdateInstalled": "Instalace aktualizace aplikace",
+    "NotificationOptionPluginUpdateInstalled": "Aktualizace z\u00e1suvn\u00e9ho modulu instalov\u00e1na",
+    "NotificationOptionPluginInstalled": "Z\u00e1suvn\u00fd modul instalov\u00e1n",
+    "NotificationOptionPluginUninstalled": "Z\u00e1suvn\u00fd modul odstran\u011bn",
+    "NotificationOptionVideoPlayback": "P\u0159ehr\u00e1v\u00e1n\u00ed videa zah\u00e1jeno",
+    "NotificationOptionAudioPlayback": "P\u0159ehr\u00e1v\u00e1n\u00ed audia zah\u00e1jeno",
+    "NotificationOptionGamePlayback": "Spu\u0161t\u011bn\u00ed hry zah\u00e1jeno",
+    "NotificationOptionVideoPlaybackStopped": "P\u0159ehr\u00e1v\u00e1n\u00ed videa ukon\u010deno",
+    "NotificationOptionAudioPlaybackStopped": "P\u0159ehr\u00e1v\u00e1n\u00ed audia ukon\u010deno",
+    "NotificationOptionGamePlaybackStopped": "Hra ukon\u010dena",
+    "NotificationOptionTaskFailed": "Chyba napl\u00e1novan\u00e9 \u00falohy",
+    "NotificationOptionInstallationFailed": "Chyba instalace",
+    "NotificationOptionNewLibraryContent": "P\u0159id\u00e1n nov\u00fd obsah",
+    "NotificationOptionNewLibraryContentMultiple": "P\u0159id\u00e1n nov\u00fd obsah (v\u00edcen\u00e1sobn\u00fd)",
+    "NotificationOptionCameraImageUploaded": "Kamerov\u00fd z\u00e1znam nahr\u00e1n",
+    "NotificationOptionUserLockedOut": "U\u017eivatel uzam\u010den",
+    "NotificationOptionServerRestartRequired": "Je vy\u017eadov\u00e1n restart serveru",
+    "ViewTypePlaylists": "Playlisty",
+    "ViewTypeMovies": "Filmy",
+    "ViewTypeTvShows": "Televize",
+    "ViewTypeGames": "Hry",
+    "ViewTypeMusic": "Hudba",
+    "ViewTypeMusicGenres": "\u017d\u00e1nry",
+    "ViewTypeMusicArtists": "\u00dam\u011blci",
+    "ViewTypeBoxSets": "Kolekce",
+    "ViewTypeChannels": "Kan\u00e1ly",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Vys\u00edl\u00e1no nyn\u00ed",
+    "ViewTypeLatestGames": "Nejnov\u011bj\u0161\u00ed hry",
+    "ViewTypeRecentlyPlayedGames": "Ned\u00e1vno p\u0159ehr\u00e1no",
+    "ViewTypeGameFavorites": "Obl\u00edben\u00e9",
+    "ViewTypeGameSystems": "Syst\u00e9my hry",
+    "ViewTypeGameGenres": "\u017d\u00e1nry",
+    "ViewTypeTvResume": "Obnovit",
+    "ViewTypeTvNextUp": "O\u010dek\u00e1van\u00e9",
+    "ViewTypeTvLatest": "Nejnov\u011bj\u0161\u00ed",
+    "ViewTypeTvShowSeries": "Seri\u00e1l",
+    "ViewTypeTvGenres": "\u017d\u00e1nry",
+    "ViewTypeTvFavoriteSeries": "Obl\u00edben\u00e9 seri\u00e1ly",
+    "ViewTypeTvFavoriteEpisodes": "Obl\u00edben\u00e9 epizody",
+    "ViewTypeMovieResume": "Obnovit",
+    "ViewTypeMovieLatest": "Nejnov\u011bj\u0161\u00ed",
+    "ViewTypeMovieMovies": "Filmy",
+    "ViewTypeMovieCollections": "Kolekce",
+    "ViewTypeMovieFavorites": "Obl\u00edben\u00e9",
+    "ViewTypeMovieGenres": "\u017d\u00e1nry",
+    "ViewTypeMusicLatest": "Nejnov\u011bj\u0161\u00ed",
+    "ViewTypeMusicPlaylists": "Playlisty",
+    "ViewTypeMusicAlbums": "Alba",
+    "ViewTypeMusicAlbumArtists": "Alba \u00fam\u011blc\u016f",
+    "HeaderOtherDisplaySettings": "Nastaven\u00ed zobrazen\u00ed",
+    "ViewTypeMusicSongs": "Songy",
+    "ViewTypeMusicFavorites": "Obl\u00edben\u00e9",
+    "ViewTypeMusicFavoriteAlbums": "Obl\u00edben\u00e1 alba",
+    "ViewTypeMusicFavoriteArtists": "Obl\u00edben\u00ed \u00fam\u011blci",
+    "ViewTypeMusicFavoriteSongs": "Obl\u00edben\u00e9 songy",
+    "ViewTypeFolders": "Slo\u017eky",
+    "ViewTypeLiveTvRecordingGroups": "Nahr\u00e1vky",
+    "ViewTypeLiveTvChannels": "Kan\u00e1ly",
+    "ScheduledTaskFailedWithName": "{0} selhalo",
+    "LabelRunningTimeValue": "D\u00e9lka m\u00e9dia: {0}",
+    "ScheduledTaskStartedWithName": "{0} zah\u00e1jeno",
+    "VersionNumber": "Verze {0}",
+    "PluginInstalledWithName": "{0} byl nainstalov\u00e1n",
+    "PluginUpdatedWithName": "{0} byl aktualizov\u00e1n",
+    "PluginUninstalledWithName": "{0} byl odinstalov\u00e1n",
+    "ItemAddedWithName": "{0} byl p\u0159id\u00e1n do knihovny",
+    "ItemRemovedWithName": "{0} byl odstran\u011bn z knihovny",
+    "LabelIpAddressValue": "IP adresa: {0}",
+    "DeviceOnlineWithName": "{0} je p\u0159ipojen",
+    "UserOnlineFromDevice": "{0} se p\u0159ipojil z {1}",
+    "ProviderValue": "Poskytl: {0}",
+    "SubtitlesDownloadedForItem": "Sta\u017eeny titulky pro {0}",
+    "UserConfigurationUpdatedWithName": "Konfigurace u\u017eivatele byla aktualizov\u00e1na pro {0}",
+    "UserCreatedWithName": "U\u017eivatel {0} byl vytvo\u0159en",
+    "UserPasswordChangedWithName": "Pro u\u017eivatele {0} byla provedena zm\u011bna hesla",
+    "UserDeletedWithName": "U\u017eivatel {0} byl smaz\u00e1n",
+    "MessageServerConfigurationUpdated": "Konfigurace serveru byla aktualizov\u00e1na",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Konfigurace sekce {0} na serveru byla aktualizov\u00e1na",
+    "MessageApplicationUpdated": "Emby Server byl aktualizov\u00e1n",
+    "FailedLoginAttemptWithUserName": "Ne\u00fasp\u011b\u0161n\u00fd pokus o p\u0159ihl\u00e1\u0161en\u00ed z {0}",
+    "AuthenticationSucceededWithUserName": "{0} \u00fasp\u011b\u0161n\u011b ov\u011b\u0159en",
+    "DeviceOfflineWithName": "{0} se odpojil",
+    "UserLockedOutWithName": "U\u017eivatel {0} byl odem\u010den",
+    "UserOfflineFromDevice": "{0} se odpojil od {1}",
+    "UserStartedPlayingItemWithValues": "{0} spustil p\u0159ehr\u00e1v\u00e1n\u00ed {1}",
+    "UserStoppedPlayingItemWithValues": "{0} zastavil p\u0159ehr\u00e1v\u00e1n\u00ed {1}",
+    "SubtitleDownloadFailureForItem": "Stahov\u00e1n\u00ed titulk\u016f selhalo pro {0}",
+    "HeaderUnidentified": "Neidentifikov\u00e1n",
+    "HeaderImagePrimary": "Prim\u00e1rn\u00ed",
+    "HeaderImageBackdrop": "Pozad\u00ed",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Avatar u\u017eivatele",
+    "HeaderOverview": "P\u0159ehled",
+    "HeaderShortOverview": "Stru\u010dn\u00fd p\u0159ehled",
+    "HeaderType": "Typ",
+    "HeaderSeverity": "Z\u00e1va\u017enost",
+    "HeaderUser": "U\u017eivatel",
+    "HeaderName": "N\u00e1zev",
+    "HeaderDate": "Datum",
+    "HeaderPremiereDate": "Premi\u00e9ra",
+    "HeaderDateAdded": "P\u0159id\u00e1no",
+    "HeaderReleaseDate": "Datum vyd\u00e1n\u00ed",
+    "HeaderRuntime": "D\u00e9lka",
+    "HeaderPlayCount": "P\u0159ehr\u00e1no (po\u010det)",
+    "HeaderSeason": "Sez\u00f3na",
+    "HeaderSeasonNumber": "\u010c\u00edslo sez\u00f3ny",
+    "HeaderSeries": "Seri\u00e1l:",
+    "HeaderNetwork": "S\u00ed\u0165",
+    "HeaderYear": "Rok:",
+    "HeaderYears": "V letech:",
+    "HeaderParentalRating": "Rodi\u010dovsk\u00e9 hodnocen\u00ed",
+    "HeaderCommunityRating": "Hodnocen\u00ed komunity",
+    "HeaderTrailers": "Trailery",
+    "HeaderSpecials": "Speci\u00e1ly",
+    "HeaderGameSystems": "Syst\u00e9m hry",
+    "HeaderPlayers": "Hr\u00e1\u010di:",
+    "HeaderAlbumArtists": "\u00dam\u011blci alba",
+    "HeaderAlbums": "Alba",
+    "HeaderDisc": "Disk",
+    "HeaderTrack": "Stopa",
+    "HeaderAudio": "Zvuk",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Vlo\u017een\u00fd obr\u00e1zek",
+    "HeaderResolution": "Rozli\u0161en\u00ed",
+    "HeaderSubtitles": "Titulky",
+    "HeaderGenres": "\u017d\u00e1nry",
+    "HeaderCountries": "Zem\u011b",
+    "HeaderStatus": "Stav",
+    "HeaderTracks": "Stopy",
+    "HeaderMusicArtist": "Hudebn\u00ed \u00fam\u011blec",
+    "HeaderLocked": "Uzam\u010deno",
+    "HeaderStudios": "Studia",
+    "HeaderActor": "Herci",
+    "HeaderComposer": "Skladatel\u00e9",
+    "HeaderDirector": "Re\u017eis\u00e9\u0159i",
+    "HeaderGuestStar": "Hostuj\u00edc\u00ed hv\u011bzda",
+    "HeaderProducer": "Producenti",
+    "HeaderWriter": "Spisovatel\u00e9",
+    "HeaderParentalRatings": "Rodi\u010dovsk\u00e1 hodnocen\u00ed",
+    "HeaderCommunityRatings": "Hodnocen\u00ed komunity",
+    "StartupEmbyServerIsLoading": "Emby Server je na\u010d\u00edt\u00e1n. Zkuste to pros\u00edm znovu v brzk\u00e9 dob\u011b."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/da.json b/Emby.Server.Implementations/Localization/Core/da.json
new file mode 100644
index 000000000..d2a628a80
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/da.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Enhed: {1}",
+    "UserDownloadingItemWithValues": "{0} henter {1}",
+    "FolderTypeMixed": "Blandet indhold",
+    "FolderTypeMovies": "FIlm",
+    "FolderTypeMusic": "Musik",
+    "FolderTypeAdultVideos": "Voksenfilm",
+    "FolderTypePhotos": "Fotos",
+    "FolderTypeMusicVideos": "Musikvideoer",
+    "FolderTypeHomeVideos": "Hjemmevideoer",
+    "FolderTypeGames": "Spil",
+    "FolderTypeBooks": "B\u00f8ger",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Nedarv",
+    "HeaderCastCrew": "Medvirkende",
+    "HeaderPeople": "Mennesker",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Kapitel {0}",
+    "NameSeasonNumber": "S\u00e6son {0}",
+    "LabelExit": "Afslut",
+    "LabelVisitCommunity": "Bes\u00f8g F\u00e6lleskab",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api dokumentation",
+    "LabelDeveloperResources": "Udviklerressourcer",
+    "LabelBrowseLibrary": "Gennemse bibliotek",
+    "LabelConfigureServer": "Konfigurer Emby",
+    "LabelRestartServer": "Genstart Server",
+    "CategorySync": "Sync",
+    "CategoryUser": "Bruger",
+    "CategorySystem": "System",
+    "CategoryApplication": "Program",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin fejl",
+    "NotificationOptionApplicationUpdateAvailable": "Programopdatering tilg\u00e6ngelig",
+    "NotificationOptionApplicationUpdateInstalled": "Programopdatering installeret",
+    "NotificationOptionPluginUpdateInstalled": "Opdatering til plugin installeret",
+    "NotificationOptionPluginInstalled": "Plugin installeret",
+    "NotificationOptionPluginUninstalled": "Plugin afinstalleret",
+    "NotificationOptionVideoPlayback": "Videoafspilning startet",
+    "NotificationOptionAudioPlayback": "Lydafspilning startet",
+    "NotificationOptionGamePlayback": "Spilafspilning startet",
+    "NotificationOptionVideoPlaybackStopped": "Videoafspilning stoppet",
+    "NotificationOptionAudioPlaybackStopped": "Lydafspilning stoppet",
+    "NotificationOptionGamePlaybackStopped": "Spilafspilning stoppet",
+    "NotificationOptionTaskFailed": "Fejl i planlagt opgave",
+    "NotificationOptionInstallationFailed": "Fejl ved installation",
+    "NotificationOptionNewLibraryContent": "Nyt indhold tilf\u00f8jet",
+    "NotificationOptionNewLibraryContentMultiple": "Nyt indhold tilf\u00f8jet (flere)",
+    "NotificationOptionCameraImageUploaded": "Kamerabillede tilf\u00f8jet",
+    "NotificationOptionUserLockedOut": "Bruger l\u00e5st",
+    "NotificationOptionServerRestartRequired": "Genstart af serveren p\u00e5kr\u00e6vet",
+    "ViewTypePlaylists": "Afspilningslister",
+    "ViewTypeMovies": "Film",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Spil",
+    "ViewTypeMusic": "Musik",
+    "ViewTypeMusicGenres": "Genrer",
+    "ViewTypeMusicArtists": "Artister",
+    "ViewTypeBoxSets": "Samlinger",
+    "ViewTypeChannels": "Kanaler",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Vises nu",
+    "ViewTypeLatestGames": "Seneste spil",
+    "ViewTypeRecentlyPlayedGames": "Afspillet for nylig",
+    "ViewTypeGameFavorites": "Favoritter",
+    "ViewTypeGameSystems": "Spilsystemer",
+    "ViewTypeGameGenres": "Genrer",
+    "ViewTypeTvResume": "Forts\u00e6t",
+    "ViewTypeTvNextUp": "N\u00e6ste",
+    "ViewTypeTvLatest": "Seneste",
+    "ViewTypeTvShowSeries": "Serier",
+    "ViewTypeTvGenres": "Genrer",
+    "ViewTypeTvFavoriteSeries": "Favoritserier",
+    "ViewTypeTvFavoriteEpisodes": "Favoritepisoder",
+    "ViewTypeMovieResume": "Forts\u00e6t",
+    "ViewTypeMovieLatest": "Seneste",
+    "ViewTypeMovieMovies": "Film",
+    "ViewTypeMovieCollections": "Samlinger",
+    "ViewTypeMovieFavorites": "Favoritter",
+    "ViewTypeMovieGenres": "Genrer",
+    "ViewTypeMusicLatest": "Seneste",
+    "ViewTypeMusicPlaylists": "Afspilningslister",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Albumartister",
+    "HeaderOtherDisplaySettings": "Indstillinger for visning",
+    "ViewTypeMusicSongs": "Sange",
+    "ViewTypeMusicFavorites": "Favoritter",
+    "ViewTypeMusicFavoriteAlbums": "Favoritalbums",
+    "ViewTypeMusicFavoriteArtists": "Favoritartister",
+    "ViewTypeMusicFavoriteSongs": "Favoritsange",
+    "ViewTypeFolders": "Mapper",
+    "ViewTypeLiveTvRecordingGroups": "Optagelser",
+    "ViewTypeLiveTvChannels": "Kanaler",
+    "ScheduledTaskFailedWithName": "{0} fejlede",
+    "LabelRunningTimeValue": "K\u00f8rselstid: {0}",
+    "ScheduledTaskStartedWithName": "{0} startet",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} blev installeret",
+    "PluginUpdatedWithName": "{0} blev opdateret",
+    "PluginUninstalledWithName": "{0} blev afinstalleret",
+    "ItemAddedWithName": "{0} blev tilf\u00f8jet til biblioteket",
+    "ItemRemovedWithName": "{0} blev fjernet fra biblioteket",
+    "LabelIpAddressValue": "IP-adresse: {0}",
+    "DeviceOnlineWithName": "{0} er forbundet",
+    "UserOnlineFromDevice": "{0} er online fra {1}",
+    "ProviderValue": "Udbyder: {0}",
+    "SubtitlesDownloadedForItem": "Undertekster hentet til {0}",
+    "UserConfigurationUpdatedWithName": "Brugerkonfigurationen for {0} er blevet opdateret",
+    "UserCreatedWithName": "Bruger {0} er skabt",
+    "UserPasswordChangedWithName": "Adgangskoden for {0} er blevet \u00e6ndret",
+    "UserDeletedWithName": "Bruger {0} er slettet",
+    "MessageServerConfigurationUpdated": "Serverkonfigurationen er opdateret",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Serverkonfiguration sektion {0} er opdateret",
+    "MessageApplicationUpdated": "Emby er blevet opdateret",
+    "FailedLoginAttemptWithUserName": "Fejlslagent loginfors\u00f8g fra {0}",
+    "AuthenticationSucceededWithUserName": "{0} autentificeret",
+    "DeviceOfflineWithName": "{0} har afbrudt forbindelsen",
+    "UserLockedOutWithName": "Bruger {0} er blevet l\u00e5st",
+    "UserOfflineFromDevice": "{0} har afbrudt forbindelsen fra {1}",
+    "UserStartedPlayingItemWithValues": "{0} afspiller {1}",
+    "UserStoppedPlayingItemWithValues": "{0} har stoppet afpilningen af {1}",
+    "SubtitleDownloadFailureForItem": "Hentning af undertekster til {0} fejlede",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "Bruger",
+    "HeaderName": "Navn",
+    "HeaderDate": "Dato",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Udgivelsesdato",
+    "HeaderRuntime": "Varighed",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "S\u00e6son",
+    "HeaderSeasonNumber": "S\u00e6sonnummer",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Netv\u00e6rk",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "F\u00e6llesskabsvurdering",
+    "HeaderTrailers": "Trailere",
+    "HeaderSpecials": "S\u00e6rudsendelser",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disk",
+    "HeaderTrack": "Spor",
+    "HeaderAudio": "Lyd",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Indlejret billede",
+    "HeaderResolution": "Opl\u00f8sning",
+    "HeaderSubtitles": "Undertekster",
+    "HeaderGenres": "Genrer",
+    "HeaderCountries": "Lande",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Spor",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studier",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Aldersgr\u00e6nser",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/de.json b/Emby.Server.Implementations/Localization/Core/de.json
new file mode 100644
index 000000000..30e3d9215
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Bitte warten Sie w\u00e4hrend die Emby Datenbank aktualisiert wird. {0}% verarbeitet.",
+    "AppDeviceValues": "App: {0}, Ger\u00e4t: {1}",
+    "UserDownloadingItemWithValues": "{0} l\u00e4dt {1} herunter",
+    "FolderTypeMixed": "Gemischte Inhalte",
+    "FolderTypeMovies": "Filme",
+    "FolderTypeMusic": "Musik",
+    "FolderTypeAdultVideos": "Videos f\u00fcr Erwachsene",
+    "FolderTypePhotos": "Fotos",
+    "FolderTypeMusicVideos": "Musikvideos",
+    "FolderTypeHomeVideos": "Heimvideos",
+    "FolderTypeGames": "Spiele",
+    "FolderTypeBooks": "B\u00fccher",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "\u00dcbernehmen",
+    "HeaderCastCrew": "Besetzung & Crew",
+    "HeaderPeople": "Personen",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Kapitel {0}",
+    "NameSeasonNumber": "Staffel {0}",
+    "LabelExit": "Beenden",
+    "LabelVisitCommunity": "Besuche die Community",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Dokumentation",
+    "LabelDeveloperResources": "Entwickler Ressourcen",
+    "LabelBrowseLibrary": "Bibliothek durchsuchen",
+    "LabelConfigureServer": "Konfiguriere Emby",
+    "LabelRestartServer": "Server neustarten",
+    "CategorySync": "Sync",
+    "CategoryUser": "Benutzer",
+    "CategorySystem": "System",
+    "CategoryApplication": "Anwendung",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin Fehler",
+    "NotificationOptionApplicationUpdateAvailable": "Anwendungsaktualisierung verf\u00fcgbar",
+    "NotificationOptionApplicationUpdateInstalled": "Anwendungsaktualisierung installiert",
+    "NotificationOptionPluginUpdateInstalled": "Pluginaktualisierung installiert",
+    "NotificationOptionPluginInstalled": "Plugin installiert",
+    "NotificationOptionPluginUninstalled": "Plugin deinstalliert",
+    "NotificationOptionVideoPlayback": "Videowiedergabe gestartet",
+    "NotificationOptionAudioPlayback": "Audiowiedergabe gestartet",
+    "NotificationOptionGamePlayback": "Spielwiedergabe gestartet",
+    "NotificationOptionVideoPlaybackStopped": "Videowiedergabe gestoppt",
+    "NotificationOptionAudioPlaybackStopped": "Audiowiedergabe gestoppt",
+    "NotificationOptionGamePlaybackStopped": "Spielwiedergabe gestoppt",
+    "NotificationOptionTaskFailed": "Fehler bei geplanter Aufgabe",
+    "NotificationOptionInstallationFailed": "Installationsfehler",
+    "NotificationOptionNewLibraryContent": "Neuer Inhalt hinzugef\u00fcgt",
+    "NotificationOptionNewLibraryContentMultiple": "Neuen Inhalte hinzugef\u00fcgt (mehrere)",
+    "NotificationOptionCameraImageUploaded": "Kamera Bild hochgeladen",
+    "NotificationOptionUserLockedOut": "Benutzer ausgeschlossen",
+    "NotificationOptionServerRestartRequired": "Serverneustart notwendig",
+    "ViewTypePlaylists": "Wiedergabelisten",
+    "ViewTypeMovies": "Filme",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Spiele",
+    "ViewTypeMusic": "Musik",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "K\u00fcnstler",
+    "ViewTypeBoxSets": "Sammlungen",
+    "ViewTypeChannels": "Kan\u00e4le",
+    "ViewTypeLiveTV": "Live-TV",
+    "ViewTypeLiveTvNowPlaying": "Gerade ausgestrahlt",
+    "ViewTypeLatestGames": "Neueste Spiele",
+    "ViewTypeRecentlyPlayedGames": "K\u00fcrzlich abgespielt",
+    "ViewTypeGameFavorites": "Favoriten",
+    "ViewTypeGameSystems": "Spielesysteme",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Fortsetzen",
+    "ViewTypeTvNextUp": "Als n\u00e4chstes",
+    "ViewTypeTvLatest": "Neueste",
+    "ViewTypeTvShowSeries": "Serien",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Serien Favoriten",
+    "ViewTypeTvFavoriteEpisodes": "Episoden Favoriten",
+    "ViewTypeMovieResume": "Fortsetzen",
+    "ViewTypeMovieLatest": "Neueste",
+    "ViewTypeMovieMovies": "Filme",
+    "ViewTypeMovieCollections": "Sammlungen",
+    "ViewTypeMovieFavorites": "Favoriten",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Neueste",
+    "ViewTypeMusicPlaylists": "Wiedergabelisten",
+    "ViewTypeMusicAlbums": "Alben",
+    "ViewTypeMusicAlbumArtists": "Album-K\u00fcnstler",
+    "HeaderOtherDisplaySettings": "Anzeige Einstellungen",
+    "ViewTypeMusicSongs": "Lieder",
+    "ViewTypeMusicFavorites": "Favoriten",
+    "ViewTypeMusicFavoriteAlbums": "Album Favoriten",
+    "ViewTypeMusicFavoriteArtists": "Interpreten Favoriten",
+    "ViewTypeMusicFavoriteSongs": "Lieder Favoriten",
+    "ViewTypeFolders": "Verzeichnisse",
+    "ViewTypeLiveTvRecordingGroups": "Aufnahmen",
+    "ViewTypeLiveTvChannels": "Kan\u00e4le",
+    "ScheduledTaskFailedWithName": "{0} fehlgeschlagen",
+    "LabelRunningTimeValue": "Laufzeit: {0}",
+    "ScheduledTaskStartedWithName": "{0} gestartet",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} wurde installiert",
+    "PluginUpdatedWithName": "{0} wurde aktualisiert",
+    "PluginUninstalledWithName": "{0} wurde deinstalliert",
+    "ItemAddedWithName": "{0} wurde der Bibliothek hinzugef\u00fcgt",
+    "ItemRemovedWithName": "{0} wurde aus der Bibliothek entfernt",
+    "LabelIpAddressValue": "IP Adresse: {0}",
+    "DeviceOnlineWithName": "{0} ist verbunden",
+    "UserOnlineFromDevice": "{0} ist online von {1}",
+    "ProviderValue": "Anbieter: {0}",
+    "SubtitlesDownloadedForItem": "Untertitel heruntergeladen f\u00fcr {0}",
+    "UserConfigurationUpdatedWithName": "Benutzereinstellungen wurden aktualisiert f\u00fcr {0}",
+    "UserCreatedWithName": "Benutzer {0} wurde erstellt",
+    "UserPasswordChangedWithName": "Das Passwort f\u00fcr Benutzer {0} wurde ge\u00e4ndert",
+    "UserDeletedWithName": "Benutzer {0} wurde gel\u00f6scht",
+    "MessageServerConfigurationUpdated": "Server Einstellungen wurden aktualisiert",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Der Server Einstellungsbereich {0} wurde aktualisiert",
+    "MessageApplicationUpdated": "Emby Server wurde auf den neusten Stand gebracht.",
+    "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
+    "AuthenticationSucceededWithUserName": "{0} erfolgreich authentifiziert",
+    "DeviceOfflineWithName": "{0} wurde getrennt",
+    "UserLockedOutWithName": "Benutzer {0} wurde ausgeschlossen",
+    "UserOfflineFromDevice": "{0} wurde getrennt von {1}",
+    "UserStartedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} gestartet",
+    "UserStoppedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} beendet",
+    "SubtitleDownloadFailureForItem": "Download der Untertitel fehlgeschlagen f\u00fcr {0}",
+    "HeaderUnidentified": "Nicht identifiziert",
+    "HeaderImagePrimary": "Bevorzugt",
+    "HeaderImageBackdrop": "Hintergrund",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Benutzerbild",
+    "HeaderOverview": "\u00dcbersicht",
+    "HeaderShortOverview": "Kurz\u00fcbersicht",
+    "HeaderType": "Typ",
+    "HeaderSeverity": "Schwere",
+    "HeaderUser": "Benutzer",
+    "HeaderName": "Name",
+    "HeaderDate": "Datum",
+    "HeaderPremiereDate": "Premiere Datum",
+    "HeaderDateAdded": "Datum hinzugef\u00fcgt",
+    "HeaderReleaseDate": "Ver\u00f6ffentlichungsdatum",
+    "HeaderRuntime": "Laufzeit",
+    "HeaderPlayCount": "Anzahl Wiedergaben",
+    "HeaderSeason": "Staffel",
+    "HeaderSeasonNumber": "Staffel Nummer",
+    "HeaderSeries": "Serien:",
+    "HeaderNetwork": "Netzwerk",
+    "HeaderYear": "Jahr:",
+    "HeaderYears": "Jahre:",
+    "HeaderParentalRating": "Altersfreigabe",
+    "HeaderCommunityRating": "Community Bewertung",
+    "HeaderTrailers": "Trailer",
+    "HeaderSpecials": "Extras",
+    "HeaderGameSystems": "Spiele Systeme",
+    "HeaderPlayers": "Spieler:",
+    "HeaderAlbumArtists": "Album K\u00fcnstler",
+    "HeaderAlbums": "Alben",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "St\u00fcck",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Integriertes Bild",
+    "HeaderResolution": "Aufl\u00f6sung",
+    "HeaderSubtitles": "Untertitel",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "L\u00e4nder",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Lieder",
+    "HeaderMusicArtist": "Musik K\u00fcnstler",
+    "HeaderLocked": "Blockiert",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Schauspieler",
+    "HeaderComposer": "Komponierer",
+    "HeaderDirector": "Regie",
+    "HeaderGuestStar": "Gaststar",
+    "HeaderProducer": "Produzenten",
+    "HeaderWriter": "Autoren",
+    "HeaderParentalRatings": "Altersbeschr\u00e4nkung",
+    "HeaderCommunityRatings": "Community Bewertungen",
+    "StartupEmbyServerIsLoading": "Emby Server startet, bitte versuchen Sie es gleich noch einmal."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/el.json b/Emby.Server.Implementations/Localization/Core/el.json
new file mode 100644
index 000000000..9e2d321cc
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/el.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "\u0391\u03bd\u03ac\u03bc\u03b5\u03b9\u03ba\u03c4\u03bf \u03a0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03bf",
+    "FolderTypeMovies": "\u03a4\u03b1\u03b9\u03bd\u03af\u03b5\u03c2",
+    "FolderTypeMusic": "\u039c\u03bf\u03c5\u03c3\u03b9\u03ba\u03ae",
+    "FolderTypeAdultVideos": "\u03a4\u03b1\u03b9\u03bd\u03af\u03b5\u03c2 \u0395\u03bd\u03b7\u03bb\u03af\u03ba\u03c9\u03bd",
+    "FolderTypePhotos": "\u03a6\u03c9\u03c4\u03bf\u03b3\u03c1\u03b1\u03c6\u03af\u03b5\u03c2",
+    "FolderTypeMusicVideos": "\u039c\u03bf\u03c5\u03c3\u03b9\u03ba\u03ac \u0392\u03af\u03bd\u03c4\u03b5\u03bf",
+    "FolderTypeHomeVideos": "\u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b9\u03ba\u03ac \u0392\u03af\u03bd\u03c4\u03b5\u03bf",
+    "FolderTypeGames": "\u03a0\u03b1\u03b9\u03c7\u03bd\u03af\u03b4\u03b9\u03b1",
+    "FolderTypeBooks": "\u0392\u03b9\u03b2\u03bb\u03af\u03b1",
+    "FolderTypeTvShows": "\u03a4\u03b7\u03bb\u03b5\u03cc\u03c1\u03b1\u03c3\u03b7",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "\u0397\u03b8\u03bf\u03c0\u03bf\u03b9\u03bf\u03af \u03ba\u03b1\u03b9 \u03c3\u03c5\u03bd\u03b5\u03c1\u03b3\u03b5\u03af\u03bf",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "\u0388\u03be\u03bf\u03b4\u03bf\u03c2",
+    "LabelVisitCommunity": "\u039a\u03bf\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "\u03a0\u03b7\u03b3\u03ad\u03c2 \u03a0\u03c1\u03bf\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03b9\u03c3\u03c4\u03ae",
+    "LabelBrowseLibrary": "\u03a0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03b8\u03b5\u03af\u03c4\u03b5 \u03c3\u03c4\u03b7 \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7",
+    "LabelConfigureServer": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 Emby",
+    "LabelRestartServer": "\u0395\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae",
+    "CategorySync": "\u03a3\u03c5\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03cc\u03c2",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "\u0388\u03ba\u03b4\u03bf\u03c3\u03b7 {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "\u0389\u03c7\u03bf\u03c2",
+    "HeaderVideo": "\u0392\u03af\u03bd\u03c4\u03b5\u03bf",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/en-GB.json b/Emby.Server.Implementations/Localization/Core/en-GB.json
new file mode 100644
index 000000000..493c6c4e9
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/en-GB.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Series {0}",
+    "LabelExit": "Exit",
+    "LabelVisitCommunity": "Visit Community",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Browse Library",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "Restart Server",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New (multiple) content added",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Showing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favourites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favourite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favourite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favourites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favourites",
+    "ViewTypeMusicFavoriteAlbums": "Favourite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favourite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favourite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/en-US.json b/Emby.Server.Implementations/Localization/Core/en-US.json
new file mode 100644
index 000000000..bc0dc236d
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/en-US.json
@@ -0,0 +1,178 @@
+{
+  "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+  "AppDeviceValues": "App: {0}, Device: {1}",
+  "UserDownloadingItemWithValues": "{0} is downloading {1}",
+  "FolderTypeMixed": "Mixed content",
+  "FolderTypeMovies": "Movies",
+  "FolderTypeMusic": "Music",
+  "FolderTypeAdultVideos": "Adult videos",
+  "FolderTypePhotos": "Photos",
+  "FolderTypeMusicVideos": "Music videos",
+  "FolderTypeHomeVideos": "Home videos",
+  "FolderTypeGames": "Games",
+  "FolderTypeBooks": "Books",
+  "FolderTypeTvShows": "TV",
+  "FolderTypeInherit": "Inherit",
+  "HeaderCastCrew": "Cast & Crew",
+  "HeaderPeople": "People",
+  "ValueSpecialEpisodeName": "Special - {0}",
+  "LabelChapterName": "Chapter {0}",
+  "NameSeasonUnknown": "Season Unknown",
+  "NameSeasonNumber": "Season {0}",
+  "LabelExit": "Exit",
+  "LabelVisitCommunity": "Visit Community",
+  "LabelGithub": "Github",
+  "LabelApiDocumentation": "Api Documentation",
+  "LabelDeveloperResources": "Developer Resources",
+  "LabelBrowseLibrary": "Browse Library",
+  "LabelConfigureServer": "Configure Emby",
+  "LabelRestartServer": "Restart Server",
+  "CategorySync": "Sync",
+  "CategoryUser": "User",
+  "CategorySystem": "System",
+  "CategoryApplication": "Application",
+  "CategoryPlugin": "Plugin",
+  "NotificationOptionPluginError": "Plugin failure",
+  "NotificationOptionApplicationUpdateAvailable": "Application update available",
+  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+  "NotificationOptionPluginInstalled": "Plugin installed",
+  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+  "NotificationOptionVideoPlayback": "Video playback started",
+  "NotificationOptionAudioPlayback": "Audio playback started",
+  "NotificationOptionGamePlayback": "Game playback started",
+  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+  "NotificationOptionTaskFailed": "Scheduled task failure",
+  "NotificationOptionInstallationFailed": "Installation failure",
+  "NotificationOptionNewLibraryContent": "New content added",
+  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+  "NotificationOptionUserLockedOut": "User locked out",
+  "NotificationOptionServerRestartRequired": "Server restart required",
+  "ViewTypePlaylists": "Playlists",
+  "ViewTypeMovies": "Movies",
+  "ViewTypeTvShows": "TV",
+  "ViewTypeGames": "Games",
+  "ViewTypeMusic": "Music",
+  "ViewTypeMusicGenres": "Genres",
+  "ViewTypeMusicArtists": "Artists",
+  "ViewTypeBoxSets": "Collections",
+  "ViewTypeChannels": "Channels",
+  "ViewTypeLiveTV": "Live TV",
+  "ViewTypeLiveTvNowPlaying": "Now Airing",
+  "ViewTypeLatestGames": "Latest Games",
+  "ViewTypeRecentlyPlayedGames": "Recently Played",
+  "ViewTypeGameFavorites": "Favorites",
+  "ViewTypeGameSystems": "Game Systems",
+  "ViewTypeGameGenres": "Genres",
+  "ViewTypeTvResume": "Resume",
+  "ViewTypeTvNextUp": "Next Up",
+  "ViewTypeTvLatest": "Latest",
+  "ViewTypeTvShowSeries": "Series",
+  "ViewTypeTvGenres": "Genres",
+  "ViewTypeTvFavoriteSeries": "Favorite Series",
+  "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+  "ViewTypeMovieResume": "Resume",
+  "ViewTypeMovieLatest": "Latest",
+  "ViewTypeMovieMovies": "Movies",
+  "ViewTypeMovieCollections": "Collections",
+  "ViewTypeMovieFavorites": "Favorites",
+  "ViewTypeMovieGenres": "Genres",
+  "ViewTypeMusicLatest": "Latest",
+  "ViewTypeMusicPlaylists": "Playlists",
+  "ViewTypeMusicAlbums": "Albums",
+  "ViewTypeMusicAlbumArtists": "Album Artists",
+  "HeaderOtherDisplaySettings": "Display Settings",
+  "ViewTypeMusicSongs": "Songs",
+  "ViewTypeMusicFavorites": "Favorites",
+  "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+  "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+  "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+  "ViewTypeFolders": "Folders",
+  "ViewTypeLiveTvRecordingGroups": "Recordings",
+  "ViewTypeLiveTvChannels": "Channels",
+  "ScheduledTaskFailedWithName": "{0} failed",
+  "LabelRunningTimeValue": "Running time: {0}",
+  "ScheduledTaskStartedWithName": "{0} started",
+  "VersionNumber": "Version {0}",
+  "PluginInstalledWithName": "{0} was installed",
+  "PluginUpdatedWithName": "{0} was updated",
+  "PluginUninstalledWithName": "{0} was uninstalled",
+  "ItemAddedWithName": "{0} was added to the library",
+  "ItemRemovedWithName": "{0} was removed from the library",
+  "LabelIpAddressValue": "Ip address: {0}",
+  "DeviceOnlineWithName": "{0} is connected",
+  "UserOnlineFromDevice": "{0} is online from {1}",
+  "ProviderValue": "Provider: {0}",
+  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+  "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+  "UserCreatedWithName": "User {0} has been created",
+  "UserPasswordChangedWithName": "Password has been changed for user {0}",
+  "UserDeletedWithName": "User {0} has been deleted",
+  "MessageServerConfigurationUpdated": "Server configuration has been updated",
+  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+  "MessageApplicationUpdated": "Emby Server has been updated",
+  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+  "DeviceOfflineWithName": "{0} has disconnected",
+  "UserLockedOutWithName": "User {0} has been locked out",
+  "UserOfflineFromDevice": "{0} has disconnected from {1}",
+  "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+  "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+  "HeaderUnidentified": "Unidentified",
+  "HeaderImagePrimary": "Primary",
+  "HeaderImageBackdrop": "Backdrop",
+  "HeaderImageLogo": "Logo",
+  "HeaderUserPrimaryImage": "User Image",
+  "HeaderOverview": "Overview",
+  "HeaderShortOverview": "Short Overview",
+  "HeaderType": "Type",
+  "HeaderSeverity": "Severity",
+  "HeaderUser": "User",
+  "HeaderName": "Name",
+  "HeaderDate": "Date",
+  "HeaderPremiereDate": "Premiere Date",
+  "HeaderDateAdded": "Date Added",
+  "HeaderReleaseDate": "Release date",
+  "HeaderRuntime": "Runtime",
+  "HeaderPlayCount": "Play Count",
+  "HeaderSeason": "Season",
+  "HeaderSeasonNumber": "Season number",
+  "HeaderSeries": "Series:",
+  "HeaderNetwork": "Network",
+  "HeaderYear": "Year:",
+  "HeaderYears": "Years:",
+  "HeaderParentalRating": "Parental Rating",
+  "HeaderCommunityRating": "Community rating",
+  "HeaderTrailers": "Trailers",
+  "HeaderSpecials": "Specials",
+  "HeaderGameSystems": "Game Systems",
+  "HeaderPlayers": "Players:",
+  "HeaderAlbumArtists": "Album Artists",
+  "HeaderAlbums": "Albums",
+  "HeaderDisc": "Disc",
+  "HeaderTrack": "Track",
+  "HeaderAudio": "Audio",
+  "HeaderVideo": "Video",
+  "HeaderEmbeddedImage": "Embedded image",
+  "HeaderResolution": "Resolution",
+  "HeaderSubtitles": "Subtitles",
+  "HeaderGenres": "Genres",
+  "HeaderCountries": "Countries",
+  "HeaderStatus": "Status",
+  "HeaderTracks": "Tracks",
+  "HeaderMusicArtist": "Music artist",
+  "HeaderLocked": "Locked",
+  "HeaderStudios": "Studios",
+  "HeaderActor": "Actors",
+  "HeaderComposer": "Composers",
+  "HeaderDirector": "Directors",
+  "HeaderGuestStar": "Guest star",
+  "HeaderProducer": "Producers",
+  "HeaderWriter": "Writers",
+  "HeaderParentalRatings": "Parental Ratings",
+  "HeaderCommunityRatings": "Community ratings",
+  "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/es-AR.json b/Emby.Server.Implementations/Localization/Core/es-AR.json
new file mode 100644
index 000000000..0555aa9d9
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Salir",
+    "LabelVisitCommunity": "Visit Community",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentaci\u00f3n API",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Browse Library",
+    "LabelConfigureServer": "Configurar Emby",
+    "LabelRestartServer": "Reiniciar el servidor",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/es-MX.json b/Emby.Server.Implementations/Localization/Core/es-MX.json
new file mode 100644
index 000000000..630c7a037
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Por favor espere mientras la base de datos de su Servidor Emby es actualizada. {0}% completo.",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
+    "UserDownloadingItemWithValues": "{0} esta descargando {1}",
+    "FolderTypeMixed": "Contenido mezclado",
+    "FolderTypeMovies": "Pel\u00edculas",
+    "FolderTypeMusic": "M\u00fasica",
+    "FolderTypeAdultVideos": "Videos para adultos",
+    "FolderTypePhotos": "Fotos",
+    "FolderTypeMusicVideos": "Videos musicales",
+    "FolderTypeHomeVideos": "Videos caseros",
+    "FolderTypeGames": "Juegos",
+    "FolderTypeBooks": "Libros",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Heredar",
+    "HeaderCastCrew": "Reparto y Personal",
+    "HeaderPeople": "Personas",
+    "ValueSpecialEpisodeName": "Especial: {0}",
+    "LabelChapterName": "Cap\u00edtulo {0}",
+    "NameSeasonNumber": "Temporada {0}",
+    "LabelExit": "Salir",
+    "LabelVisitCommunity": "Visitar la Comunidad",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentaci\u00f3n del API",
+    "LabelDeveloperResources": "Recursos para Desarrolladores",
+    "LabelBrowseLibrary": "Explorar Biblioteca",
+    "LabelConfigureServer": "Configurar Emby",
+    "LabelRestartServer": "Reiniciar el Servidor",
+    "CategorySync": "Sinc.",
+    "CategoryUser": "Usuario",
+    "CategorySystem": "Sistema",
+    "CategoryApplication": "Aplicaci\u00f3n",
+    "CategoryPlugin": "Complemento",
+    "NotificationOptionPluginError": "Falla de complemento",
+    "NotificationOptionApplicationUpdateAvailable": "Actualizaci\u00f3n de aplicaci\u00f3n disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Actualizaci\u00f3n de aplicaci\u00f3n instalada",
+    "NotificationOptionPluginUpdateInstalled": "Actualizaci\u00f3n de complemento instalada",
+    "NotificationOptionPluginInstalled": "Complemento instalado",
+    "NotificationOptionPluginUninstalled": "Complemento desinstalado",
+    "NotificationOptionVideoPlayback": "Reproducci\u00f3n de video iniciada",
+    "NotificationOptionAudioPlayback": "Reproducci\u00f3n de audio iniciada",
+    "NotificationOptionGamePlayback": "Ejecuci\u00f3n de juego iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reproducci\u00f3n de video detenida",
+    "NotificationOptionAudioPlaybackStopped": "Reproducci\u00f3n de audio detenida",
+    "NotificationOptionGamePlaybackStopped": "Ejecuci\u00f3n de juego detenida",
+    "NotificationOptionTaskFailed": "Falla de tarea programada",
+    "NotificationOptionInstallationFailed": "Falla de instalaci\u00f3n",
+    "NotificationOptionNewLibraryContent": "Nuevo contenido agregado",
+    "NotificationOptionNewLibraryContentMultiple": "Nuevo contenido agregado (varios)",
+    "NotificationOptionCameraImageUploaded": "Imagen de la c\u00e1mara subida",
+    "NotificationOptionUserLockedOut": "Usuario bloqueado",
+    "NotificationOptionServerRestartRequired": "Reinicio del servidor requerido",
+    "ViewTypePlaylists": "Listas de Reproducci\u00f3n",
+    "ViewTypeMovies": "Pel\u00edculas",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Juegos",
+    "ViewTypeMusic": "M\u00fasica",
+    "ViewTypeMusicGenres": "G\u00e9neros",
+    "ViewTypeMusicArtists": "Artistas",
+    "ViewTypeBoxSets": "Colecciones",
+    "ViewTypeChannels": "Canales",
+    "ViewTypeLiveTV": "TV en Vivo",
+    "ViewTypeLiveTvNowPlaying": "Transmiti\u00e9ndose",
+    "ViewTypeLatestGames": "Juegos Recientes",
+    "ViewTypeRecentlyPlayedGames": "Reproducido Reci\u00e9ntemente",
+    "ViewTypeGameFavorites": "Favoritos",
+    "ViewTypeGameSystems": "Sistemas de Juego",
+    "ViewTypeGameGenres": "G\u00e9neros",
+    "ViewTypeTvResume": "Continuar",
+    "ViewTypeTvNextUp": "A Continuaci\u00f3n",
+    "ViewTypeTvLatest": "Recientes",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "G\u00e9neros",
+    "ViewTypeTvFavoriteSeries": "Series Favoritas",
+    "ViewTypeTvFavoriteEpisodes": "Episodios Favoritos",
+    "ViewTypeMovieResume": "Continuar",
+    "ViewTypeMovieLatest": "Recientes",
+    "ViewTypeMovieMovies": "Pel\u00edculas",
+    "ViewTypeMovieCollections": "Colecciones",
+    "ViewTypeMovieFavorites": "Favoritos",
+    "ViewTypeMovieGenres": "G\u00e9neros",
+    "ViewTypeMusicLatest": "Recientes",
+    "ViewTypeMusicPlaylists": "Listas",
+    "ViewTypeMusicAlbums": "\u00c1lbumes",
+    "ViewTypeMusicAlbumArtists": "Artistas del \u00c1lbum",
+    "HeaderOtherDisplaySettings": "Configuraci\u00f3n de Pantalla",
+    "ViewTypeMusicSongs": "Canciones",
+    "ViewTypeMusicFavorites": "Favoritos",
+    "ViewTypeMusicFavoriteAlbums": "\u00c1lbumes Favoritos",
+    "ViewTypeMusicFavoriteArtists": "Artistas Favoritos",
+    "ViewTypeMusicFavoriteSongs": "Canciones Favoritas",
+    "ViewTypeFolders": "Carpetas",
+    "ViewTypeLiveTvRecordingGroups": "Grabaciones",
+    "ViewTypeLiveTvChannels": "Canales",
+    "ScheduledTaskFailedWithName": "{0} fall\u00f3",
+    "LabelRunningTimeValue": "Duraci\u00f3n: {0}",
+    "ScheduledTaskStartedWithName": "{0} Iniciado",
+    "VersionNumber": "Versi\u00f3n {0}",
+    "PluginInstalledWithName": "{0} fue instalado",
+    "PluginUpdatedWithName": "{0} fue actualizado",
+    "PluginUninstalledWithName": "{0} fue desinstalado",
+    "ItemAddedWithName": "{0} fue agregado a la biblioteca",
+    "ItemRemovedWithName": "{0} fue removido de la biblioteca",
+    "LabelIpAddressValue": "Direcci\u00f3n IP: {0}",
+    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
+    "UserOnlineFromDevice": "{0} est\u00e1 en l\u00ednea desde {1}",
+    "ProviderValue": "Proveedor: {0}",
+    "SubtitlesDownloadedForItem": "Subt\u00edtulos descargados para {0}",
+    "UserConfigurationUpdatedWithName": "Se ha actualizado la configuraci\u00f3n del usuario {0}",
+    "UserCreatedWithName": "Se ha creado el usuario {0}",
+    "UserPasswordChangedWithName": "Se ha cambiado la contrase\u00f1a para el usuario {0}",
+    "UserDeletedWithName": "Se ha eliminado al usuario {0}",
+    "MessageServerConfigurationUpdated": "Se ha actualizado la configuraci\u00f3n del servidor",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Se ha actualizado la secci\u00f3n {0} de la configuraci\u00f3n del servidor",
+    "MessageApplicationUpdated": "El servidor Emby ha sido actualizado",
+    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesi\u00f3n de {0}",
+    "AuthenticationSucceededWithUserName": "{0} autenticado con \u00e9xito",
+    "DeviceOfflineWithName": "{0} se ha desconectado",
+    "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
+    "UserOfflineFromDevice": "{0} se ha desconectado desde {1}",
+    "UserStartedPlayingItemWithValues": "{0} ha iniciado la reproducci\u00f3n de {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha detenido la reproducci\u00f3n de {1}",
+    "SubtitleDownloadFailureForItem": "Fall\u00f3 la descarga de subt\u00edtulos para {0}",
+    "HeaderUnidentified": "No Identificado",
+    "HeaderImagePrimary": "Principal",
+    "HeaderImageBackdrop": "Imagen de Fondo",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Imagen de Usuario",
+    "HeaderOverview": "Resumen",
+    "HeaderShortOverview": "Sinopsis corta:",
+    "HeaderType": "Tipo",
+    "HeaderSeverity": "Severidad",
+    "HeaderUser": "Usuario",
+    "HeaderName": "Nombre",
+    "HeaderDate": "Fecha",
+    "HeaderPremiereDate": "Fecha de Estreno",
+    "HeaderDateAdded": "Fecha de Adici\u00f3n",
+    "HeaderReleaseDate": "Fecha de estreno",
+    "HeaderRuntime": "Duraci\u00f3n",
+    "HeaderPlayCount": "Contador",
+    "HeaderSeason": "Temporada",
+    "HeaderSeasonNumber": "N\u00famero de temporada",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Cadena",
+    "HeaderYear": "A\u00f1o:",
+    "HeaderYears": "A\u00f1os:",
+    "HeaderParentalRating": "Clasificaci\u00f3n Parental",
+    "HeaderCommunityRating": "Calificaci\u00f3n de la comunidad",
+    "HeaderTrailers": "Tr\u00e1ilers",
+    "HeaderSpecials": "Especiales",
+    "HeaderGameSystems": "Sistemas de Juego",
+    "HeaderPlayers": "Reproductores:",
+    "HeaderAlbumArtists": "Artistas del \u00c1lbum",
+    "HeaderAlbums": "\u00c1lbumes",
+    "HeaderDisc": "Disco",
+    "HeaderTrack": "Pista",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Im\u00e1gen embebida",
+    "HeaderResolution": "Resoluci\u00f3n",
+    "HeaderSubtitles": "Subt\u00edtulos",
+    "HeaderGenres": "G\u00e9neros",
+    "HeaderCountries": "Pa\u00edses",
+    "HeaderStatus": "Estado",
+    "HeaderTracks": "Pistas",
+    "HeaderMusicArtist": "Int\u00e9rprete",
+    "HeaderLocked": "Bloqueado",
+    "HeaderStudios": "Estudios",
+    "HeaderActor": "Actores",
+    "HeaderComposer": "Compositores",
+    "HeaderDirector": "Directores",
+    "HeaderGuestStar": "Estrella invitada",
+    "HeaderProducer": "Productores",
+    "HeaderWriter": "Guionistas",
+    "HeaderParentalRatings": "Clasificaci\u00f3n Parental",
+    "HeaderCommunityRatings": "Clasificaciones de la comunidad",
+    "StartupEmbyServerIsLoading": "El servidor Emby esta cargando. Por favor intente de nuevo dentro de poco."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/es.json b/Emby.Server.Implementations/Localization/Core/es.json
new file mode 100644
index 000000000..d1a56240d
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Por favor espere mientras la base de datos de su servidor Emby se actualiza. {0}% completado.",
+    "AppDeviceValues": "Aplicaci\u00f3n: {0}, Dispositivo: {1}",
+    "UserDownloadingItemWithValues": "{0} est\u00e1 descargando {1}",
+    "FolderTypeMixed": "Contenido mezclado",
+    "FolderTypeMovies": "Peliculas",
+    "FolderTypeMusic": "Musica",
+    "FolderTypeAdultVideos": "Videos para adultos",
+    "FolderTypePhotos": "Fotos",
+    "FolderTypeMusicVideos": "Videos Musicales",
+    "FolderTypeHomeVideos": "Videos caseros",
+    "FolderTypeGames": "Juegos",
+    "FolderTypeBooks": "Libros",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Heredado",
+    "HeaderCastCrew": "Reparto y equipo t\u00e9cnico",
+    "HeaderPeople": "Gente",
+    "ValueSpecialEpisodeName": "Especial - {0}",
+    "LabelChapterName": "Cap\u00edtulo {0}",
+    "NameSeasonNumber": "Temporada {0}",
+    "LabelExit": "Salir",
+    "LabelVisitCommunity": "Visitar la comunidad",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentaci\u00f3n API",
+    "LabelDeveloperResources": "Recursos del Desarrollador",
+    "LabelBrowseLibrary": "Navegar biblioteca",
+    "LabelConfigureServer": "Configurar Emby",
+    "LabelRestartServer": "Reiniciar el servidor",
+    "CategorySync": "Sincronizar",
+    "CategoryUser": "Usuario",
+    "CategorySystem": "Sistema",
+    "CategoryApplication": "Aplicaci\u00f3n",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Error en plugin",
+    "NotificationOptionApplicationUpdateAvailable": "Disponible actualizaci\u00f3n de la aplicaci\u00f3n",
+    "NotificationOptionApplicationUpdateInstalled": "Se ha instalado la actualizaci\u00f3n de la aplicaci\u00f3n",
+    "NotificationOptionPluginUpdateInstalled": "Se ha instalado la actualizaci\u00f3n del plugin",
+    "NotificationOptionPluginInstalled": "Plugin instalado",
+    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
+    "NotificationOptionVideoPlayback": "Reproduccion de video a iniciado",
+    "NotificationOptionAudioPlayback": "Reproduccion de audio a iniciado",
+    "NotificationOptionGamePlayback": "Reproduccion de video juego a iniciado",
+    "NotificationOptionVideoPlaybackStopped": "Reproducci\u00f3n de video detenida",
+    "NotificationOptionAudioPlaybackStopped": "Reproducci\u00f3n de audio detenida",
+    "NotificationOptionGamePlaybackStopped": "Reproducci\u00f3n de juego detenida",
+    "NotificationOptionTaskFailed": "La tarea programada ha fallado",
+    "NotificationOptionInstallationFailed": "Fallo en la instalaci\u00f3n",
+    "NotificationOptionNewLibraryContent": "Nuevo contenido a\u00f1adido",
+    "NotificationOptionNewLibraryContentMultiple": "Nuevo contenido a\u00f1adido (multiple)",
+    "NotificationOptionCameraImageUploaded": "Imagen de camara se a carcado",
+    "NotificationOptionUserLockedOut": "Usuario bloqueado",
+    "NotificationOptionServerRestartRequired": "Se requiere el reinicio del servidor",
+    "ViewTypePlaylists": "Listas de reproducci\u00f3n",
+    "ViewTypeMovies": "Pel\u00edculas",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Juegos",
+    "ViewTypeMusic": "M\u00fasica",
+    "ViewTypeMusicGenres": "G\u00e9neros",
+    "ViewTypeMusicArtists": "Artistas",
+    "ViewTypeBoxSets": "Colecciones",
+    "ViewTypeChannels": "Canales",
+    "ViewTypeLiveTV": "Tv en vivo",
+    "ViewTypeLiveTvNowPlaying": "Transmiti\u00e9ndose ahora",
+    "ViewTypeLatestGames": "\u00daltimos juegos",
+    "ViewTypeRecentlyPlayedGames": "Reproducido recientemente",
+    "ViewTypeGameFavorites": "Favoritos",
+    "ViewTypeGameSystems": "Sistemas de juego",
+    "ViewTypeGameGenres": "G\u00e9neros",
+    "ViewTypeTvResume": "Reanudar",
+    "ViewTypeTvNextUp": "Pr\u00f3ximamente",
+    "ViewTypeTvLatest": "\u00daltimas",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "G\u00e9neros",
+    "ViewTypeTvFavoriteSeries": "Series favoritas",
+    "ViewTypeTvFavoriteEpisodes": "Episodios favoritos",
+    "ViewTypeMovieResume": "Reanudar",
+    "ViewTypeMovieLatest": "\u00daltimas",
+    "ViewTypeMovieMovies": "Pel\u00edculas",
+    "ViewTypeMovieCollections": "Colecciones",
+    "ViewTypeMovieFavorites": "Favoritos",
+    "ViewTypeMovieGenres": "G\u00e9neros",
+    "ViewTypeMusicLatest": "\u00daltimas",
+    "ViewTypeMusicPlaylists": "Lista",
+    "ViewTypeMusicAlbums": "\u00c1lbumes",
+    "ViewTypeMusicAlbumArtists": "\u00c1lbumes de artistas",
+    "HeaderOtherDisplaySettings": "Configuraci\u00f3n de pantalla",
+    "ViewTypeMusicSongs": "Canciones",
+    "ViewTypeMusicFavorites": "Favoritos",
+    "ViewTypeMusicFavoriteAlbums": "\u00c1lbumes favoritos",
+    "ViewTypeMusicFavoriteArtists": "Artistas favoritos",
+    "ViewTypeMusicFavoriteSongs": "Canciones favoritas",
+    "ViewTypeFolders": "Carpetas",
+    "ViewTypeLiveTvRecordingGroups": "Grabaciones",
+    "ViewTypeLiveTvChannels": "Canales",
+    "ScheduledTaskFailedWithName": "{0} fall\u00f3",
+    "LabelRunningTimeValue": "Tiempo de ejecuci\u00f3n: {0}",
+    "ScheduledTaskStartedWithName": "{0} iniciado",
+    "VersionNumber": "Versi\u00f3n {0}",
+    "PluginInstalledWithName": "{0} ha sido instalado",
+    "PluginUpdatedWithName": "{0} ha sido actualizado",
+    "PluginUninstalledWithName": "{0} ha sido desinstalado",
+    "ItemAddedWithName": "{0} ha sido a\u00f1adido a la biblioteca",
+    "ItemRemovedWithName": "{0} se ha eliminado de la biblioteca",
+    "LabelIpAddressValue": "Direcci\u00f3n IP: {0}",
+    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
+    "UserOnlineFromDevice": "{0} est\u00e1 conectado desde {1}",
+    "ProviderValue": "Proveedor: {0}",
+    "SubtitlesDownloadedForItem": "Subt\u00edtulos descargados para {0}",
+    "UserConfigurationUpdatedWithName": "Se ha actualizado la configuraci\u00f3n de usuario para {0}",
+    "UserCreatedWithName": "Se ha creado el usuario {0}",
+    "UserPasswordChangedWithName": "Contrase\u00f1a cambiada al usuario {0}",
+    "UserDeletedWithName": "El usuario {0} ha sido eliminado",
+    "MessageServerConfigurationUpdated": "Se ha actualizado la configuraci\u00f3n del servidor",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Se ha actualizado la secci\u00f3n {0} de la configuraci\u00f3n del servidor",
+    "MessageApplicationUpdated": "Se ha actualizado el servidor Emby",
+    "FailedLoginAttemptWithUserName": "Intento de inicio de sesi\u00f3n fallido desde {0}",
+    "AuthenticationSucceededWithUserName": "{0} se ha autenticado satisfactoriamente",
+    "DeviceOfflineWithName": "{0} se ha desconectado",
+    "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
+    "UserOfflineFromDevice": "{0} se ha desconectado de {1}",
+    "UserStartedPlayingItemWithValues": "{0} ha empezado a reproducir {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha parado de reproducir {1}",
+    "SubtitleDownloadFailureForItem": "Fallo en la descarga de subt\u00edtulos para {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "Usuario",
+    "HeaderName": "Nombre",
+    "HeaderDate": "Fecha",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subt\u00edtulos",
+    "HeaderGenres": "G\u00e9neros",
+    "HeaderCountries": "Paises",
+    "HeaderStatus": "Estado",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Estudios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Clasificaci\u00f3n parental",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/fi.json b/Emby.Server.Implementations/Localization/Core/fi.json
new file mode 100644
index 000000000..20efa1406
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/fi.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Poistu",
+    "LabelVisitCommunity": "K\u00e4y Yhteis\u00f6ss\u00e4",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Selaa Kirjastoa",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "K\u00e4ynnist\u00e4 Palvelin uudelleen",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/fr-CA.json b/Emby.Server.Implementations/Localization/Core/fr-CA.json
new file mode 100644
index 000000000..789817c84
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/fr-CA.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Veuillez patienter pendant que la base de donn\u00e9e de votre Serveur Emby se met \u00e0 jour. Termin\u00e9e \u00e0 {0}%.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Quitter",
+    "LabelVisitCommunity": "Visiter la Communaut\u00e9",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentation de l'API",
+    "LabelDeveloperResources": "Ressources pour d\u00e9veloppeurs",
+    "LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",
+    "LabelConfigureServer": "Configurer Emby",
+    "LabelRestartServer": "Red\u00e9marrer le Serveur",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/fr.json b/Emby.Server.Implementations/Localization/Core/fr.json
new file mode 100644
index 000000000..25c722989
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/fr.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Veuillez patienter pendant que la base de donn\u00e9e de votre Emby Serveur se met \u00e0 jour. Termin\u00e9e \u00e0 {0}%.",
+    "AppDeviceValues": "Application : {0}, Appareil: {1}",
+    "UserDownloadingItemWithValues": "{0} est en train de t\u00e9l\u00e9charger {1}",
+    "FolderTypeMixed": "Contenus m\u00e9lang\u00e9s",
+    "FolderTypeMovies": "Films",
+    "FolderTypeMusic": "Musique",
+    "FolderTypeAdultVideos": "Vid\u00e9os Adultes",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Vid\u00e9os Musical",
+    "FolderTypeHomeVideos": "Vid\u00e9os personnelles",
+    "FolderTypeGames": "Jeux",
+    "FolderTypeBooks": "Livres",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "H\u00e9rite",
+    "HeaderCastCrew": "\u00c9quipe de tournage",
+    "HeaderPeople": "Personnes",
+    "ValueSpecialEpisodeName": "Sp\u00e9cial - {0}",
+    "LabelChapterName": "Chapitre {0}",
+    "NameSeasonNumber": "Saison {0}",
+    "LabelExit": "Quitter",
+    "LabelVisitCommunity": "Visiter la Communaut\u00e9",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentation de l'API",
+    "LabelDeveloperResources": "Ressources pour d\u00e9veloppeurs",
+    "LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",
+    "LabelConfigureServer": "Configurer Emby",
+    "LabelRestartServer": "Red\u00e9marrer le Serveur",
+    "CategorySync": "Sync",
+    "CategoryUser": "Utilisateur",
+    "CategorySystem": "Syst\u00e8me",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Erreur de plugin",
+    "NotificationOptionApplicationUpdateAvailable": "Mise \u00e0 jour d'application disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Mise \u00e0 jour d'application install\u00e9e",
+    "NotificationOptionPluginUpdateInstalled": "Mise \u00e0 jour de plugin install\u00e9e",
+    "NotificationOptionPluginInstalled": "Plugin install\u00e9",
+    "NotificationOptionPluginUninstalled": "Plugin d\u00e9sinstall\u00e9",
+    "NotificationOptionVideoPlayback": "Lecture vid\u00e9o d\u00e9marr\u00e9e",
+    "NotificationOptionAudioPlayback": "Lecture audio d\u00e9marr\u00e9e",
+    "NotificationOptionGamePlayback": "Lecture de jeu d\u00e9marr\u00e9e",
+    "NotificationOptionVideoPlaybackStopped": "Lecture vid\u00e9o arr\u00eat\u00e9e",
+    "NotificationOptionAudioPlaybackStopped": "Lecture audio arr\u00eat\u00e9e",
+    "NotificationOptionGamePlaybackStopped": "Lecture de jeu arr\u00eat\u00e9e",
+    "NotificationOptionTaskFailed": "\u00c9chec de t\u00e2che planifi\u00e9e",
+    "NotificationOptionInstallationFailed": "\u00c9chec d'installation",
+    "NotificationOptionNewLibraryContent": "Nouveau contenu ajout\u00e9",
+    "NotificationOptionNewLibraryContentMultiple": "Nouveau contenu ajout\u00e9 (multiple)",
+    "NotificationOptionCameraImageUploaded": "L'image de l'appareil photo a \u00e9t\u00e9 upload\u00e9e",
+    "NotificationOptionUserLockedOut": "Utilisateur verrouill\u00e9",
+    "NotificationOptionServerRestartRequired": "Un red\u00e9marrage du serveur est requis",
+    "ViewTypePlaylists": "Listes de lecture",
+    "ViewTypeMovies": "Films",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Jeux",
+    "ViewTypeMusic": "Musique",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artistes",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Cha\u00eenes",
+    "ViewTypeLiveTV": "TV en direct",
+    "ViewTypeLiveTvNowPlaying": "En cours de diffusion",
+    "ViewTypeLatestGames": "Derniers jeux",
+    "ViewTypeRecentlyPlayedGames": "R\u00e9cemment jou\u00e9",
+    "ViewTypeGameFavorites": "Favoris",
+    "ViewTypeGameSystems": "Syst\u00e8me de jeu",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Reprise",
+    "ViewTypeTvNextUp": "A venir",
+    "ViewTypeTvLatest": "Derniers",
+    "ViewTypeTvShowSeries": "S\u00e9ries",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "S\u00e9ries favorites",
+    "ViewTypeTvFavoriteEpisodes": "Episodes favoris",
+    "ViewTypeMovieResume": "Reprise",
+    "ViewTypeMovieLatest": "Dernier",
+    "ViewTypeMovieMovies": "Films",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favoris",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Dernier",
+    "ViewTypeMusicPlaylists": "Listes de lectures",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Artiste de l'album",
+    "HeaderOtherDisplaySettings": "Param\u00e8tres d'affichage",
+    "ViewTypeMusicSongs": "Chansons",
+    "ViewTypeMusicFavorites": "Favoris",
+    "ViewTypeMusicFavoriteAlbums": "Albums favoris",
+    "ViewTypeMusicFavoriteArtists": "Artistes favoris",
+    "ViewTypeMusicFavoriteSongs": "Chansons favorites",
+    "ViewTypeFolders": "R\u00e9pertoires",
+    "ViewTypeLiveTvRecordingGroups": "Enregistrements",
+    "ViewTypeLiveTvChannels": "Cha\u00eenes",
+    "ScheduledTaskFailedWithName": "{0} a \u00e9chou\u00e9",
+    "LabelRunningTimeValue": "Dur\u00e9e: {0}",
+    "ScheduledTaskStartedWithName": "{0} a commenc\u00e9",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} a \u00e9t\u00e9 install\u00e9",
+    "PluginUpdatedWithName": "{0} a \u00e9t\u00e9 mis \u00e0 jour",
+    "PluginUninstalledWithName": "{0} a \u00e9t\u00e9 d\u00e9sinstall\u00e9",
+    "ItemAddedWithName": "{0} a \u00e9t\u00e9 ajout\u00e9 \u00e0 la biblioth\u00e8que",
+    "ItemRemovedWithName": "{0} a \u00e9t\u00e9 supprim\u00e9 de la biblioth\u00e8que",
+    "LabelIpAddressValue": "Adresse IP: {0}",
+    "DeviceOnlineWithName": "{0} est connect\u00e9",
+    "UserOnlineFromDevice": "{0} s'est connect\u00e9 depuis {1}",
+    "ProviderValue": "Fournisseur : {0}",
+    "SubtitlesDownloadedForItem": "Les sous-titres de {0} ont \u00e9t\u00e9 t\u00e9l\u00e9charg\u00e9s",
+    "UserConfigurationUpdatedWithName": "La configuration utilisateur de {0} a \u00e9t\u00e9 mise \u00e0 jour",
+    "UserCreatedWithName": "L'utilisateur {0} a \u00e9t\u00e9 cr\u00e9\u00e9.",
+    "UserPasswordChangedWithName": "Le mot de passe pour l'utilisateur {0} a \u00e9t\u00e9 modifi\u00e9.",
+    "UserDeletedWithName": "L'utilisateur {0} a \u00e9t\u00e9 supprim\u00e9.",
+    "MessageServerConfigurationUpdated": "La configuration du serveur a \u00e9t\u00e9 mise \u00e0 jour.",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La configuration de la section {0} du serveur a \u00e9t\u00e9 mise \u00e0 jour.",
+    "MessageApplicationUpdated": "Le serveur Emby a \u00e9t\u00e9 mis \u00e0 jour",
+    "FailedLoginAttemptWithUserName": "Echec d'une tentative de connexion de {0}",
+    "AuthenticationSucceededWithUserName": "{0} s'est authentifi\u00e9 avec succ\u00e8s",
+    "DeviceOfflineWithName": "{0} s'est d\u00e9connect\u00e9",
+    "UserLockedOutWithName": "L'utilisateur {0} a \u00e9t\u00e9 verrouill\u00e9",
+    "UserOfflineFromDevice": "{0} s'est d\u00e9connect\u00e9 depuis {1}",
+    "UserStartedPlayingItemWithValues": "{0} vient de commencer la lecture de {1}",
+    "UserStoppedPlayingItemWithValues": "{0} vient d'arr\u00eater la lecture de {1}",
+    "SubtitleDownloadFailureForItem": "Le t\u00e9l\u00e9chargement des sous-titres pour {0} a \u00e9chou\u00e9.",
+    "HeaderUnidentified": "Non identifi\u00e9",
+    "HeaderImagePrimary": "Primaire",
+    "HeaderImageBackdrop": "Contexte",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Avatar de l'utilisateur",
+    "HeaderOverview": "Aper\u00e7u",
+    "HeaderShortOverview": "Synopsys",
+    "HeaderType": "Type",
+    "HeaderSeverity": "S\u00e9v\u00e9rit\u00e9",
+    "HeaderUser": "Utilisateur",
+    "HeaderName": "Nom",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Date de la Premi\u00e8re",
+    "HeaderDateAdded": "Date d'ajout",
+    "HeaderReleaseDate": "Date de sortie ",
+    "HeaderRuntime": "Dur\u00e9e",
+    "HeaderPlayCount": "Nombre de lectures",
+    "HeaderSeason": "Saison",
+    "HeaderSeasonNumber": "Num\u00e9ro de saison",
+    "HeaderSeries": "S\u00e9ries :",
+    "HeaderNetwork": "R\u00e9seau",
+    "HeaderYear": "Ann\u00e9e :",
+    "HeaderYears": "Ann\u00e9es :",
+    "HeaderParentalRating": "Classification parentale",
+    "HeaderCommunityRating": "Note de la communaut\u00e9",
+    "HeaderTrailers": "Bandes-annonces",
+    "HeaderSpecials": "Episodes sp\u00e9ciaux",
+    "HeaderGameSystems": "Plateformes de jeu",
+    "HeaderPlayers": "Lecteurs :",
+    "HeaderAlbumArtists": "Artistes sur l'album",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disque",
+    "HeaderTrack": "Piste",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Vid\u00e9o",
+    "HeaderEmbeddedImage": "Image int\u00e9gr\u00e9e",
+    "HeaderResolution": "R\u00e9solution",
+    "HeaderSubtitles": "Sous-titres",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Pays",
+    "HeaderStatus": "\u00c9tat",
+    "HeaderTracks": "Pistes",
+    "HeaderMusicArtist": "Artiste de l'album",
+    "HeaderLocked": "Verrouill\u00e9",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Acteurs",
+    "HeaderComposer": "Compositeurs",
+    "HeaderDirector": "R\u00e9alisateurs",
+    "HeaderGuestStar": "R\u00f4le principal",
+    "HeaderProducer": "Producteurs",
+    "HeaderWriter": "Auteur(e)s",
+    "HeaderParentalRatings": "Note parentale",
+    "HeaderCommunityRatings": "Classification de la communaut\u00e9",
+    "StartupEmbyServerIsLoading": "Le serveur Emby est en cours de chargement. Veuillez r\u00e9essayer dans quelques instant."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/gsw.json b/Emby.Server.Implementations/Localization/Core/gsw.json
new file mode 100644
index 000000000..88af82b7e
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/gsw.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Verschiedeni Sache",
+    "FolderTypeMovies": "Film",
+    "FolderTypeMusic": "Musig",
+    "FolderTypeAdultVideos": "Erwachseni Film",
+    "FolderTypePhotos": "F\u00f6teli",
+    "FolderTypeMusicVideos": "Musigvideos",
+    "FolderTypeHomeVideos": "Heimvideos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "B\u00fcecher",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "erbf\u00e4hig",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Verlasse",
+    "LabelVisitCommunity": "Bsuech d'Community",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "API Dokumentatione",
+    "LabelDeveloperResources": "Entwickler Ressurce",
+    "LabelBrowseLibrary": "Dursuech d'Bibliothek",
+    "LabelConfigureServer": "Konfigurier Emby",
+    "LabelRestartServer": "Server neustarte",
+    "CategorySync": "Synchronisierig",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/he.json b/Emby.Server.Implementations/Localization/Core/he.json
new file mode 100644
index 000000000..137b45544
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/he.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "\u05ea\u05d5\u05db\u05df \u05de\u05e2\u05d5\u05e8\u05d1",
+    "FolderTypeMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "\u05d8\u05dc\u05d5\u05d9\u05d6\u05d9\u05d4",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "\u05e9\u05d7\u05e7\u05e0\u05d9\u05dd \u05d5\u05e6\u05d5\u05d5\u05ea",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "\u05d9\u05e6\u05d9\u05d0\u05d4",
+    "LabelVisitCommunity": "\u05d1\u05e7\u05e8 \u05d1\u05e7\u05d4\u05d9\u05dc\u05d4",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "\u05ea\u05d9\u05e2\u05d5\u05d3 API",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "\u05d3\u05e4\u05d3\u05e3 \u05d1\u05e1\u05e4\u05e8\u05d9\u05d4",
+    "LabelConfigureServer": "\u05e7\u05d1\u05e2 \u05ea\u05e6\u05d5\u05e8\u05ea Emby",
+    "LabelRestartServer": "\u05d0\u05ea\u05d7\u05dc \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea",
+    "CategorySync": "\u05e1\u05e0\u05db\u05e8\u05df",
+    "CategoryUser": "\u05de\u05e9\u05ea\u05de\u05e9",
+    "CategorySystem": "\u05de\u05e2\u05e8\u05db\u05ea",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "\u05ea\u05e7\u05dc\u05d4 \u05d1\u05ea\u05d5\u05e1\u05e3",
+    "NotificationOptionApplicationUpdateAvailable": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d5\u05db\u05de\u05d4 \u05e7\u05d9\u05d9\u05dd",
+    "NotificationOptionApplicationUpdateInstalled": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d5\u05db\u05e0\u05d4 \u05d4\u05d5\u05ea\u05e7\u05df",
+    "NotificationOptionPluginUpdateInstalled": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d5\u05e1\u05e3 \u05d4\u05d5\u05ea\u05e7\u05df",
+    "NotificationOptionPluginInstalled": "\u05ea\u05d5\u05e1\u05e3 \u05d4\u05d5\u05ea\u05e7\u05df",
+    "NotificationOptionPluginUninstalled": "\u05ea\u05d5\u05e1\u05e3 \u05d4\u05d5\u05e1\u05e8",
+    "NotificationOptionVideoPlayback": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05d7\u05dc\u05d4",
+    "NotificationOptionAudioPlayback": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05e6\u05dc\u05d9\u05dc \u05d4\u05d7\u05dc\u05d4",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05d5\u05e4\u05e1\u05e7\u05d4",
+    "NotificationOptionAudioPlaybackStopped": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05e6\u05dc\u05d9\u05dc \u05d4\u05d5\u05e4\u05e1\u05e7\u05d4",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "\u05de\u05e9\u05d9\u05de\u05d4 \u05de\u05ea\u05d5\u05d6\u05de\u05e0\u05ea \u05e0\u05db\u05e9\u05dc\u05d4",
+    "NotificationOptionInstallationFailed": "\u05d4\u05ea\u05e7\u05e0\u05d4 \u05e0\u05db\u05e9\u05dc\u05d4",
+    "NotificationOptionNewLibraryContent": "\u05ea\u05d5\u05db\u05df \u05d7\u05d3\u05e9 \u05e0\u05d5\u05e1\u05e3",
+    "NotificationOptionNewLibraryContentMultiple": "\u05d4\u05ea\u05d5\u05d5\u05e1\u05e4\u05d5 \u05ea\u05db\u05e0\u05d9\u05dd \u05d7\u05d3\u05e9\u05d9\u05dd",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "\u05e0\u05d3\u05e8\u05e9\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4 \u05de\u05d7\u05d3\u05e9 \u05e9\u05dc \u05d4\u05e9\u05e8\u05ea",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
+    "ViewTypeTvShows": "\u05d8\u05dc\u05d5\u05d9\u05d6\u05d9\u05d4",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "\u05d2\u05d9\u05e8\u05e1\u05d0 {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "\u05e9\u05dd",
+    "HeaderDate": "\u05ea\u05d0\u05e8\u05d9\u05da",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "\u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05d5\u05e1\u05e4\u05d4",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "\u05e1\u05d3\u05e8\u05d4",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "\u05e9\u05e0\u05d4",
+    "HeaderYears": "\u05e9\u05e0\u05d9\u05dd",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "\u05de\u05e6\u05d1",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "\u05e9\u05d7\u05e7\u05e0\u05d9\u05dd",
+    "HeaderComposer": "\u05de\u05dc\u05d7\u05d9\u05e0\u05d9\u05dd",
+    "HeaderDirector": "\u05d1\u05de\u05d0\u05d9\u05dd",
+    "HeaderGuestStar": "\u05d0\u05de\u05df \u05d0\u05d5\u05e8\u05d7",
+    "HeaderProducer": "\u05de\u05e4\u05d9\u05e7\u05d9\u05dd",
+    "HeaderWriter": "\u05db\u05d5\u05ea\u05d1\u05d9\u05dd",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/hr.json b/Emby.Server.Implementations/Localization/Core/hr.json
new file mode 100644
index 000000000..7a94dc32b
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/hr.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Glumci i ekipa",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Izlaz",
+    "LabelVisitCommunity": "Posjeti zajednicu",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Pregledaj biblioteku",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "Restartiraj Server",
+    "CategorySync": "Sync",
+    "CategoryUser": "Korisnik",
+    "CategorySystem": "Sistem",
+    "CategoryApplication": "Aplikacija",
+    "CategoryPlugin": "Dodatak",
+    "NotificationOptionPluginError": "Dodatak otkazao",
+    "NotificationOptionApplicationUpdateAvailable": "Dostupno a\u017euriranje aplikacije",
+    "NotificationOptionApplicationUpdateInstalled": "Instalirano a\u017euriranje aplikacije",
+    "NotificationOptionPluginUpdateInstalled": "Instalirano a\u017euriranje za dodatak",
+    "NotificationOptionPluginInstalled": "Dodatak instaliran",
+    "NotificationOptionPluginUninstalled": "Dodatak uklonjen",
+    "NotificationOptionVideoPlayback": "Reprodukcija videa zapo\u010deta",
+    "NotificationOptionAudioPlayback": "Reprodukcija glazbe zapo\u010deta",
+    "NotificationOptionGamePlayback": "Igrica pokrenuta",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Zakazan zadatak nije izvr\u0161en",
+    "NotificationOptionInstallationFailed": "Instalacija nije izvr\u0161ena",
+    "NotificationOptionNewLibraryContent": "Novi sadr\u017eaj dodan",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Potrebno ponovo pokretanje servera",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Verzija {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Ime",
+    "HeaderDate": "Datum",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/hu.json b/Emby.Server.Implementations/Localization/Core/hu.json
new file mode 100644
index 000000000..2b9d28d8c
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "K\u00e9rlek v\u00e1rj, m\u00edg az Emby Szerver adatb\u00e1zis friss\u00fcl. {0}% k\u00e9sz.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Vegyes tartalom",
+    "FolderTypeMovies": "Filmek",
+    "FolderTypeMusic": "Zen\u00e9k",
+    "FolderTypeAdultVideos": "Feln\u0151tt vide\u00f3k",
+    "FolderTypePhotos": "F\u00e9nyk\u00e9pek",
+    "FolderTypeMusicVideos": "Zenei vide\u00f3k",
+    "FolderTypeHomeVideos": "H\u00e1zi vide\u00f3k",
+    "FolderTypeGames": "J\u00e1t\u00e9kok",
+    "FolderTypeBooks": "K\u00f6nyvek",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Szerepl\u0151k & R\u00e9sztvev\u0151k",
+    "HeaderPeople": "Emberek",
+    "ValueSpecialEpisodeName": "K\u00fcl\u00f6nleges - {0}",
+    "LabelChapterName": "Fejezet {0}",
+    "NameSeasonNumber": "\u00c9vad {0}",
+    "LabelExit": "Kil\u00e9p\u00e9s",
+    "LabelVisitCommunity": "K\u00f6z\u00f6ss\u00e9g",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api dokument\u00e1ci\u00f3",
+    "LabelDeveloperResources": "Fejleszt\u0151i eszk\u00f6z\u00f6k",
+    "LabelBrowseLibrary": "M\u00e9diat\u00e1r tall\u00f3z\u00e1sa",
+    "LabelConfigureServer": "Emby konfigur\u00e1l\u00e1sa",
+    "LabelRestartServer": "Szerver \u00fajraindit\u00e1sa",
+    "CategorySync": "Sync",
+    "CategoryUser": "Felhaszn\u00e1l\u00f3",
+    "CategorySystem": "Rendszer",
+    "CategoryApplication": "Alkalmaz\u00e1s",
+    "CategoryPlugin": "B\u0151v\u00edtm\u00e9ny",
+    "NotificationOptionPluginError": "B\u0151v\u00edtm\u00e9ny hiba",
+    "NotificationOptionApplicationUpdateAvailable": "Friss\u00edt\u00e9s el\u00e9rhet\u0151",
+    "NotificationOptionApplicationUpdateInstalled": "Program friss\u00edt\u00e9s telep\u00edtve",
+    "NotificationOptionPluginUpdateInstalled": "B\u0151v\u00edtm\u00e9ny friss\u00edt\u00e9s telep\u00edtve",
+    "NotificationOptionPluginInstalled": "B\u0151v\u00edtm\u00e9ny telep\u00edtve",
+    "NotificationOptionPluginUninstalled": "B\u0151v\u00edtm\u00e9ny elt\u00e1vol\u00edtva",
+    "NotificationOptionVideoPlayback": "Vide\u00f3 elind\u00edtva",
+    "NotificationOptionAudioPlayback": "Zene elind\u00edtva",
+    "NotificationOptionGamePlayback": "J\u00e1t\u00e9k elind\u00edtva",
+    "NotificationOptionVideoPlaybackStopped": "Vide\u00f3 meg\u00e1ll\u00edtva",
+    "NotificationOptionAudioPlaybackStopped": "Zene meg\u00e1ll\u00edtva",
+    "NotificationOptionGamePlaybackStopped": "J\u00e1t\u00e9k meg\u00e1ll\u00edtva",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Telep\u00edt\u00e9si hiba",
+    "NotificationOptionNewLibraryContent": "\u00daj tartalom hozz\u00e1adva",
+    "NotificationOptionNewLibraryContentMultiple": "\u00daj tartalom hozz\u00e1adva (t\u00f6bbsz\u00f6r\u00f6s)",
+    "NotificationOptionCameraImageUploaded": "Kamera k\u00e9p felt\u00f6ltve",
+    "NotificationOptionUserLockedOut": "Felhaszn\u00e1l\u00f3 tiltva",
+    "NotificationOptionServerRestartRequired": "\u00dajraind\u00edt\u00e1s sz\u00fcks\u00e9ges",
+    "ViewTypePlaylists": "Lej\u00e1tsz\u00e1si list\u00e1k",
+    "ViewTypeMovies": "Filmek",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "J\u00e1t\u00e9kok",
+    "ViewTypeMusic": "Zene",
+    "ViewTypeMusicGenres": "M\u0171fajok",
+    "ViewTypeMusicArtists": "M\u0171v\u00e9szek",
+    "ViewTypeBoxSets": "Gy\u0171jtem\u00e9nyek",
+    "ViewTypeChannels": "Csatorn\u00e1k",
+    "ViewTypeLiveTV": "\u00c9l\u0151 TV",
+    "ViewTypeLiveTvNowPlaying": "Most J\u00e1tszott",
+    "ViewTypeLatestGames": "Leg\u00fajabb J\u00e1t\u00e9kok",
+    "ViewTypeRecentlyPlayedGames": "Legut\u00f3bb J\u00e1tszott",
+    "ViewTypeGameFavorites": "Kedvencek",
+    "ViewTypeGameSystems": "J\u00e1t\u00e9k Rendszer",
+    "ViewTypeGameGenres": "M\u0171fajok",
+    "ViewTypeTvResume": "Folytat\u00e1s",
+    "ViewTypeTvNextUp": "K\u00f6vetkez\u0151",
+    "ViewTypeTvLatest": "Leg\u00fajabb",
+    "ViewTypeTvShowSeries": "Sorozat",
+    "ViewTypeTvGenres": "M\u0171fajok",
+    "ViewTypeTvFavoriteSeries": "Kedvenc Sorozat",
+    "ViewTypeTvFavoriteEpisodes": "Kedvenc R\u00e9szek",
+    "ViewTypeMovieResume": "Folytat\u00e1s",
+    "ViewTypeMovieLatest": "Leg\u00fajabb",
+    "ViewTypeMovieMovies": "Filmek",
+    "ViewTypeMovieCollections": "Gy\u0171jtem\u00e9nyek",
+    "ViewTypeMovieFavorites": "Kedvencek",
+    "ViewTypeMovieGenres": "M\u0171fajok",
+    "ViewTypeMusicLatest": "Leg\u00fajabb",
+    "ViewTypeMusicPlaylists": "Lej\u00e1tsz\u00e1si list\u00e1k",
+    "ViewTypeMusicAlbums": "Albumok",
+    "ViewTypeMusicAlbumArtists": "Album El\u0151ad\u00f3k",
+    "HeaderOtherDisplaySettings": "Megjelen\u00edt\u00e9si Be\u00e1ll\u00edt\u00e1sok",
+    "ViewTypeMusicSongs": "Dalok",
+    "ViewTypeMusicFavorites": "Kedvencek",
+    "ViewTypeMusicFavoriteAlbums": "Kedvenc Albumok",
+    "ViewTypeMusicFavoriteArtists": "Kedvenc M\u0171v\u00e9szek",
+    "ViewTypeMusicFavoriteSongs": "Kedvenc Dalok",
+    "ViewTypeFolders": "K\u00f6nyvt\u00e1rak",
+    "ViewTypeLiveTvRecordingGroups": "Felv\u00e9telek",
+    "ViewTypeLiveTvChannels": "Csatorn\u00e1k",
+    "ScheduledTaskFailedWithName": "{0} hiba",
+    "LabelRunningTimeValue": "Fut\u00e1si id\u0151: {0}",
+    "ScheduledTaskStartedWithName": "{0} elkezdve",
+    "VersionNumber": "Verzi\u00f3 {0}",
+    "PluginInstalledWithName": "{0} telep\u00edtve",
+    "PluginUpdatedWithName": "{0} friss\u00edtve",
+    "PluginUninstalledWithName": "{0} elt\u00e1vol\u00edtva",
+    "ItemAddedWithName": "{0} k\u00f6nyvt\u00e1rhoz adva",
+    "ItemRemovedWithName": "{0} t\u00f6r\u00f6lve a k\u00f6nyvt\u00e1rb\u00f3l",
+    "LabelIpAddressValue": "Ip c\u00edm: {0}",
+    "DeviceOnlineWithName": "{0} kapcsol\u00f3dva",
+    "UserOnlineFromDevice": "{0} akt\u00edv err\u0151l {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Felirat let\u00f6lt\u00e9se ehhez {0}",
+    "UserConfigurationUpdatedWithName": "A k\u00f6vetkez\u0151 felhaszn\u00e1l\u00f3 be\u00e1ll\u00edt\u00e1sai friss\u00edtve {0}",
+    "UserCreatedWithName": "Felhaszn\u00e1l\u00f3 {0} l\u00e9trehozva",
+    "UserPasswordChangedWithName": "Jelsz\u00f3 m\u00f3dos\u00edtva ennek a felhaszn\u00e1l\u00f3nak {0}",
+    "UserDeletedWithName": "Felhaszn\u00e1l\u00f3 {0} t\u00f6r\u00f6lve",
+    "MessageServerConfigurationUpdated": "Szerver be\u00e1ll\u00edt\u00e1sok friss\u00edtve",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server friss\u00edtve",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} sz\u00e9tkapcsolt",
+    "UserLockedOutWithName": "A k\u00f6vetkez\u0151 felhaszn\u00e1l\u00f3 tiltva {0}",
+    "UserOfflineFromDevice": "{0} kil\u00e9pett innen {1}",
+    "UserStartedPlayingItemWithValues": "{0} megkezdte j\u00e1tszani a(z) {1}",
+    "UserStoppedPlayingItemWithValues": "{0} befejezte a(z) {1}",
+    "SubtitleDownloadFailureForItem": "Nem siker\u00fcl a felirat let\u00f6lt\u00e9s ehhez {0}",
+    "HeaderUnidentified": "Azonos\u00edtatlan",
+    "HeaderImagePrimary": "Els\u0151dleges",
+    "HeaderImageBackdrop": "H\u00e1tt\u00e9r",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Felhaszn\u00e1l\u00f3 K\u00e9p",
+    "HeaderOverview": "\u00c1ttekint\u00e9s",
+    "HeaderShortOverview": "R\u00f6vid \u00c1ttekint\u00e9s",
+    "HeaderType": "T\u00edpus",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "Felhaszn\u00e1l\u00f3",
+    "HeaderName": "N\u00e9v",
+    "HeaderDate": "D\u00e1tum",
+    "HeaderPremiereDate": "Megjelen\u00e9s D\u00e1tuma",
+    "HeaderDateAdded": "Hozz\u00e1adva",
+    "HeaderReleaseDate": "Megjelen\u00e9s d\u00e1tuma",
+    "HeaderRuntime": "J\u00e1t\u00e9kid\u0151",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "\u00c9vad",
+    "HeaderSeasonNumber": "\u00c9vad sz\u00e1ma",
+    "HeaderSeries": "Sorozatok:",
+    "HeaderNetwork": "H\u00e1l\u00f3zat",
+    "HeaderYear": "\u00c9v:",
+    "HeaderYears": "\u00c9v:",
+    "HeaderParentalRating": "Korhat\u00e1r besorol\u00e1s",
+    "HeaderCommunityRating": "K\u00f6z\u00f6ss\u00e9gi \u00e9rt\u00e9kel\u00e9s",
+    "HeaderTrailers": "El\u0151zetesek",
+    "HeaderSpecials": "Speci\u00e1lis",
+    "HeaderGameSystems": "J\u00e1t\u00e9k Rendszer",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albumok",
+    "HeaderDisc": "Lemez",
+    "HeaderTrack": "S\u00e1v",
+    "HeaderAudio": "Audi\u00f3",
+    "HeaderVideo": "Vide\u00f3",
+    "HeaderEmbeddedImage": "Be\u00e1gyazott k\u00e9p",
+    "HeaderResolution": "Felbont\u00e1s",
+    "HeaderSubtitles": "Feliratok",
+    "HeaderGenres": "M\u0171fajok",
+    "HeaderCountries": "Orsz\u00e1gok",
+    "HeaderStatus": "\u00c1llapot",
+    "HeaderTracks": "S\u00e1vok",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Z\u00e1rt",
+    "HeaderStudios": "St\u00fadi\u00f3k",
+    "HeaderActor": "Sz\u00edn\u00e9szek",
+    "HeaderComposer": "Zeneszerz\u0151k",
+    "HeaderDirector": "Rendez\u0151k",
+    "HeaderGuestStar": "Vend\u00e9g szt\u00e1r",
+    "HeaderProducer": "Producerek",
+    "HeaderWriter": "\u00cdr\u00f3k",
+    "HeaderParentalRatings": "Korhat\u00e1r besorol\u00e1s",
+    "HeaderCommunityRatings": "K\u00f6z\u00f6ss\u00e9gi \u00e9rt\u00e9kel\u00e9sek",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/id.json b/Emby.Server.Implementations/Localization/Core/id.json
new file mode 100644
index 000000000..8d64b63c4
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/id.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Silahkan menunggu sementara database Emby Server anda diupgrade. {0}% selesai.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Mewarisi",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Keluar",
+    "LabelVisitCommunity": "Kunjungi Komunitas",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Dokumentasi Api",
+    "LabelDeveloperResources": "Sumber daya Pengembang",
+    "LabelBrowseLibrary": "Telusuri Pustaka",
+    "LabelConfigureServer": "Konfigurasi Emby",
+    "LabelRestartServer": "Hidupkan ulang Server",
+    "CategorySync": "Singkron",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/it.json b/Emby.Server.Implementations/Localization/Core/it.json
new file mode 100644
index 000000000..d2d697c3e
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
+    "UserDownloadingItemWithValues": "{0} sta scaricando {1}",
+    "FolderTypeMixed": "contenuto misto",
+    "FolderTypeMovies": "Film",
+    "FolderTypeMusic": "Musica",
+    "FolderTypeAdultVideos": "Video per adulti",
+    "FolderTypePhotos": "Foto",
+    "FolderTypeMusicVideos": "Video musicali",
+    "FolderTypeHomeVideos": "Video personali",
+    "FolderTypeGames": "Giochi",
+    "FolderTypeBooks": "Libri",
+    "FolderTypeTvShows": "Tv",
+    "FolderTypeInherit": "ereditare",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "Persone",
+    "ValueSpecialEpisodeName": "Speciali - {0}",
+    "LabelChapterName": "Capitolo {0}",
+    "NameSeasonNumber": "Stagione {0}",
+    "LabelExit": "Esci",
+    "LabelVisitCommunity": "Visita la Community",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentazione Api",
+    "LabelDeveloperResources": "Risorse programmatori",
+    "LabelBrowseLibrary": "Esplora la libreria",
+    "LabelConfigureServer": "Configura Emby",
+    "LabelRestartServer": "Riavvia Server",
+    "CategorySync": "Sincronizza",
+    "CategoryUser": "Utente",
+    "CategorySystem": "Sistema",
+    "CategoryApplication": "Applicazione",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin fallito",
+    "NotificationOptionApplicationUpdateAvailable": "Aggiornamento dell'applicazione disponibile",
+    "NotificationOptionApplicationUpdateInstalled": "Aggiornamento dell'applicazione installato",
+    "NotificationOptionPluginUpdateInstalled": "Aggiornamento del plugin installato",
+    "NotificationOptionPluginInstalled": "Plugin installato",
+    "NotificationOptionPluginUninstalled": "Plugin disinstallato",
+    "NotificationOptionVideoPlayback": "La riproduzione video \u00e8 iniziata",
+    "NotificationOptionAudioPlayback": "Riproduzione audio iniziata",
+    "NotificationOptionGamePlayback": "Gioco avviato",
+    "NotificationOptionVideoPlaybackStopped": "Riproduzione video interrotta",
+    "NotificationOptionAudioPlaybackStopped": "Audio Fermato",
+    "NotificationOptionGamePlaybackStopped": "Gioco Fermato",
+    "NotificationOptionTaskFailed": "Operazione pianificata fallita",
+    "NotificationOptionInstallationFailed": "Installazione fallita",
+    "NotificationOptionNewLibraryContent": "Nuovo contenuto aggiunto",
+    "NotificationOptionNewLibraryContentMultiple": "Nuovi contenuti aggiunti (multipli)",
+    "NotificationOptionCameraImageUploaded": "Immagine fotocamera caricata",
+    "NotificationOptionUserLockedOut": "Utente bloccato",
+    "NotificationOptionServerRestartRequired": "Riavvio del server necessario",
+    "ViewTypePlaylists": "Playlist",
+    "ViewTypeMovies": "Film",
+    "ViewTypeTvShows": "Serie Tv",
+    "ViewTypeGames": "Giochi",
+    "ViewTypeMusic": "Musica",
+    "ViewTypeMusicGenres": "Generi",
+    "ViewTypeMusicArtists": "Artisti",
+    "ViewTypeBoxSets": "Collezioni",
+    "ViewTypeChannels": "Canali",
+    "ViewTypeLiveTV": "TV in diretta",
+    "ViewTypeLiveTvNowPlaying": "Ora in onda",
+    "ViewTypeLatestGames": "Ultimi Giorchi",
+    "ViewTypeRecentlyPlayedGames": "Guardato di recente",
+    "ViewTypeGameFavorites": "Preferiti",
+    "ViewTypeGameSystems": "Configurazione gioco",
+    "ViewTypeGameGenres": "Generi",
+    "ViewTypeTvResume": "Riprendi",
+    "ViewTypeTvNextUp": "Prossimi",
+    "ViewTypeTvLatest": "Ultimi",
+    "ViewTypeTvShowSeries": "Serie",
+    "ViewTypeTvGenres": "Generi",
+    "ViewTypeTvFavoriteSeries": "Serie Preferite",
+    "ViewTypeTvFavoriteEpisodes": "Episodi Preferiti",
+    "ViewTypeMovieResume": "Riprendi",
+    "ViewTypeMovieLatest": "Ultimi",
+    "ViewTypeMovieMovies": "Film",
+    "ViewTypeMovieCollections": "Collezioni",
+    "ViewTypeMovieFavorites": "Preferiti",
+    "ViewTypeMovieGenres": "Generi",
+    "ViewTypeMusicLatest": "Ultimi",
+    "ViewTypeMusicPlaylists": "Playlist",
+    "ViewTypeMusicAlbums": "Album",
+    "ViewTypeMusicAlbumArtists": "Album Artisti",
+    "HeaderOtherDisplaySettings": "Impostazioni Video",
+    "ViewTypeMusicSongs": "Canzoni",
+    "ViewTypeMusicFavorites": "Preferiti",
+    "ViewTypeMusicFavoriteAlbums": "Album preferiti",
+    "ViewTypeMusicFavoriteArtists": "Artisti preferiti",
+    "ViewTypeMusicFavoriteSongs": "Canzoni Preferite",
+    "ViewTypeFolders": "Cartelle",
+    "ViewTypeLiveTvRecordingGroups": "Registrazioni",
+    "ViewTypeLiveTvChannels": "canali",
+    "ScheduledTaskFailedWithName": "{0} Falliti",
+    "LabelRunningTimeValue": "Durata: {0}",
+    "ScheduledTaskStartedWithName": "{0} Avviati",
+    "VersionNumber": "Versione {0}",
+    "PluginInstalledWithName": "{0} sono stati Installati",
+    "PluginUpdatedWithName": "{0} sono stati aggiornati",
+    "PluginUninstalledWithName": "{0} non sono stati installati",
+    "ItemAddedWithName": "{0} aggiunti alla libreria",
+    "ItemRemovedWithName": "{0} rimossi dalla libreria",
+    "LabelIpAddressValue": "Indirizzo IP: {0}",
+    "DeviceOnlineWithName": "{0} \u00e8 connesso",
+    "UserOnlineFromDevice": "{0} \u00e8 online da {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Sottotitoli scaricati per {0}",
+    "UserConfigurationUpdatedWithName": "Configurazione utente \u00e8 stata aggiornata per {0}",
+    "UserCreatedWithName": "Utente {0} \u00e8 stato creato",
+    "UserPasswordChangedWithName": "Password utente cambiata per {0}",
+    "UserDeletedWithName": "Utente {0} \u00e8 stato cancellato",
+    "MessageServerConfigurationUpdated": "Configurazione server aggioprnata",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La sezione  {0} \u00e8 stata aggiornata",
+    "MessageApplicationUpdated": "Il Server Emby \u00e8 stato aggiornato",
+    "FailedLoginAttemptWithUserName": "Login fallito da  {0}",
+    "AuthenticationSucceededWithUserName": "{0} Autenticati con successo",
+    "DeviceOfflineWithName": "{0} \u00e8 stato disconesso",
+    "UserLockedOutWithName": "L'utente {0} \u00e8 stato bloccato",
+    "UserOfflineFromDevice": "{0} \u00e8 stato disconesso da {1}",
+    "UserStartedPlayingItemWithValues": "{0} \u00e8 partito da {1}",
+    "UserStoppedPlayingItemWithValues": "{0} stoppato {1}",
+    "SubtitleDownloadFailureForItem": "Sottotitoli non scaricati per {0}",
+    "HeaderUnidentified": "Non identificata",
+    "HeaderImagePrimary": "Primaria",
+    "HeaderImageBackdrop": "Sfondo",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Immagine utente",
+    "HeaderOverview": "Panoramica",
+    "HeaderShortOverview": "breve panoramica",
+    "HeaderType": "Tipo",
+    "HeaderSeverity": "gravit\u00e0",
+    "HeaderUser": "Utente",
+    "HeaderName": "Nome",
+    "HeaderDate": "Data",
+    "HeaderPremiereDate": "Data della prima",
+    "HeaderDateAdded": "Aggiunto il",
+    "HeaderReleaseDate": "Data Rilascio",
+    "HeaderRuntime": "Durata",
+    "HeaderPlayCount": "Visto N\u00b0",
+    "HeaderSeason": "Stagione",
+    "HeaderSeasonNumber": "Stagione Numero",
+    "HeaderSeries": "Serie:",
+    "HeaderNetwork": "Rete",
+    "HeaderYear": "Anno:",
+    "HeaderYears": "Anni",
+    "HeaderParentalRating": "Valutazione parentale",
+    "HeaderCommunityRating": "Voto Comunit\u00e0",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Speciali",
+    "HeaderGameSystems": "Sistemi di gioco",
+    "HeaderPlayers": "Giocatori",
+    "HeaderAlbumArtists": "Album Artisti",
+    "HeaderAlbums": "Album",
+    "HeaderDisc": "Disco",
+    "HeaderTrack": "Traccia",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Immagine incorporata",
+    "HeaderResolution": "Risoluzione",
+    "HeaderSubtitles": "Sottotitoli",
+    "HeaderGenres": "Generi",
+    "HeaderCountries": "Paesi",
+    "HeaderStatus": "Stato",
+    "HeaderTracks": "Traccia",
+    "HeaderMusicArtist": "Musica artisti",
+    "HeaderLocked": "Bloccato",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Attori",
+    "HeaderComposer": "Compositori",
+    "HeaderDirector": "Registi",
+    "HeaderGuestStar": "Personaggi famosi",
+    "HeaderProducer": "Produttori",
+    "HeaderWriter": "Sceneggiatori",
+    "HeaderParentalRatings": "Valutazioni genitori",
+    "HeaderCommunityRatings": "Valutazione Comunity",
+    "StartupEmbyServerIsLoading": "Emby server si sta avviando. Riprova tra un po"
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/kk.json b/Emby.Server.Implementations/Localization/Core/kk.json
new file mode 100644
index 000000000..93252c30b
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/kk.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Emby Server \u0434\u0435\u0440\u0435\u043a\u049b\u043e\u0440\u044b\u04a3\u044b\u0437\u0434\u044b\u04a3 \u0436\u0430\u04a3\u0493\u044b\u0440\u0442\u044b\u043b\u0443\u044b\u043d \u043a\u04af\u0442\u0435 \u0442\u04b1\u0440\u044b\u04a3\u044b\u0437. {0} % \u0430\u044f\u049b\u0442\u0430\u043b\u0434\u044b.",
+    "AppDeviceValues": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430: {0}, \u049a\u04b1\u0440\u044b\u043b\u0493\u044b: {1}",
+    "UserDownloadingItemWithValues": "{0} \u043c\u044b\u043d\u0430\u043d\u044b \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443\u0434\u0430: {1}",
+    "FolderTypeMixed": "\u0410\u0440\u0430\u043b\u0430\u0441 \u043c\u0430\u0437\u043c\u04b1\u043d",
+    "FolderTypeMovies": "\u041a\u0438\u043d\u043e",
+    "FolderTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
+    "FolderTypeAdultVideos": "\u0415\u0440\u0435\u0441\u0435\u043a\u0442\u0456\u043a \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440",
+    "FolderTypePhotos": "\u0424\u043e\u0442\u043e\u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440",
+    "FolderTypeMusicVideos": "\u041c\u0443\u0437\u044b\u043a\u0430\u043b\u044b\u049b \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440",
+    "FolderTypeHomeVideos": "\u04ae\u0439 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440\u0456",
+    "FolderTypeGames": "\u041e\u0439\u044b\u043d\u0434\u0430\u0440",
+    "FolderTypeBooks": "\u041a\u0456\u0442\u0430\u043f\u0442\u0430\u0440",
+    "FolderTypeTvShows": "\u0422\u0414",
+    "FolderTypeInherit": "\u041c\u04b1\u0440\u0430\u0493\u0430 \u0438\u0435\u043b\u0435\u043d\u0443",
+    "HeaderCastCrew": "\u0421\u043e\u043c\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440 \u043c\u0435\u043d \u0442\u04af\u0441\u0456\u0440\u0443\u0448\u0456\u043b\u0435\u0440",
+    "HeaderPeople": "\u0410\u0434\u0430\u043c\u0434\u0430\u0440",
+    "ValueSpecialEpisodeName": "\u0410\u0440\u043d\u0430\u0439\u044b - {0}",
+    "LabelChapterName": "{0}-\u0441\u0430\u0445\u043d\u0430",
+    "NameSeasonNumber": "{0}-\u0441\u0435\u0437\u043e\u043d",
+    "LabelExit": "\u0428\u044b\u0493\u0443",
+    "LabelVisitCommunity": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b\u049b\u0430 \u0431\u0430\u0440\u0443",
+    "LabelGithub": "GitHub \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0439\u0456",
+    "LabelApiDocumentation": "API \u049b\u04b1\u0436\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b",
+    "LabelDeveloperResources": "\u0416\u0430\u0441\u0430\u049b\u0442\u0430\u0443\u0448\u044b \u043a\u04e9\u0437\u0434\u0435\u0440\u0456",
+    "LabelBrowseLibrary": "\u0422\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u043d\u044b \u0448\u043e\u043b\u0443",
+    "LabelConfigureServer": "Emby \u0442\u0435\u04a3\u0448\u0435\u0443",
+    "LabelRestartServer": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443",
+    "CategorySync": "\u04ae\u043d\u0434\u0435\u0441\u0442\u0456\u0440\u0443",
+    "CategoryUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b",
+    "CategorySystem": "\u0416\u04af\u0439\u0435",
+    "CategoryApplication": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430",
+    "CategoryPlugin": "\u041f\u043b\u0430\u0433\u0438\u043d",
+    "NotificationOptionPluginError": "\u041f\u043b\u0430\u0433\u0438\u043d \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
+    "NotificationOptionApplicationUpdateAvailable": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430 \u0436\u0430\u04a3\u0430\u0440\u0442\u0443\u044b \u049b\u043e\u043b \u0436\u0435\u0442\u0456\u043c\u0434\u0456",
+    "NotificationOptionApplicationUpdateInstalled": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430 \u0436\u0430\u04a3\u0430\u0440\u0442\u0443\u044b \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
+    "NotificationOptionPluginUpdateInstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u0436\u0430\u04a3\u0430\u0440\u0442\u0443\u044b \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
+    "NotificationOptionPluginInstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
+    "NotificationOptionPluginUninstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u043e\u0440\u043d\u0430\u0442\u0443\u044b \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0434\u044b",
+    "NotificationOptionVideoPlayback": "\u0411\u0435\u0439\u043d\u0435 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0431\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
+    "NotificationOptionAudioPlayback": "\u0414\u044b\u0431\u044b\u0441 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0431\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
+    "NotificationOptionGamePlayback": "\u041e\u0439\u044b\u043d \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0431\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
+    "NotificationOptionVideoPlaybackStopped": "\u0411\u0435\u0439\u043d\u0435 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0442\u043e\u049b\u0442\u0430\u0442\u044b\u043b\u0434\u044b",
+    "NotificationOptionAudioPlaybackStopped": "\u0414\u044b\u0431\u044b\u0441 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0442\u043e\u049b\u0442\u0430\u0442\u044b\u043b\u0434\u044b",
+    "NotificationOptionGamePlaybackStopped": "\u041e\u0439\u044b\u043d \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0442\u043e\u049b\u0442\u0430\u0442\u044b\u043b\u0434\u044b",
+    "NotificationOptionTaskFailed": "\u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
+    "NotificationOptionInstallationFailed": "\u041e\u0440\u043d\u0430\u0442\u0443 \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
+    "NotificationOptionNewLibraryContent": "\u0416\u0430\u04a3\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d \u04af\u0441\u0442\u0435\u043b\u0433\u0435\u043d",
+    "NotificationOptionNewLibraryContentMultiple": "\u0416\u0430\u04a3\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d \u049b\u043e\u0441\u044b\u043b\u0434\u044b (\u043a\u04e9\u043f\u0442\u0435\u0433\u0435\u043d)",
+    "NotificationOptionCameraImageUploaded": "\u041a\u0430\u043c\u0435\u0440\u0430\u0434\u0430\u043d \u0444\u043e\u0442\u043e\u0441\u0443\u0440\u0435\u0442 \u043a\u0435\u0440\u0456 \u049b\u043e\u0442\u0430\u0440\u044b\u043b\u0493\u0430\u043d",
+    "NotificationOptionUserLockedOut": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u049b\u04b1\u0440\u0441\u0430\u0443\u043b\u044b",
+    "NotificationOptionServerRestartRequired": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443 \u049b\u0430\u0436\u0435\u0442",
+    "ViewTypePlaylists": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0434\u0435\u0440\u0456",
+    "ViewTypeMovies": "\u041a\u0438\u043d\u043e",
+    "ViewTypeTvShows": "\u0422\u0414",
+    "ViewTypeGames": "\u041e\u0439\u044b\u043d\u0434\u0430\u0440",
+    "ViewTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
+    "ViewTypeMusicGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
+    "ViewTypeMusicArtists": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440",
+    "ViewTypeBoxSets": "\u0416\u0438\u044b\u043d\u0442\u044b\u049b\u0442\u0430\u0440",
+    "ViewTypeChannels": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440",
+    "ViewTypeLiveTV": "\u042d\u0444\u0438\u0440\u043b\u0456\u043a \u0422\u0414",
+    "ViewTypeLiveTvNowPlaying": "\u042d\u0444\u0438\u0440\u0434\u0435",
+    "ViewTypeLatestGames": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u043e\u0439\u044b\u043d\u0434\u0430\u0440",
+    "ViewTypeRecentlyPlayedGames": "\u0416\u0430\u049b\u044b\u043d\u0434\u0430 \u043e\u0439\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d\u0434\u0430\u0440",
+    "ViewTypeGameFavorites": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b\u043b\u0430\u0440",
+    "ViewTypeGameSystems": "\u041e\u0439\u044b\u043d \u0436\u04af\u0439\u0435\u043b\u0435\u0440\u0456",
+    "ViewTypeGameGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
+    "ViewTypeTvResume": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u043c\u0430\u043b\u044b",
+    "ViewTypeTvNextUp": "\u041a\u0435\u0437\u0435\u043a\u0442\u0456",
+    "ViewTypeTvLatest": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456",
+    "ViewTypeTvShowSeries": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043b\u0430\u0440",
+    "ViewTypeTvGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
+    "ViewTypeTvFavoriteSeries": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0442\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043b\u0430\u0440",
+    "ViewTypeTvFavoriteEpisodes": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0431\u04e9\u043b\u0456\u043c\u0434\u0435\u0440",
+    "ViewTypeMovieResume": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u043c\u0430\u043b\u044b",
+    "ViewTypeMovieLatest": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456",
+    "ViewTypeMovieMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
+    "ViewTypeMovieCollections": "\u0416\u0438\u044b\u043d\u0442\u044b\u049b\u0442\u0430\u0440",
+    "ViewTypeMovieFavorites": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b\u043b\u0430\u0440",
+    "ViewTypeMovieGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
+    "ViewTypeMusicLatest": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456",
+    "ViewTypeMusicPlaylists": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0434\u0435\u0440\u0456",
+    "ViewTypeMusicAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440",
+    "ViewTypeMusicAlbumArtists": "\u0410\u043b\u044c\u0431\u043e\u043c \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440\u044b",
+    "HeaderOtherDisplaySettings": "\u0411\u0435\u0439\u043d\u0435\u043b\u0435\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456",
+    "ViewTypeMusicSongs": "\u04d8\u0443\u0435\u043d\u0434\u0435\u0440",
+    "ViewTypeMusicFavorites": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b\u043b\u0430\u0440",
+    "ViewTypeMusicFavoriteAlbums": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0430\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440",
+    "ViewTypeMusicFavoriteArtists": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440",
+    "ViewTypeMusicFavoriteSongs": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u04d9\u0443\u0435\u043d\u0434\u0435\u0440",
+    "ViewTypeFolders": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
+    "ViewTypeLiveTvRecordingGroups": "\u0416\u0430\u0437\u0431\u0430\u043b\u0430\u0440",
+    "ViewTypeLiveTvChannels": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440",
+    "ScheduledTaskFailedWithName": "{0} \u0441\u04d9\u0442\u0441\u0456\u0437",
+    "LabelRunningTimeValue": "\u0406\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0443 \u0443\u0430\u049b\u044b\u0442\u044b: {0}",
+    "ScheduledTaskStartedWithName": "{0} \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0434\u044b",
+    "VersionNumber": "\u041d\u04b1\u0441\u049b\u0430\u0441\u044b: {0}",
+    "PluginInstalledWithName": "{0} \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
+    "PluginUpdatedWithName": "{0} \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "PluginUninstalledWithName": "{0} \u0436\u043e\u0439\u044b\u043b\u0434\u044b",
+    "ItemAddedWithName": "{0} (\u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u0493\u0430 \u04af\u0441\u0442\u0435\u043b\u0456\u043d\u0434\u0456)",
+    "ItemRemovedWithName": "{0} (\u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u0434\u0430\u043d \u0430\u043b\u0430\u0441\u0442\u0430\u043b\u0434\u044b)",
+    "LabelIpAddressValue": "IP \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b: {0}",
+    "DeviceOnlineWithName": "{0} \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d",
+    "UserOnlineFromDevice": "{0} - {1} \u0430\u0440\u049b\u044b\u043b\u044b \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d",
+    "ProviderValue": "\u0416\u0435\u0442\u043a\u0456\u0437\u0443\u0448\u0456: {0}",
+    "SubtitlesDownloadedForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 {0} \u04af\u0448\u0456\u043d \u0436\u04af\u043a\u0442\u0435\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0434\u044b",
+    "UserConfigurationUpdatedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u04af\u0448\u0456\u043d \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "UserCreatedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u0436\u0430\u0441\u0430\u043b\u0493\u0430\u043d",
+    "UserPasswordChangedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u04af\u0448\u0456\u043d \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437 \u04e9\u0437\u0433\u0435\u0440\u0442\u0456\u043b\u0434\u0456",
+    "UserDeletedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u0436\u043e\u0439\u044b\u043b\u0493\u0430\u043d",
+    "MessageServerConfigurationUpdated": "\u0421\u0435\u0440\u0432\u0435\u0440 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456 \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "MessageNamedServerConfigurationUpdatedWithValue": "\u0421\u0435\u0440\u0432\u0435\u0440 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456 ({0} \u0431\u04e9\u043b\u0456\u043c\u0456) \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "MessageApplicationUpdated": "Emby Server \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b.",
+    "FailedLoginAttemptWithUserName": "{0} \u043a\u0456\u0440\u0443 \u04d9\u0440\u0435\u043a\u0435\u0442\u0456 \u0441\u04d9\u0442\u0441\u0456\u0437",
+    "AuthenticationSucceededWithUserName": "{0} \u0442\u04af\u043f\u043d\u04b1\u0441\u049b\u0430\u043b\u044b\u0493\u044b\u043d \u0440\u0430\u0441\u0442\u0430\u043b\u0443\u044b \u0441\u04d9\u0442\u0442\u0456",
+    "DeviceOfflineWithName": "{0} \u0430\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
+    "UserLockedOutWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u049b\u04b1\u0440\u0441\u0430\u0443\u043b\u044b",
+    "UserOfflineFromDevice": "{0} - {1} \u0430\u0440\u049b\u044b\u043b\u044b \u0430\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
+    "UserStartedPlayingItemWithValues": "{0} - {1} \u043e\u0439\u043d\u0430\u0442\u0443\u044b\u043d \u0431\u0430\u0441\u0442\u0430\u0434\u044b",
+    "UserStoppedPlayingItemWithValues": "{0} - {1} \u043e\u0439\u043d\u0430\u0442\u0443\u044b\u043d \u0442\u043e\u049b\u0442\u0430\u0442\u0442\u044b",
+    "SubtitleDownloadFailureForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 {0} \u04af\u0448\u0456\u043d \u0436\u04af\u043a\u0442\u0435\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0443\u044b \u0441\u04d9\u0442\u0441\u0456\u0437",
+    "HeaderUnidentified": "\u0410\u043d\u044b\u049b\u0442\u0430\u043b\u043c\u0430\u0493\u0430\u043d",
+    "HeaderImagePrimary": "\u041d\u0435\u0433\u0456\u0437\u0433\u0456",
+    "HeaderImageBackdrop": "\u0410\u0440\u0442\u049b\u044b \u0441\u0443\u0440\u0435\u0442",
+    "HeaderImageLogo": "\u041b\u043e\u0433\u043e\u0442\u0438\u043f",
+    "HeaderUserPrimaryImage": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u0441\u0443\u0440\u0435\u0442\u0456",
+    "HeaderOverview": "\u0416\u0430\u043b\u043f\u044b \u0448\u043e\u043b\u0443",
+    "HeaderShortOverview": "\u049a\u044b\u0441\u049b\u0430\u0448\u0430 \u0448\u043e\u043b\u0443",
+    "HeaderType": "\u0422\u04af\u0440\u0456",
+    "HeaderSeverity": "\u049a\u0438\u044b\u043d\u0434\u044b\u0493\u044b",
+    "HeaderUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b",
+    "HeaderName": "\u0410\u0442\u044b",
+    "HeaderDate": "\u041a\u04af\u043d\u0456",
+    "HeaderPremiereDate": "\u0422\u04b1\u0441\u0430\u0443\u043a\u0435\u0441\u0435\u0440 \u043a\u04af\u043d\u0456",
+    "HeaderDateAdded": "\u04ae\u0441\u0442\u0435\u043b\u0433\u0435\u043d \u043a\u04af\u043d\u0456",
+    "HeaderReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d\u0456",
+    "HeaderRuntime": "\u04b0\u0437\u0430\u049b\u0442\u044b\u0493\u044b",
+    "HeaderPlayCount": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0435\u0441\u0435\u0431\u0456",
+    "HeaderSeason": "\u041c\u0430\u0443\u0441\u044b\u043c",
+    "HeaderSeasonNumber": "\u041c\u0430\u0443\u0441\u044b\u043c \u043d\u04e9\u043c\u0456\u0440\u0456",
+    "HeaderSeries": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043b\u0430\u0440",
+    "HeaderNetwork": "\u0422\u0435\u043b\u0435\u0436\u0435\u043b\u0456",
+    "HeaderYear": "\u0416\u044b\u043b:",
+    "HeaderYears": "\u0416\u044b\u043b\u0434\u0430\u0440:",
+    "HeaderParentalRating": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b",
+    "HeaderCommunityRating": "\u049a\u0430\u0443\u044b\u043c \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u044b",
+    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
+    "HeaderSpecials": "\u0410\u0440\u043d\u0430\u0439\u044b \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u0434\u0430\u0440",
+    "HeaderGameSystems": "\u041e\u0439\u044b\u043d \u0436\u04af\u0439\u0435\u043b\u0435\u0440\u0456",
+    "HeaderPlayers": "\u041e\u0439\u044b\u043d\u0448\u044b\u043b\u0430\u0440:",
+    "HeaderAlbumArtists": "\u0410\u043b\u044c\u0431\u043e\u043c \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440\u044b",
+    "HeaderAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440",
+    "HeaderDisc": "\u0414\u0438\u0441\u043a\u0456",
+    "HeaderTrack": "\u0416\u043e\u043b\u0448\u044b\u049b",
+    "HeaderAudio": "\u0414\u044b\u0431\u044b\u0441",
+    "HeaderVideo": "\u0411\u0435\u0439\u043d\u0435",
+    "HeaderEmbeddedImage": "\u0415\u043d\u0434\u0456\u0440\u0456\u043b\u0433\u0435\u043d \u0441\u0443\u0440\u0435\u0442",
+    "HeaderResolution": "\u0410\u0436\u044b\u0440\u0430\u0442\u044b\u043c\u0434\u044b\u043b\u044b\u0493\u044b",
+    "HeaderSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
+    "HeaderGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
+    "HeaderCountries": "\u0415\u043b\u0434\u0435\u0440",
+    "HeaderStatus": "\u041a\u04af\u0439",
+    "HeaderTracks": "\u0416\u043e\u043b\u0448\u044b\u049b\u0442\u0430\u0440",
+    "HeaderMusicArtist": "\u041c\u0443\u0437\u044b\u043a\u0430 \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b",
+    "HeaderLocked": "\u049a\u04b1\u043b\u044b\u043f\u0442\u0430\u043b\u0493\u0430\u043d",
+    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0438\u044f\u043b\u0430\u0440",
+    "HeaderActor": "\u0410\u043a\u0442\u0435\u0440\u043b\u0435\u0440",
+    "HeaderComposer": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u043b\u0430\u0440",
+    "HeaderDirector": "\u0420\u0435\u0436\u0438\u0441\u0441\u0435\u0440\u043b\u0435\u0440",
+    "HeaderGuestStar": "\u0428\u0430\u049b\u044b\u0440\u044b\u043b\u0493\u0430\u043d \u0430\u043a\u0442\u0435\u0440",
+    "HeaderProducer": "\u041f\u0440\u043e\u0434\u044e\u0441\u0435\u0440\u043b\u0435\u0440",
+    "HeaderWriter": "\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0439\u0448\u0456\u043b\u0435\u0440",
+    "HeaderParentalRatings": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u0442\u0430\u0440",
+    "HeaderCommunityRatings": "\u049a\u0430\u0443\u044b\u043c \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u043b\u0430\u0440\u044b",
+    "StartupEmbyServerIsLoading": "Emby Server \u0436\u04af\u043a\u0442\u0435\u043b\u0443\u0434\u0435. \u04d8\u0440\u0435\u043a\u0435\u0442\u0442\u0456 \u043a\u04e9\u043f \u04b1\u0437\u0430\u043c\u0430\u0439 \u049b\u0430\u0439\u0442\u0430\u043b\u0430\u04a3\u044b\u0437."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/ko.json b/Emby.Server.Implementations/Localization/Core/ko.json
new file mode 100644
index 000000000..834ccc17b
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "\uc571: {0}, \uc7a5\uce58: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "\ud63c\ud569 \ucf58\ud150\ud2b8",
+    "FolderTypeMovies": "\uc601\ud654",
+    "FolderTypeMusic": "\uc74c\uc545",
+    "FolderTypeAdultVideos": "\uc131\uc778 \ube44\ub514\uc624",
+    "FolderTypePhotos": "\uc0ac\uc9c4",
+    "FolderTypeMusicVideos": "\ubba4\uc9c1 \ube44\ub514\uc624",
+    "FolderTypeHomeVideos": "\ud648 \ube44\ub514\uc624",
+    "FolderTypeGames": "\uac8c\uc784",
+    "FolderTypeBooks": "\ucc45",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "\ubc30\uc5ed \ubc0f \uc81c\uc791\uc9c4",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "\ucc55\ud130 {0}",
+    "NameSeasonNumber": "\uc2dc\uc98c {0}",
+    "LabelExit": "\uc885\ub8cc",
+    "LabelVisitCommunity": "\ucee4\ubba4\ub2c8\ud2f0 \ubc29\ubb38",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api \ubb38\uc11c",
+    "LabelDeveloperResources": "\uac1c\ubc1c\uc790 \ub9ac\uc18c\uc2a4",
+    "LabelBrowseLibrary": "\ub77c\uc774\ube0c\ub7ec\ub9ac \ud0d0\uc0c9",
+    "LabelConfigureServer": "Emby \uc124\uc815",
+    "LabelRestartServer": "\uc11c\ubc84 \uc7ac\uc2dc\ub3d9",
+    "CategorySync": "\ub3d9\uae30\ud654",
+    "CategoryUser": "\uc0ac\uc6a9\uc790",
+    "CategorySystem": "\uc2dc\uc2a4\ud15c",
+    "CategoryApplication": "\uc560\ud50c\ub9ac\ucf00\uc774\uc158",
+    "CategoryPlugin": "\ud50c\ub7ec\uadf8\uc778",
+    "NotificationOptionPluginError": "\ud50c\ub7ec\uadf8\uc778 \uc2e4\ud328",
+    "NotificationOptionApplicationUpdateAvailable": "\uc560\ud50c\ub9ac\ucf00\uc774\uc158 \uc5c5\ub370\uc774\ud2b8 \uc0ac\uc6a9 \uac00\ub2a5",
+    "NotificationOptionApplicationUpdateInstalled": "\uc560\ud50c\ub9ac\ucf00\uc774\uc158 \uc5c5\ub370\uc774\ud2b8 \uc124\uce58\ub428",
+    "NotificationOptionPluginUpdateInstalled": "\ud50c\ub7ec\uadf8\uc778 \uc5c5\ub370\uc774\ud2b8 \uc124\uce58\ub428",
+    "NotificationOptionPluginInstalled": "\ud50c\ub7ec\uadf8\uc778 \uc124\uce58\ub428",
+    "NotificationOptionPluginUninstalled": "\ud50c\ub7ec\uadf8\uc778 \uc124\uce58 \uc81c\uac70\ub428",
+    "NotificationOptionVideoPlayback": "\ube44\ub514\uc624 \uc7ac\uc0dd \uc2dc\uc791\ub428",
+    "NotificationOptionAudioPlayback": "\uc624\ub514\uc624 \uc7ac\uc0dd \uc2dc\uc791\ub428",
+    "NotificationOptionGamePlayback": "\uac8c\uc784 \ud50c\ub808\uc774 \uc9c0\uc791\ub428",
+    "NotificationOptionVideoPlaybackStopped": "\ube44\ub514\uc624 \uc7ac\uc0dd \uc911\uc9c0\ub428",
+    "NotificationOptionAudioPlaybackStopped": "\uc624\ub514\uc624 \uc7ac\uc0dd \uc911\uc9c0\ub428",
+    "NotificationOptionGamePlaybackStopped": "\uac8c\uc784 \ud50c\ub808\uc774 \uc911\uc9c0\ub428",
+    "NotificationOptionTaskFailed": "\uc608\uc57d \uc791\uc5c5 \uc2e4\ud328",
+    "NotificationOptionInstallationFailed": "\uc124\uce58 \uc2e4\ud328",
+    "NotificationOptionNewLibraryContent": "\uc0c8 \ucf58\ud150\ud2b8 \ucd94\uac00\ub428",
+    "NotificationOptionNewLibraryContentMultiple": "\uc0c8 \ucf58\ub374\ud2b8 \ucd94\uac00\ub428 (\ubcf5\uc218)",
+    "NotificationOptionCameraImageUploaded": "\uce74\uba54\ub77c \uc774\ubbf8\uc9c0 \uc5c5\ub85c\ub4dc\ub428",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "\uc11c\ubc84\ub97c \ub2e4\uc2dc \uc2dc\uc791\ud558\uc5ec\uc57c \ud569\ub2c8\ub2e4",
+    "ViewTypePlaylists": "\uc7ac\uc0dd\ubaa9\ub85d",
+    "ViewTypeMovies": "\uc601\ud654",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "\uac8c\uc784",
+    "ViewTypeMusic": "\uc74c\uc545",
+    "ViewTypeMusicGenres": "\uc7a5\ub974",
+    "ViewTypeMusicArtists": "\uc544\ud2f0\uc2a4\ud2b8",
+    "ViewTypeBoxSets": "\uceec\ub809\uc158",
+    "ViewTypeChannels": "\ucc44\ub110",
+    "ViewTypeLiveTV": "TV \ubc29\uc1a1",
+    "ViewTypeLiveTvNowPlaying": "\uc9c0\uae08 \ubc29\uc1a1 \uc911",
+    "ViewTypeLatestGames": "\ucd5c\uadfc \uac8c\uc784",
+    "ViewTypeRecentlyPlayedGames": "\ucd5c\uadfc \ud50c\ub808\uc774",
+    "ViewTypeGameFavorites": "\uc990\uaca8\ucc3e\uae30",
+    "ViewTypeGameSystems": "\uac8c\uc784 \uc2dc\uc2a4\ud15c",
+    "ViewTypeGameGenres": "\uc7a5\ub974",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "\uc2dc\ub9ac\uc988",
+    "ViewTypeTvGenres": "\uc7a5\ub974",
+    "ViewTypeTvFavoriteSeries": "\uc88b\uc544\ud558\ub294 \uc2dc\ub9ac\uc988",
+    "ViewTypeTvFavoriteEpisodes": "\uc88b\uc544\ud558\ub294 \uc5d0\ud53c\uc18c\ub4dc",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "\uc601\ud654",
+    "ViewTypeMovieCollections": "\uceec\ub809\uc158",
+    "ViewTypeMovieFavorites": "\uc990\uaca8\ucc3e\uae30",
+    "ViewTypeMovieGenres": "\uc7a5\ub974",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "\uc7ac\uc0dd\ubaa9\ub85d",
+    "ViewTypeMusicAlbums": "\uc568\ubc94",
+    "ViewTypeMusicAlbumArtists": "\uc568\ubc94 \uc544\ud2f0\uc2a4\ud2b8",
+    "HeaderOtherDisplaySettings": "\ud654\uba74 \uc124\uc815",
+    "ViewTypeMusicSongs": "\ub178\ub798",
+    "ViewTypeMusicFavorites": "\uc990\uaca8\ucc3e\uae30",
+    "ViewTypeMusicFavoriteAlbums": "\uc88b\uc544\ud558\ub294 \uc568\ubc94",
+    "ViewTypeMusicFavoriteArtists": "\uc88b\uc544\ud558\ub294 \uc544\ud2f0\uc2a4\ud2b8",
+    "ViewTypeMusicFavoriteSongs": "\uc88b\uc544\ud558\ub294 \ub178\ub798",
+    "ViewTypeFolders": "\ud3f4\ub354",
+    "ViewTypeLiveTvRecordingGroups": "\ub179\ud654",
+    "ViewTypeLiveTvChannels": "\ucc44\ub110",
+    "ScheduledTaskFailedWithName": "{0} \uc2e4\ud328",
+    "LabelRunningTimeValue": "\uc0c1\uc601 \uc2dc\uac04: {0}",
+    "ScheduledTaskStartedWithName": "{0} \uc2dc\uc791\ub428",
+    "VersionNumber": "\ubc84\uc804 {0}",
+    "PluginInstalledWithName": "{0} \uc124\uce58\ub428",
+    "PluginUpdatedWithName": "{0} \uc5c5\ub370\uc774\ud2b8\ub428",
+    "PluginUninstalledWithName": "{0} \uc124\uce58 \uc81c\uac70\ub428",
+    "ItemAddedWithName": "\ub77c\uc774\ube0c\ub7ec\ub9ac\uc5d0 {0} \ucd94\uac00\ub428",
+    "ItemRemovedWithName": "\ub77c\uc774\ube0c\ub7ec\ub9ac\uc5d0\uc11c {0} \uc0ad\uc81c\ub428",
+    "LabelIpAddressValue": "IP \uc8fc\uc18c: {0}",
+    "DeviceOnlineWithName": "{0} \uc5f0\uacb0\ub428",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "\uc81c\uacf5\uc790: {0}",
+    "SubtitlesDownloadedForItem": "{0} \uc790\ub9c9 \ub2e4\uc6b4\ub85c\ub4dc\ub428",
+    "UserConfigurationUpdatedWithName": "{0} \uc0ac\uc6a9\uc790 \uc124\uc815\uc774 \uc5c5\ub370\uc774\ud2b8\ub428",
+    "UserCreatedWithName": "\uc0ac\uc6a9\uc790 {0} \uc0dd\uc131\ub428",
+    "UserPasswordChangedWithName": "\uc0ac\uc6a9\uc790 {0} \ube44\ubc00\ubc88\ud638 \ubcc0\uacbd\ub428",
+    "UserDeletedWithName": "\uc0ac\uc6a9\uc790 {0} \uc0ad\uc81c\ub428",
+    "MessageServerConfigurationUpdated": "\uc11c\ubc84 \ud658\uacbd \uc124\uc815 \uc5c5\ub370\uc774\ub4dc\ub428",
+    "MessageNamedServerConfigurationUpdatedWithValue": "\uc11c\ubc84 \ud658\uacbd \uc124\uc815 {0} \uc139\uc158 \uc5c5\ub370\uc774\ud2b8 \ub428",
+    "MessageApplicationUpdated": "Emby \uc11c\ubc84 \uc5c5\ub370\uc774\ud2b8\ub428",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} \uc5f0\uacb0 \ud574\uc81c\ub428",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{1} \uc5d0\uc11c {0} \uc5f0\uacb0 \ud574\uc81c\ub428",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "{0} \uc790\ub9c9 \ub2e4\uc6b4\ub85c\ub4dc \uc2e4\ud328",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "\ubc30\uacbd",
+    "HeaderImageLogo": "\ub85c\uace0",
+    "HeaderUserPrimaryImage": "\uc0ac\uc6a9\uc790 \uc774\ubbf8\uc9c0",
+    "HeaderOverview": "\uc904\uac70\ub9ac",
+    "HeaderShortOverview": "\uac04\ub7b5 \uc904\uac70\ub9ac",
+    "HeaderType": "Type",
+    "HeaderSeverity": "\uc2ec\uac01\ub3c4",
+    "HeaderUser": "\uc0ac\uc6a9\uc790",
+    "HeaderName": "Name",
+    "HeaderDate": "\ub0a0\uc9dc",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "\uac1c\ubd09\uc77c",
+    "HeaderRuntime": "\uc0c1\uc601 \uc2dc\uac04",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "\uc2dc\uc98c",
+    "HeaderSeasonNumber": "\uc2dc\uc98c \ubc88\ud638",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "\ub124\ud2b8\uc6cc\ud06c",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "\ucee4\ubba4\ub2c8\ud2f0 \ud3c9\uc810",
+    "HeaderTrailers": "\uc608\uace0\ud3b8",
+    "HeaderSpecials": "\uc2a4\ud398\uc15c",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "\uc568\ubc94",
+    "HeaderDisc": "\ub514\uc2a4\ud06c",
+    "HeaderTrack": "\ud2b8\ub799",
+    "HeaderAudio": "\uc624\ub514\uc624",
+    "HeaderVideo": "\ube44\ub514\uc624",
+    "HeaderEmbeddedImage": "\ub0b4\uc7a5 \uc774\ubbf8\uc9c0",
+    "HeaderResolution": "\ud574\uc0c1\ub3c4",
+    "HeaderSubtitles": "\uc790\ub9c9",
+    "HeaderGenres": "\uc7a5\ub974",
+    "HeaderCountries": "\uad6d\uac00",
+    "HeaderStatus": "\uc0c1\ud0dc",
+    "HeaderTracks": "\ud2b8\ub799",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "\uc7a0\uae40",
+    "HeaderStudios": "\uc2a4\ud29c\ub514\uc624",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "\uc790\ub140 \ubcf4\ud638 \ub4f1\uae09",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/ms.json b/Emby.Server.Implementations/Localization/Core/ms.json
new file mode 100644
index 000000000..fe5eef894
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/ms.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Tutup",
+    "LabelVisitCommunity": "Melawat Masyarakat",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Imbas Pengumpulan",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "Restart Server",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/nb.json b/Emby.Server.Implementations/Localization/Core/nb.json
new file mode 100644
index 000000000..315d49b5f
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0} , Device: {1}",
+    "UserDownloadingItemWithValues": "{0} laster ned {1}",
+    "FolderTypeMixed": "Forskjellig innhold",
+    "FolderTypeMovies": "Filmer",
+    "FolderTypeMusic": "Musikk",
+    "FolderTypeAdultVideos": "Voksen-videoer",
+    "FolderTypePhotos": "Foto",
+    "FolderTypeMusicVideos": "Musikk-videoer",
+    "FolderTypeHomeVideos": "Hjemme-videoer",
+    "FolderTypeGames": "Spill",
+    "FolderTypeBooks": "B\u00f8ker",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Arve",
+    "HeaderCastCrew": "Mannskap",
+    "HeaderPeople": "Personer",
+    "ValueSpecialEpisodeName": "Spesiell - {0}",
+    "LabelChapterName": "Kapittel {0}",
+    "NameSeasonNumber": "Sesong {0}",
+    "LabelExit": "Avslutt",
+    "LabelVisitCommunity": "Bes\u00f8k oss",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "API-dokumentasjon",
+    "LabelDeveloperResources": "Ressurser for Utviklere",
+    "LabelBrowseLibrary": "Browse biblioteket",
+    "LabelConfigureServer": "Konfigurer Emby",
+    "LabelRestartServer": "Restart serveren",
+    "CategorySync": "Synk",
+    "CategoryUser": "Bruker",
+    "CategorySystem": "System",
+    "CategoryApplication": "Applikasjon",
+    "CategoryPlugin": "Programtillegg",
+    "NotificationOptionPluginError": "Programtillegg feilet",
+    "NotificationOptionApplicationUpdateAvailable": "Oppdatering tilgjengelig",
+    "NotificationOptionApplicationUpdateInstalled": "Oppdatering installert",
+    "NotificationOptionPluginUpdateInstalled": "Oppdatert programtillegg installert",
+    "NotificationOptionPluginInstalled": "Programtillegg installert",
+    "NotificationOptionPluginUninstalled": "Programtillegg er fjernet",
+    "NotificationOptionVideoPlayback": "Videoavspilling startet",
+    "NotificationOptionAudioPlayback": "Lydavspilling startet",
+    "NotificationOptionGamePlayback": "Spill startet",
+    "NotificationOptionVideoPlaybackStopped": "Videoavspilling stoppet",
+    "NotificationOptionAudioPlaybackStopped": "Lydavspilling stoppet",
+    "NotificationOptionGamePlaybackStopped": "Spill stoppet",
+    "NotificationOptionTaskFailed": "Planlagt oppgave feilet",
+    "NotificationOptionInstallationFailed": "Installasjon feilet",
+    "NotificationOptionNewLibraryContent": "Nytt innhold er lagt til",
+    "NotificationOptionNewLibraryContentMultiple": "Nytt innhold lagt til (flere)",
+    "NotificationOptionCameraImageUploaded": "Bilde fra kamera lastet opp",
+    "NotificationOptionUserLockedOut": "Bruker er utestengt",
+    "NotificationOptionServerRestartRequired": "Server m\u00e5 startes p\u00e5 nytt",
+    "ViewTypePlaylists": "Spillelister",
+    "ViewTypeMovies": "Filmer",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Spill",
+    "ViewTypeMusic": "Musikk",
+    "ViewTypeMusicGenres": "Sjangere",
+    "ViewTypeMusicArtists": "Artist",
+    "ViewTypeBoxSets": "Samlinger",
+    "ViewTypeChannels": "Kanaler",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Sendes n\u00e5",
+    "ViewTypeLatestGames": "Siste spill",
+    "ViewTypeRecentlyPlayedGames": "Nylig spilt",
+    "ViewTypeGameFavorites": "Favoritter",
+    "ViewTypeGameSystems": "Spillsystemer",
+    "ViewTypeGameGenres": "Sjangere",
+    "ViewTypeTvResume": "Fortsette",
+    "ViewTypeTvNextUp": "Neste",
+    "ViewTypeTvLatest": "Siste",
+    "ViewTypeTvShowSeries": "Serier",
+    "ViewTypeTvGenres": "Sjangere",
+    "ViewTypeTvFavoriteSeries": "Favoritt serier",
+    "ViewTypeTvFavoriteEpisodes": "Favoritt episoder",
+    "ViewTypeMovieResume": "Fortsette",
+    "ViewTypeMovieLatest": "Siste",
+    "ViewTypeMovieMovies": "Filmer",
+    "ViewTypeMovieCollections": "Samlinger",
+    "ViewTypeMovieFavorites": "Favoritter",
+    "ViewTypeMovieGenres": "Sjangere",
+    "ViewTypeMusicLatest": "Siste",
+    "ViewTypeMusicPlaylists": "Spillelister",
+    "ViewTypeMusicAlbums": "Albumer",
+    "ViewTypeMusicAlbumArtists": "Album artister",
+    "HeaderOtherDisplaySettings": "Visnings Innstillinger",
+    "ViewTypeMusicSongs": "Sanger",
+    "ViewTypeMusicFavorites": "Favoritter",
+    "ViewTypeMusicFavoriteAlbums": "Favorittalbumer",
+    "ViewTypeMusicFavoriteArtists": "Favorittartister",
+    "ViewTypeMusicFavoriteSongs": "Favorittsanger",
+    "ViewTypeFolders": "Mapper",
+    "ViewTypeLiveTvRecordingGroups": "Opptak",
+    "ViewTypeLiveTvChannels": "Kanaler",
+    "ScheduledTaskFailedWithName": "{0} feilet",
+    "LabelRunningTimeValue": "Spille tide: {0}",
+    "ScheduledTaskStartedWithName": "{0} startet",
+    "VersionNumber": "Versjon {0}",
+    "PluginInstalledWithName": "{0} ble installert",
+    "PluginUpdatedWithName": "{0} ble oppdatert",
+    "PluginUninstalledWithName": "{0} ble avinstallert",
+    "ItemAddedWithName": "{0} ble lagt til biblioteket",
+    "ItemRemovedWithName": "{0} ble fjernet fra biblioteket",
+    "LabelIpAddressValue": "Ip adresse: {0}",
+    "DeviceOnlineWithName": "{0} er tilkoblet",
+    "UserOnlineFromDevice": "{0} er online fra {1}",
+    "ProviderValue": "Tilbyder: {0}",
+    "SubtitlesDownloadedForItem": "Undertekster lastet ned for {0}",
+    "UserConfigurationUpdatedWithName": "Bruker konfigurasjon har blitt oppdatert for {0}",
+    "UserCreatedWithName": "Bruker {0} har blitt opprettet",
+    "UserPasswordChangedWithName": "Passord har blitt endret for bruker {0}",
+    "UserDeletedWithName": "Bruker {0} har blitt slettet",
+    "MessageServerConfigurationUpdated": "Server konfigurasjon har blitt oppdatert",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server konfigurasjon seksjon {0} har blitt oppdatert",
+    "MessageApplicationUpdated": "Emby server har blitt oppdatert",
+    "FailedLoginAttemptWithUserName": "P\u00e5loggingsfors\u00f8k feilet fra {0}",
+    "AuthenticationSucceededWithUserName": "{0} autentisert med suksess",
+    "DeviceOfflineWithName": "{0} har koblet fra",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} har koblet fra {1}",
+    "UserStartedPlayingItemWithValues": "{0} har startet avspilling av {1}",
+    "UserStoppedPlayingItemWithValues": "{0} har stoppet avspilling av {1}",
+    "SubtitleDownloadFailureForItem": "nedlasting av undertekster feilet for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "Bruker",
+    "HeaderName": "Navn",
+    "HeaderDate": "Dato",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Utgivelsesdato",
+    "HeaderRuntime": "Spilletid",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Sesong",
+    "HeaderSeasonNumber": "Sesong nummer",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Nettverk",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Fellesskap anmeldelse",
+    "HeaderTrailers": "Trailere",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albumer",
+    "HeaderDisc": "Disk",
+    "HeaderTrack": "Spor",
+    "HeaderAudio": "Lyd",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "innebygd bilde",
+    "HeaderResolution": "Oppl\u00f8sning",
+    "HeaderSubtitles": "Undertekster",
+    "HeaderGenres": "Sjanger",
+    "HeaderCountries": "Land",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Spor",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studioer",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Foreldresensur",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/nl.json b/Emby.Server.Implementations/Localization/Core/nl.json
new file mode 100644
index 000000000..2818fbf6a
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/nl.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Een ogenblik geduld terwijl uw Emby Server-database wordt bijgewerkt. {0}% voltooid.",
+    "AppDeviceValues": "App: {0}, Apparaat: {1}",
+    "UserDownloadingItemWithValues": "{0} download {1}",
+    "FolderTypeMixed": "Gemengde inhoud",
+    "FolderTypeMovies": "Films",
+    "FolderTypeMusic": "Muziek",
+    "FolderTypeAdultVideos": "Adult video's",
+    "FolderTypePhotos": "Foto's",
+    "FolderTypeMusicVideos": "Muziek video's",
+    "FolderTypeHomeVideos": "Thuis video's",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Boeken",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "overerven",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "Personen",
+    "ValueSpecialEpisodeName": "Speciaal - {0}",
+    "LabelChapterName": "Hoofdstuk {0}",
+    "NameSeasonNumber": "Seizoen {0}",
+    "LabelExit": "Afsluiten",
+    "LabelVisitCommunity": "Bezoek Gemeenschap",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api documentatie",
+    "LabelDeveloperResources": "Ontwikkelaars bronnen",
+    "LabelBrowseLibrary": "Bekijk bibliotheek",
+    "LabelConfigureServer": "Emby Configureren",
+    "LabelRestartServer": "Server herstarten",
+    "CategorySync": "Sync",
+    "CategoryUser": "Gebruiker",
+    "CategorySystem": "Systeem",
+    "CategoryApplication": "Toepassing",
+    "CategoryPlugin": "Plug-in",
+    "NotificationOptionPluginError": "Plug-in fout",
+    "NotificationOptionApplicationUpdateAvailable": "Programma-update beschikbaar",
+    "NotificationOptionApplicationUpdateInstalled": "Programma-update ge\u00efnstalleerd",
+    "NotificationOptionPluginUpdateInstalled": "Plug-in-update ge\u00efnstalleerd",
+    "NotificationOptionPluginInstalled": "Plug-in ge\u00efnstalleerd",
+    "NotificationOptionPluginUninstalled": "Plug-in verwijderd",
+    "NotificationOptionVideoPlayback": "Video afspelen gestart",
+    "NotificationOptionAudioPlayback": "Geluid afspelen gestart",
+    "NotificationOptionGamePlayback": "Game gestart",
+    "NotificationOptionVideoPlaybackStopped": "Video afspelen gestopt",
+    "NotificationOptionAudioPlaybackStopped": "Geluid afspelen gestopt",
+    "NotificationOptionGamePlaybackStopped": "Afspelen spel gestopt",
+    "NotificationOptionTaskFailed": "Mislukken van de geplande taak",
+    "NotificationOptionInstallationFailed": "Mislukken van de installatie",
+    "NotificationOptionNewLibraryContent": "Nieuwe content toegevoegd",
+    "NotificationOptionNewLibraryContentMultiple": "Nieuwe content toegevoegd (meerdere)",
+    "NotificationOptionCameraImageUploaded": "Camera afbeelding ge\u00fcpload",
+    "NotificationOptionUserLockedOut": "Gebruikersaccount vergrendeld",
+    "NotificationOptionServerRestartRequired": "Server herstart nodig",
+    "ViewTypePlaylists": "Afspeellijsten",
+    "ViewTypeMovies": "Films",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Muziek",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artiesten",
+    "ViewTypeBoxSets": "Collecties",
+    "ViewTypeChannels": "Kanalen",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Nu uitgezonden",
+    "ViewTypeLatestGames": "Nieuwste games",
+    "ViewTypeRecentlyPlayedGames": "Recent gespeelt",
+    "ViewTypeGameFavorites": "Favorieten",
+    "ViewTypeGameSystems": "Game systemen",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Hervatten",
+    "ViewTypeTvNextUp": "Volgende",
+    "ViewTypeTvLatest": "Nieuwste",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favoriete Series",
+    "ViewTypeTvFavoriteEpisodes": "Favoriete Afleveringen",
+    "ViewTypeMovieResume": "Hervatten",
+    "ViewTypeMovieLatest": "Nieuwste",
+    "ViewTypeMovieMovies": "Films",
+    "ViewTypeMovieCollections": "Collecties",
+    "ViewTypeMovieFavorites": "Favorieten",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Nieuwste",
+    "ViewTypeMusicPlaylists": "Afspeellijsten",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album artiesten",
+    "HeaderOtherDisplaySettings": "Beeld instellingen",
+    "ViewTypeMusicSongs": "Nummers",
+    "ViewTypeMusicFavorites": "Favorieten",
+    "ViewTypeMusicFavoriteAlbums": "Favoriete albums",
+    "ViewTypeMusicFavoriteArtists": "Favoriete artiesten",
+    "ViewTypeMusicFavoriteSongs": "Favoriete nummers",
+    "ViewTypeFolders": "Mappen",
+    "ViewTypeLiveTvRecordingGroups": "Opnamen",
+    "ViewTypeLiveTvChannels": "Kanalen",
+    "ScheduledTaskFailedWithName": "{0} is mislukt",
+    "LabelRunningTimeValue": "Looptijd: {0}",
+    "ScheduledTaskStartedWithName": "{0} is gestart",
+    "VersionNumber": "Versie {0}",
+    "PluginInstalledWithName": "{0} is ge\u00efnstalleerd",
+    "PluginUpdatedWithName": "{0} is bijgewerkt",
+    "PluginUninstalledWithName": "{0} is gede\u00efnstalleerd",
+    "ItemAddedWithName": "{0} is toegevoegd aan de bibliotheek",
+    "ItemRemovedWithName": "{0} is verwijderd uit de bibliotheek",
+    "LabelIpAddressValue": "IP adres: {0}",
+    "DeviceOnlineWithName": "{0} is verbonden",
+    "UserOnlineFromDevice": "{0} heeft verbinding met {1}",
+    "ProviderValue": "Aanbieder: {0}",
+    "SubtitlesDownloadedForItem": "Ondertiteling voor {0} is gedownload",
+    "UserConfigurationUpdatedWithName": "Gebruikersinstellingen voor {0} zijn bijgewerkt",
+    "UserCreatedWithName": "Gebruiker {0} is aangemaakt",
+    "UserPasswordChangedWithName": "Wachtwoord voor {0} is gewijzigd",
+    "UserDeletedWithName": "Gebruiker {0} is verwijderd",
+    "MessageServerConfigurationUpdated": "Server configuratie is bijgewerkt",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Sectie {0} van de server configuratie is bijgewerkt",
+    "MessageApplicationUpdated": "Emby Server is bijgewerkt",
+    "FailedLoginAttemptWithUserName": "Mislukte aanmeld poging van {0}",
+    "AuthenticationSucceededWithUserName": "{0} is succesvol geverifieerd",
+    "DeviceOfflineWithName": "{0} is losgekoppeld",
+    "UserLockedOutWithName": "Gebruikersaccount {0} is vergrendeld",
+    "UserOfflineFromDevice": "Verbinding van {0} met {1} is verbroken",
+    "UserStartedPlayingItemWithValues": "{0} heeft afspelen van {1} gestart",
+    "UserStoppedPlayingItemWithValues": "{0} heeft afspelen van {1} gestopt",
+    "SubtitleDownloadFailureForItem": "Downloaden van ondertiteling voor {0} is mislukt",
+    "HeaderUnidentified": "One\u00efdentificaard",
+    "HeaderImagePrimary": "Primair",
+    "HeaderImageBackdrop": "Achtergrond",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Afbeelding gebruiker",
+    "HeaderOverview": "Overzicht",
+    "HeaderShortOverview": "Kort overzicht",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Ernst",
+    "HeaderUser": "Gebruiker",
+    "HeaderName": "Naam",
+    "HeaderDate": "Datum",
+    "HeaderPremiereDate": "Premi\u00e8re Datum",
+    "HeaderDateAdded": "Datum toegevoegd",
+    "HeaderReleaseDate": "Uitgave datum",
+    "HeaderRuntime": "Speelduur",
+    "HeaderPlayCount": "Afspeel telling",
+    "HeaderSeason": "Seizoen",
+    "HeaderSeasonNumber": "Seizoen nummer",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Zender",
+    "HeaderYear": "Jaar:",
+    "HeaderYears": "Jaren:",
+    "HeaderParentalRating": "Kijkwijzer classificatie",
+    "HeaderCommunityRating": "Gemeenschap cijfer",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game systemen",
+    "HeaderPlayers": "Spelers:",
+    "HeaderAlbumArtists": "Album artiesten",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Schijf",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Geluid",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Ingesloten afbeelding",
+    "HeaderResolution": "Resolutie",
+    "HeaderSubtitles": "Ondertiteling",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Landen",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Muziek artiest",
+    "HeaderLocked": "Vergrendeld",
+    "HeaderStudios": "Studio's",
+    "HeaderActor": "Acteurs",
+    "HeaderComposer": "Componisten",
+    "HeaderDirector": "Regiseurs",
+    "HeaderGuestStar": "Gast ster",
+    "HeaderProducer": "Producenten",
+    "HeaderWriter": "Schrijvers",
+    "HeaderParentalRatings": "Ouderlijke toezicht",
+    "HeaderCommunityRatings": "Gemeenschapswaardering",
+    "StartupEmbyServerIsLoading": "Emby Server is aan het laden, probeer het later opnieuw."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/pl.json b/Emby.Server.Implementations/Localization/Core/pl.json
new file mode 100644
index 000000000..cdaa87c4d
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Prosz\u0119 czeka\u0107 na koniec aktualizacji biblioteki. Post\u0119p: {0}%",
+    "AppDeviceValues": "Aplikacja: {0}, Urz\u0105dzenie: {1}",
+    "UserDownloadingItemWithValues": "{0} pobiera {1}",
+    "FolderTypeMixed": "Zawarto\u015b\u0107 mieszana",
+    "FolderTypeMovies": "Filmy",
+    "FolderTypeMusic": "Muzyka",
+    "FolderTypeAdultVideos": "Filmy dla doros\u0142ych",
+    "FolderTypePhotos": "Zdj\u0119cia",
+    "FolderTypeMusicVideos": "Teledyski",
+    "FolderTypeHomeVideos": "Filmy domowe",
+    "FolderTypeGames": "Gry",
+    "FolderTypeBooks": "Ksi\u0105\u017cki",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Dziedzicz",
+    "HeaderCastCrew": "Obsada & Eikpa",
+    "HeaderPeople": "Ludzie",
+    "ValueSpecialEpisodeName": "Specjalny - {0}",
+    "LabelChapterName": "Rozdzia\u0142 {0}",
+    "NameSeasonNumber": "Sezon {0}",
+    "LabelExit": "Wyj\u015bcie",
+    "LabelVisitCommunity": "Odwied\u017a spo\u0142eczno\u015b\u0107",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Dokumantacja API",
+    "LabelDeveloperResources": "Materia\u0142y dla deweloper\u00f3w",
+    "LabelBrowseLibrary": "Przegl\u0105daj bibliotek\u0119",
+    "LabelConfigureServer": "Konfiguracja Emby",
+    "LabelRestartServer": "Restart serwera",
+    "CategorySync": "Sync",
+    "CategoryUser": "U\u017cytkownik",
+    "CategorySystem": "System",
+    "CategoryApplication": "Aplikacja",
+    "CategoryPlugin": "Wtyczka",
+    "NotificationOptionPluginError": "Niepowodzenie wtyczki",
+    "NotificationOptionApplicationUpdateAvailable": "Dost\u0119pna aktualizacja aplikacji",
+    "NotificationOptionApplicationUpdateInstalled": "Zainstalowano aktualizacj\u0119 aplikacji",
+    "NotificationOptionPluginUpdateInstalled": "Zainstalowano aktualizacj\u0119 wtyczki",
+    "NotificationOptionPluginInstalled": "Zainstalowano wtyczk\u0119",
+    "NotificationOptionPluginUninstalled": "Odinstalowano wtyczk\u0119",
+    "NotificationOptionVideoPlayback": "Rozpocz\u0119to odtwarzanie wideo",
+    "NotificationOptionAudioPlayback": "Rozpocz\u0119to odtwarzanie audio",
+    "NotificationOptionGamePlayback": "Odtwarzanie gry rozpocz\u0119te",
+    "NotificationOptionVideoPlaybackStopped": "Odtwarzanie wideo zatrzymane",
+    "NotificationOptionAudioPlaybackStopped": "Odtwarzane audio zatrzymane",
+    "NotificationOptionGamePlaybackStopped": "Odtwarzanie gry zatrzymane",
+    "NotificationOptionTaskFailed": "Niepowodzenie zaplanowanego zadania",
+    "NotificationOptionInstallationFailed": "Niepowodzenie instalacji",
+    "NotificationOptionNewLibraryContent": "Nowa zawarto\u015b\u0107 dodana",
+    "NotificationOptionNewLibraryContentMultiple": "Nowa zawarto\u015b\u0107 dodana (wiele)",
+    "NotificationOptionCameraImageUploaded": "Obraz z Kamery dodany",
+    "NotificationOptionUserLockedOut": "U\u017cytkownik zablokowany",
+    "NotificationOptionServerRestartRequired": "Restart serwera wymagany",
+    "ViewTypePlaylists": "Playlisty",
+    "ViewTypeMovies": "Filmy",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Gry",
+    "ViewTypeMusic": "Muzyka",
+    "ViewTypeMusicGenres": "Gatunki",
+    "ViewTypeMusicArtists": "Arty\u015bci",
+    "ViewTypeBoxSets": "Kolekcje",
+    "ViewTypeChannels": "Kana\u0142y",
+    "ViewTypeLiveTV": "TV Na \u017bywo",
+    "ViewTypeLiveTvNowPlaying": "Teraz Transmitowane",
+    "ViewTypeLatestGames": "Ostatnie Gry",
+    "ViewTypeRecentlyPlayedGames": "Ostatnio Odtwarzane",
+    "ViewTypeGameFavorites": "Ulubione",
+    "ViewTypeGameSystems": "Systemy Gier Wideo",
+    "ViewTypeGameGenres": "Gatunki",
+    "ViewTypeTvResume": "Wzn\u00f3w",
+    "ViewTypeTvNextUp": "Nast\u0119pny",
+    "ViewTypeTvLatest": "Najnowsze",
+    "ViewTypeTvShowSeries": "Seriale",
+    "ViewTypeTvGenres": "Gatunki",
+    "ViewTypeTvFavoriteSeries": "Ulubione Seriale",
+    "ViewTypeTvFavoriteEpisodes": "Ulubione Odcinki",
+    "ViewTypeMovieResume": "Wzn\u00f3w",
+    "ViewTypeMovieLatest": "Najnowsze",
+    "ViewTypeMovieMovies": "Filmy",
+    "ViewTypeMovieCollections": "Kolekcje",
+    "ViewTypeMovieFavorites": "Ulubione",
+    "ViewTypeMovieGenres": "Gatunki",
+    "ViewTypeMusicLatest": "Najnowsze",
+    "ViewTypeMusicPlaylists": "Playlisty",
+    "ViewTypeMusicAlbums": "Albumy",
+    "ViewTypeMusicAlbumArtists": "Arty\u015bci albumu",
+    "HeaderOtherDisplaySettings": "Ustawienia Wy\u015bwietlania",
+    "ViewTypeMusicSongs": "Utwory",
+    "ViewTypeMusicFavorites": "Ulubione",
+    "ViewTypeMusicFavoriteAlbums": "Ulubione Albumy",
+    "ViewTypeMusicFavoriteArtists": "Ulubieni Arty\u015bci",
+    "ViewTypeMusicFavoriteSongs": "Ulubione Utwory",
+    "ViewTypeFolders": "Foldery",
+    "ViewTypeLiveTvRecordingGroups": "Nagrania",
+    "ViewTypeLiveTvChannels": "Kana\u0142y",
+    "ScheduledTaskFailedWithName": "{0} niepowodze\u0144",
+    "LabelRunningTimeValue": "Czas trwania: {0}",
+    "ScheduledTaskStartedWithName": "{0} rozpocz\u0119te",
+    "VersionNumber": "Wersja {0}",
+    "PluginInstalledWithName": "{0} zainstalowanych",
+    "PluginUpdatedWithName": "{0} zaktualizowanych",
+    "PluginUninstalledWithName": "{0} odinstalowanych",
+    "ItemAddedWithName": "{0} dodanych do biblioteki",
+    "ItemRemovedWithName": "{0} usuni\u0119tych z biblioteki",
+    "LabelIpAddressValue": "Adres IP: {0}",
+    "DeviceOnlineWithName": "{0} po\u0142\u0105czonych",
+    "UserOnlineFromDevice": "{0} jest online od {1}",
+    "ProviderValue": "Dostawca: {0}",
+    "SubtitlesDownloadedForItem": "Napisy pobrane dla {0}",
+    "UserConfigurationUpdatedWithName": "Konfiguracja u\u017cytkownika zosta\u0142a zaktualizowana dla {0}",
+    "UserCreatedWithName": "U\u017cytkownik {0} zosta\u0142 utworzony",
+    "UserPasswordChangedWithName": "Has\u0142o zosta\u0142o zmienione dla u\u017cytkownika {0}",
+    "UserDeletedWithName": "u\u017cytkownik {0} zosta\u0142 usuni\u0119ty",
+    "MessageServerConfigurationUpdated": "Konfiguracja serwera zosta\u0142a zaktualizowana",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Sekcja {0} konfiguracji serwera zosta\u0142a zaktualizowana",
+    "MessageApplicationUpdated": "Serwer Emby zosta\u0142 zaktualizowany",
+    "FailedLoginAttemptWithUserName": "Nieudana pr\u00f3ba logowania z {0}",
+    "AuthenticationSucceededWithUserName": "{0} zaktualizowanych z powodzeniem",
+    "DeviceOfflineWithName": "{0} zosta\u0142o od\u0142aczonych",
+    "UserLockedOutWithName": "U\u017cytkownik {0} zosta\u0142 zablokowany",
+    "UserOfflineFromDevice": "{0} zosta\u0142o od\u0142\u0105czonych od {1}",
+    "UserStartedPlayingItemWithValues": "{0} rozpocz\u0105\u0142 odtwarzanie {1}",
+    "UserStoppedPlayingItemWithValues": "{0} zatrzyma\u0142 odtwarzanie {1}",
+    "SubtitleDownloadFailureForItem": "Napisy niepobrane dla {0}",
+    "HeaderUnidentified": "Niezidentyfikowane",
+    "HeaderImagePrimary": "Priorytetowy",
+    "HeaderImageBackdrop": "Obraz t\u0142a",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Avatar u\u017cytkownika",
+    "HeaderOverview": "Opis",
+    "HeaderShortOverview": "Kr\u00f3tki Opis",
+    "HeaderType": "Typ",
+    "HeaderSeverity": "Rygor",
+    "HeaderUser": "U\u017cytkownik",
+    "HeaderName": "Nazwa",
+    "HeaderDate": "Data",
+    "HeaderPremiereDate": "Data premiery",
+    "HeaderDateAdded": "Data dodania",
+    "HeaderReleaseDate": "Data wydania",
+    "HeaderRuntime": "D\u0142ugo\u015b\u0107 filmu",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Sezon",
+    "HeaderSeasonNumber": "Numer sezonu",
+    "HeaderSeries": "Seriale:",
+    "HeaderNetwork": "Sie\u0107",
+    "HeaderYear": "Rok:",
+    "HeaderYears": "Lata:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Ocena spo\u0142eczno\u015bci",
+    "HeaderTrailers": "Zwiastuny",
+    "HeaderSpecials": "Specjalne",
+    "HeaderGameSystems": "Systemy gier",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albumy",
+    "HeaderDisc": "P\u0142yta",
+    "HeaderTrack": "\u015acie\u017cka",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Wideo",
+    "HeaderEmbeddedImage": "Osadzony obraz",
+    "HeaderResolution": "Rozdzielczo\u015b\u0107",
+    "HeaderSubtitles": "Napisy",
+    "HeaderGenres": "Gatunki",
+    "HeaderCountries": "Kraje",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Utwory",
+    "HeaderMusicArtist": "Wykonawcy muzyczni",
+    "HeaderLocked": "Zablokowane",
+    "HeaderStudios": "Studia",
+    "HeaderActor": "Aktorzy",
+    "HeaderComposer": "Kopozytorzy",
+    "HeaderDirector": "Re\u017cyszerzy",
+    "HeaderGuestStar": "Go\u015b\u0107 specjalny",
+    "HeaderProducer": "Producenci",
+    "HeaderWriter": "Scenarzy\u015bci",
+    "HeaderParentalRatings": "Ocena rodzicielska",
+    "HeaderCommunityRatings": "Ocena spo\u0142eczno\u015bci",
+    "StartupEmbyServerIsLoading": "Serwer Emby si\u0119 \u0142aduje. Prosz\u0119 spr\u00f3bowa\u0107 za chwil\u0119."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/pt-BR.json b/Emby.Server.Implementations/Localization/Core/pt-BR.json
new file mode 100644
index 000000000..67f204b2e
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Por favor, aguarde enquanto a base de dados do Servidor Emby \u00e9 atualizada. {0}% completo.",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
+    "UserDownloadingItemWithValues": "{0} est\u00e1 fazendo download de {1}",
+    "FolderTypeMixed": "Conte\u00fado misto",
+    "FolderTypeMovies": "Filmes",
+    "FolderTypeMusic": "M\u00fasica",
+    "FolderTypeAdultVideos": "V\u00eddeos adultos",
+    "FolderTypePhotos": "Fotos",
+    "FolderTypeMusicVideos": "V\u00eddeos musicais",
+    "FolderTypeHomeVideos": "V\u00eddeos caseiros",
+    "FolderTypeGames": "Jogos",
+    "FolderTypeBooks": "Livros",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Herdar",
+    "HeaderCastCrew": "Elenco & Equipe",
+    "HeaderPeople": "Pessoas",
+    "ValueSpecialEpisodeName": "Especial -  {0}",
+    "LabelChapterName": "Cap\u00edtulo {0}",
+    "NameSeasonNumber": "Temporada {0}",
+    "LabelExit": "Sair",
+    "LabelVisitCommunity": "Visitar a Comunidade",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documenta\u00e7\u00e3o da Api",
+    "LabelDeveloperResources": "Recursos do Desenvolvedor",
+    "LabelBrowseLibrary": "Explorar Biblioteca",
+    "LabelConfigureServer": "Configurar o Emby",
+    "LabelRestartServer": "Reiniciar Servidor",
+    "CategorySync": "Sincroniza\u00e7\u00e3o",
+    "CategoryUser": "Usu\u00e1rio",
+    "CategorySystem": "Sistema",
+    "CategoryApplication": "Aplica\u00e7\u00e3o",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Falha no plugin",
+    "NotificationOptionApplicationUpdateAvailable": "Atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o disponivel",
+    "NotificationOptionApplicationUpdateInstalled": "Atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o instalada",
+    "NotificationOptionPluginUpdateInstalled": "Atualiza\u00e7\u00e3o do plugin instalada",
+    "NotificationOptionPluginInstalled": "Plugin instalado",
+    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
+    "NotificationOptionVideoPlayback": "Reprodu\u00e7\u00e3o de v\u00eddeo iniciada",
+    "NotificationOptionAudioPlayback": "Reprodu\u00e7\u00e3o de \u00e1udio iniciada",
+    "NotificationOptionGamePlayback": "Reprodu\u00e7\u00e3o de jogo iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reprodu\u00e7\u00e3o de v\u00eddeo parada",
+    "NotificationOptionAudioPlaybackStopped": "Reprodu\u00e7\u00e3o de \u00e1udio parada",
+    "NotificationOptionGamePlaybackStopped": "Reprodu\u00e7\u00e3o de jogo parada",
+    "NotificationOptionTaskFailed": "Falha na tarefa agendada",
+    "NotificationOptionInstallationFailed": "Falha na instala\u00e7\u00e3o",
+    "NotificationOptionNewLibraryContent": "Novo conte\u00fado adicionado",
+    "NotificationOptionNewLibraryContentMultiple": "Novo conte\u00fado adicionado (m\u00faltiplo)",
+    "NotificationOptionCameraImageUploaded": "Imagem da c\u00e2mera carregada",
+    "NotificationOptionUserLockedOut": "Usu\u00e1rio bloqueado",
+    "NotificationOptionServerRestartRequired": "Necessidade de reiniciar servidor",
+    "ViewTypePlaylists": "Listas de Reprodu\u00e7\u00e3o",
+    "ViewTypeMovies": "Filmes",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Jogos",
+    "ViewTypeMusic": "M\u00fasicas",
+    "ViewTypeMusicGenres": "G\u00eaneros",
+    "ViewTypeMusicArtists": "Artistas",
+    "ViewTypeBoxSets": "Cole\u00e7\u00f5es",
+    "ViewTypeChannels": "Canais",
+    "ViewTypeLiveTV": "TV ao Vivo",
+    "ViewTypeLiveTvNowPlaying": "Exibindo Agora",
+    "ViewTypeLatestGames": "Jogos Recentes",
+    "ViewTypeRecentlyPlayedGames": "Reproduzido Recentemente",
+    "ViewTypeGameFavorites": "Favoritos",
+    "ViewTypeGameSystems": "Sistemas de Jogo",
+    "ViewTypeGameGenres": "G\u00eaneros",
+    "ViewTypeTvResume": "Retomar",
+    "ViewTypeTvNextUp": "Pr\u00f3ximos",
+    "ViewTypeTvLatest": "Recentes",
+    "ViewTypeTvShowSeries": "S\u00e9ries",
+    "ViewTypeTvGenres": "G\u00eaneros",
+    "ViewTypeTvFavoriteSeries": "S\u00e9ries Favoritas",
+    "ViewTypeTvFavoriteEpisodes": "Epis\u00f3dios Favoritos",
+    "ViewTypeMovieResume": "Retomar",
+    "ViewTypeMovieLatest": "Recentes",
+    "ViewTypeMovieMovies": "Filmes",
+    "ViewTypeMovieCollections": "Cole\u00e7\u00f5es",
+    "ViewTypeMovieFavorites": "Favoritos",
+    "ViewTypeMovieGenres": "G\u00eaneros",
+    "ViewTypeMusicLatest": "Recentes",
+    "ViewTypeMusicPlaylists": "Listas de Reprodu\u00e7\u00e3o",
+    "ViewTypeMusicAlbums": "\u00c1lbuns",
+    "ViewTypeMusicAlbumArtists": "Artistas do \u00c1lbum",
+    "HeaderOtherDisplaySettings": "Ajustes de Exibi\u00e7\u00e3o",
+    "ViewTypeMusicSongs": "M\u00fasicas",
+    "ViewTypeMusicFavorites": "Favoritos",
+    "ViewTypeMusicFavoriteAlbums": "\u00c1lbuns Favoritos",
+    "ViewTypeMusicFavoriteArtists": "Artistas Favoritos",
+    "ViewTypeMusicFavoriteSongs": "M\u00fasicas Favoritas",
+    "ViewTypeFolders": "Pastas",
+    "ViewTypeLiveTvRecordingGroups": "Grava\u00e7\u00f5es",
+    "ViewTypeLiveTvChannels": "Canais",
+    "ScheduledTaskFailedWithName": "{0} falhou",
+    "LabelRunningTimeValue": "Dura\u00e7\u00e3o: {0}",
+    "ScheduledTaskStartedWithName": "{0} iniciado",
+    "VersionNumber": "Vers\u00e3o {0}",
+    "PluginInstalledWithName": "{0} foi instalado",
+    "PluginUpdatedWithName": "{0} foi atualizado",
+    "PluginUninstalledWithName": "{0} foi desinstalado",
+    "ItemAddedWithName": "{0} foi adicionado \u00e0 biblioteca",
+    "ItemRemovedWithName": "{0} foi removido da biblioteca",
+    "LabelIpAddressValue": "Endere\u00e7o Ip: {0}",
+    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
+    "UserOnlineFromDevice": "{0} est\u00e1 ativo em {1}",
+    "ProviderValue": "Provedor: {0}",
+    "SubtitlesDownloadedForItem": "Legendas baixadas para {0}",
+    "UserConfigurationUpdatedWithName": "A configura\u00e7\u00e3o do usu\u00e1rio {0} foi atualizada",
+    "UserCreatedWithName": "O usu\u00e1rio {0} foi criado",
+    "UserPasswordChangedWithName": "A senha do usu\u00e1rio {0} foi alterada",
+    "UserDeletedWithName": "O usu\u00e1rio {0} foi exclu\u00eddo",
+    "MessageServerConfigurationUpdated": "A configura\u00e7\u00e3o do servidor foi atualizada",
+    "MessageNamedServerConfigurationUpdatedWithValue": "A se\u00e7\u00e3o {0} da configura\u00e7\u00e3o do servidor foi atualizada",
+    "MessageApplicationUpdated": "O Servidor Emby foi atualizado",
+    "FailedLoginAttemptWithUserName": "Falha na tentativa de login de {0}",
+    "AuthenticationSucceededWithUserName": "{0} autenticou-se com sucesso",
+    "DeviceOfflineWithName": "{0} foi desconectado",
+    "UserLockedOutWithName": "Usu\u00e1rio {0} foi bloqueado",
+    "UserOfflineFromDevice": "{0} foi desconectado de {1}",
+    "UserStartedPlayingItemWithValues": "{0} come\u00e7ou a reproduzir {1}",
+    "UserStoppedPlayingItemWithValues": "{0} parou de reproduzir {1}",
+    "SubtitleDownloadFailureForItem": "Falha ao baixar legendas para {0}",
+    "HeaderUnidentified": "N\u00e3o-identificado",
+    "HeaderImagePrimary": "Principal",
+    "HeaderImageBackdrop": "Imagem de Fundo",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "Imagem do Usu\u00e1rio",
+    "HeaderOverview": "Sinopse",
+    "HeaderShortOverview": "Sinopse curta",
+    "HeaderType": "Tipo",
+    "HeaderSeverity": "Severidade",
+    "HeaderUser": "Usu\u00e1rio",
+    "HeaderName": "Nome",
+    "HeaderDate": "Data",
+    "HeaderPremiereDate": "Data da Estr\u00e9ia",
+    "HeaderDateAdded": "Data da Adi\u00e7\u00e3o",
+    "HeaderReleaseDate": "Data de lan\u00e7amento",
+    "HeaderRuntime": "Dura\u00e7\u00e3o",
+    "HeaderPlayCount": "N\u00famero de Reprodu\u00e7\u00f5es",
+    "HeaderSeason": "Temporada",
+    "HeaderSeasonNumber": "N\u00famero da temporada",
+    "HeaderSeries": "S\u00e9rie:",
+    "HeaderNetwork": "Rede de TV",
+    "HeaderYear": "Ano:",
+    "HeaderYears": "Anos:",
+    "HeaderParentalRating": "Classifica\u00e7\u00e3o Parental",
+    "HeaderCommunityRating": "Avalia\u00e7\u00e3o da Comunidade",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Especiais",
+    "HeaderGameSystems": "Sistemas de Jogo",
+    "HeaderPlayers": "Jogadores:",
+    "HeaderAlbumArtists": "Artistas do \u00c1lbum",
+    "HeaderAlbums": "\u00c1lbuns",
+    "HeaderDisc": "Disco",
+    "HeaderTrack": "Faixa",
+    "HeaderAudio": "\u00c1udio",
+    "HeaderVideo": "V\u00eddeo",
+    "HeaderEmbeddedImage": "Imagem incorporada",
+    "HeaderResolution": "Resolu\u00e7\u00e3o",
+    "HeaderSubtitles": "Legendas",
+    "HeaderGenres": "G\u00eaneros",
+    "HeaderCountries": "Pa\u00edses",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Faixas",
+    "HeaderMusicArtist": "Artista da m\u00fasica",
+    "HeaderLocked": "Travado",
+    "HeaderStudios": "Est\u00fadios",
+    "HeaderActor": "Atores",
+    "HeaderComposer": "Compositores",
+    "HeaderDirector": "Diretores",
+    "HeaderGuestStar": "Ator convidado",
+    "HeaderProducer": "Produtores",
+    "HeaderWriter": "Escritores",
+    "HeaderParentalRatings": "Classifica\u00e7\u00f5es Parentais",
+    "HeaderCommunityRatings": "Avalia\u00e7\u00f5es da comunidade",
+    "StartupEmbyServerIsLoading": "O Servidor Emby est\u00e1 carregando. Por favor, tente novamente em breve."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/pt-PT.json b/Emby.Server.Implementations/Localization/Core/pt-PT.json
new file mode 100644
index 000000000..f12939b10
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Filmes",
+    "FolderTypeMusic": "M\u00fasica",
+    "FolderTypeAdultVideos": "V\u00eddeos adultos",
+    "FolderTypePhotos": "Fotos",
+    "FolderTypeMusicVideos": "V\u00eddeos musicais",
+    "FolderTypeHomeVideos": "V\u00eddeos caseiros",
+    "FolderTypeGames": "Jogos",
+    "FolderTypeBooks": "Livros",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Elenco e Equipa",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Sair",
+    "LabelVisitCommunity": "Visitar a Comunidade",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documenta\u00e7\u00e3o da API",
+    "LabelDeveloperResources": "Recursos do Programador",
+    "LabelBrowseLibrary": "Navegar pela Biblioteca",
+    "LabelConfigureServer": "Configurar o Emby",
+    "LabelRestartServer": "Reiniciar Servidor",
+    "CategorySync": "Sincroniza\u00e7\u00e3o",
+    "CategoryUser": "Utilizador",
+    "CategorySystem": "Sistema",
+    "CategoryApplication": "Aplica\u00e7\u00e3o",
+    "CategoryPlugin": "Extens\u00e3o",
+    "NotificationOptionPluginError": "Falha na extens\u00e3o",
+    "NotificationOptionApplicationUpdateAvailable": "Dispon\u00edvel atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o",
+    "NotificationOptionApplicationUpdateInstalled": "Instalada atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o",
+    "NotificationOptionPluginUpdateInstalled": "Instalada atualiza\u00e7\u00e3o da extens\u00e3o",
+    "NotificationOptionPluginInstalled": "Extens\u00e3o instalada",
+    "NotificationOptionPluginUninstalled": "Extens\u00e3o desinstalada",
+    "NotificationOptionVideoPlayback": "Reprodu\u00e7\u00e3o de v\u00eddeo iniciada",
+    "NotificationOptionAudioPlayback": "Reprodu\u00e7\u00e3o de \u00e1udio iniciada",
+    "NotificationOptionGamePlayback": "Reprodu\u00e7\u00e3o de jogo iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reprodu\u00e7\u00e3o de v\u00eddeo parada",
+    "NotificationOptionAudioPlaybackStopped": "Reprodu\u00e7\u00e3o de \u00e1udio parada",
+    "NotificationOptionGamePlaybackStopped": "Reprodu\u00e7\u00e3o de jogo parada",
+    "NotificationOptionTaskFailed": "Falha na tarefa agendada",
+    "NotificationOptionInstallationFailed": "Falha na instala\u00e7\u00e3o",
+    "NotificationOptionNewLibraryContent": "Adicionado novo conte\u00fado",
+    "NotificationOptionNewLibraryContentMultiple": "Novo conte\u00fado adicionado (m\u00faltiplo)",
+    "NotificationOptionCameraImageUploaded": "Imagem da c\u00e2mara carregada",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "\u00c9 necess\u00e1rio reiniciar o servidor",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "TV ao Vivo",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Reproduzido Recentemente",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "\u00daltimas",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "\u00daltimas",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "\u00daltimas",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Vers\u00e3o {0}",
+    "PluginInstalledWithName": "{0} foi instalado",
+    "PluginUpdatedWithName": "{0} foi atualizado",
+    "PluginUninstalledWithName": "{0} foi desinstalado",
+    "ItemAddedWithName": "{0} foi adicionado \u00e0 biblioteca",
+    "ItemRemovedWithName": "{0} foi removido da biblioteca",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Nome",
+    "HeaderDate": "Data",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "\u00c1udio",
+    "HeaderVideo": "V\u00eddeo",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Estado",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/ro.json b/Emby.Server.Implementations/Localization/Core/ro.json
new file mode 100644
index 000000000..c58df27d5
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/ro.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Continut mixt",
+    "FolderTypeMovies": "Filme",
+    "FolderTypeMusic": "Muzica",
+    "FolderTypeAdultVideos": "Filme Porno",
+    "FolderTypePhotos": "Fotografii",
+    "FolderTypeMusicVideos": "Videoclipuri",
+    "FolderTypeHomeVideos": "Video Personale",
+    "FolderTypeGames": "Jocuri",
+    "FolderTypeBooks": "Carti",
+    "FolderTypeTvShows": "Seriale TV",
+    "FolderTypeInherit": "Relationat",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Iesire",
+    "LabelVisitCommunity": "Viziteaza comunitatea",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentatie Api",
+    "LabelDeveloperResources": "Resurse Dezvoltator",
+    "LabelBrowseLibrary": "Rasfoieste Librarie",
+    "LabelConfigureServer": "Configureaza Emby",
+    "LabelRestartServer": "Restarteaza Server",
+    "CategorySync": "Sincronizeaza",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Muzica",
+    "HeaderVideo": "Filme",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/ru.json b/Emby.Server.Implementations/Localization/Core/ru.json
new file mode 100644
index 000000000..62fe3b496
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/ru.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "\u041f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435, \u043f\u043e\u043a\u0430 \u0431\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0430 \u0432\u0430\u0448\u0435\u043c Emby Server \u043c\u043e\u0434\u0435\u0440\u043d\u0438\u0437\u0438\u0440\u0443\u0435\u0442\u0441\u044f. {0} % \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e.",
+    "AppDeviceValues": "\u041f\u0440\u0438\u043b.: {0}, \u0423\u0441\u0442\u0440.: {1}",
+    "UserDownloadingItemWithValues": "{0} \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442 {1}",
+    "FolderTypeMixed": "\u0421\u043c\u0435\u0448\u0430\u043d\u043d\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435",
+    "FolderTypeMovies": "\u041a\u0438\u043d\u043e",
+    "FolderTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
+    "FolderTypeAdultVideos": "\u0414\u043b\u044f \u0432\u0437\u0440\u043e\u0441\u043b\u044b\u0445",
+    "FolderTypePhotos": "\u0424\u043e\u0442\u043e",
+    "FolderTypeMusicVideos": "\u041c\u0443\u0437. \u0432\u0438\u0434\u0435\u043e",
+    "FolderTypeHomeVideos": "\u0414\u043e\u043c. \u0432\u0438\u0434\u0435\u043e",
+    "FolderTypeGames": "\u0418\u0433\u0440\u044b",
+    "FolderTypeBooks": "\u041b\u0438\u0442\u0435\u0440\u0430\u0442\u0443\u0440\u0430",
+    "FolderTypeTvShows": "\u0422\u0412",
+    "FolderTypeInherit": "\u041d\u0430\u0441\u043b\u0435\u0434\u0443\u0435\u043c\u044b\u0439",
+    "HeaderCastCrew": "\u0421\u043d\u0438\u043c\u0430\u043b\u0438\u0441\u044c \u0438 \u0441\u043d\u0438\u043c\u0430\u043b\u0438",
+    "HeaderPeople": "\u041b\u044e\u0434\u0438",
+    "ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}",
+    "LabelChapterName": "\u0421\u0446\u0435\u043d\u0430 {0}",
+    "NameSeasonNumber": "\u0421\u0435\u0437\u043e\u043d {0}",
+    "LabelExit": "\u0412\u044b\u0445\u043e\u0434",
+    "LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u0435 \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430",
+    "LabelGithub": "GitHub",
+    "LabelApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
+    "LabelDeveloperResources": "\u0420\u0435\u0441\u0443\u0440\u0441\u044b \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432",
+    "LabelBrowseLibrary": "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f \u043f\u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435",
+    "LabelConfigureServer": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Emby",
+    "LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
+    "CategorySync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
+    "CategoryUser": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c",
+    "CategorySystem": "\u0421\u0438\u0441\u0442\u0435\u043c\u0430",
+    "CategoryApplication": "\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435",
+    "CategoryPlugin": "\u041f\u043b\u0430\u0433\u0438\u043d",
+    "NotificationOptionPluginError": "\u0421\u0431\u043e\u0439 \u043f\u043b\u0430\u0433\u0438\u043d\u0430",
+    "NotificationOptionApplicationUpdateAvailable": "\u0418\u043c\u0435\u0435\u0442\u0441\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
+    "NotificationOptionApplicationUpdateInstalled": "\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
+    "NotificationOptionPluginUpdateInstalled": "\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043b\u0430\u0433\u0438\u043d\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
+    "NotificationOptionPluginInstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d",
+    "NotificationOptionPluginUninstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u0443\u0434\u0430\u043b\u0451\u043d",
+    "NotificationOptionVideoPlayback": "\u0412\u043e\u0441\u043f\u0440-\u0438\u0435 \u0432\u0438\u0434\u0435\u043e \u0437\u0430\u043f-\u043d\u043e",
+    "NotificationOptionAudioPlayback": "\u0412\u043e\u0441\u043f\u0440-\u0438\u0435 \u0430\u0443\u0434\u0438\u043e \u0437\u0430\u043f-\u043d\u043e",
+    "NotificationOptionGamePlayback": "\u0412\u043e\u0441\u043f\u0440-\u0438\u0435 \u0438\u0433\u0440\u044b \u0437\u0430\u043f-\u043d\u043e",
+    "NotificationOptionVideoPlaybackStopped": "\u0412\u043e\u0441\u043f-\u0438\u0435 \u0432\u0438\u0434\u0435\u043e \u043e\u0441\u0442-\u043d\u043e",
+    "NotificationOptionAudioPlaybackStopped": "\u0412\u043e\u0441\u043f-\u0438\u0435 \u0430\u0443\u0434\u0438\u043e \u043e\u0441\u0442-\u043d\u043e",
+    "NotificationOptionGamePlaybackStopped": "\u0412\u043e\u0441\u043f-\u0438\u0435 \u0438\u0433\u0440\u044b \u043e\u0441\u0442-\u043d\u043e",
+    "NotificationOptionTaskFailed": "\u0421\u0431\u043e\u0439 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0439 \u0437\u0430\u0434\u0430\u0447\u0438",
+    "NotificationOptionInstallationFailed": "\u0421\u0431\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438",
+    "NotificationOptionNewLibraryContent": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e",
+    "NotificationOptionNewLibraryContentMultiple": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e (\u043c\u043d\u043e\u0433\u043e\u043a\u0440\u0430\u0442\u043d\u043e)",
+    "NotificationOptionCameraImageUploaded": "\u041f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0430 \u0432\u044b\u043a\u043b\u0430\u0434\u043a\u0430 \u043e\u0442\u0441\u043d\u044f\u0442\u043e\u0433\u043e \u0441 \u043a\u0430\u043c\u0435\u0440\u044b",
+    "NotificationOptionUserLockedOut": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d",
+    "NotificationOptionServerRestartRequired": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
+    "ViewTypePlaylists": "\u041f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442\u044b",
+    "ViewTypeMovies": "\u041a\u0438\u043d\u043e",
+    "ViewTypeTvShows": "\u0422\u0412",
+    "ViewTypeGames": "\u0418\u0433\u0440\u044b",
+    "ViewTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
+    "ViewTypeMusicGenres": "\u0416\u0430\u043d\u0440\u044b",
+    "ViewTypeMusicArtists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
+    "ViewTypeBoxSets": "\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438",
+    "ViewTypeChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
+    "ViewTypeLiveTV": "\u042d\u0444\u0438\u0440",
+    "ViewTypeLiveTvNowPlaying": "\u0412 \u044d\u0444\u0438\u0440\u0435",
+    "ViewTypeLatestGames": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0438\u0433\u0440\u044b",
+    "ViewTypeRecentlyPlayedGames": "C\u044b\u0433\u0440\u0430\u043d\u043d\u044b\u0435 \u043d\u0435\u0434\u0430\u0432\u043d\u043e",
+    "ViewTypeGameFavorites": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u043e\u0435",
+    "ViewTypeGameSystems": "\u0418\u0433\u0440\u043e\u0432\u044b\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b",
+    "ViewTypeGameGenres": "\u0416\u0430\u043d\u0440\u044b",
+    "ViewTypeTvResume": "\u0412\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u043e\u0435",
+    "ViewTypeTvNextUp": "\u041e\u0447\u0435\u0440\u0435\u0434\u043d\u043e\u0435",
+    "ViewTypeTvLatest": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435",
+    "ViewTypeTvShowSeries": "\u0421\u0435\u0440\u0438\u0430\u043b\u044b",
+    "ViewTypeTvGenres": "\u0416\u0430\u043d\u0440\u044b",
+    "ViewTypeTvFavoriteSeries": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u0441\u0435\u0440\u0438\u0430\u043b\u044b",
+    "ViewTypeTvFavoriteEpisodes": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b",
+    "ViewTypeMovieResume": "\u0412\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u043e\u0435",
+    "ViewTypeMovieLatest": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435",
+    "ViewTypeMovieMovies": "\u0424\u0438\u043b\u044c\u043c\u044b",
+    "ViewTypeMovieCollections": "\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438",
+    "ViewTypeMovieFavorites": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u043e\u0435",
+    "ViewTypeMovieGenres": "\u0416\u0430\u043d\u0440\u044b",
+    "ViewTypeMusicLatest": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435",
+    "ViewTypeMusicPlaylists": "\u041f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442\u044b",
+    "ViewTypeMusicAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u044b",
+    "ViewTypeMusicAlbumArtists": "\u0418\u0441\u043f-\u043b\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430",
+    "HeaderOtherDisplaySettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
+    "ViewTypeMusicSongs": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u0438",
+    "ViewTypeMusicFavorites": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u043e\u0435",
+    "ViewTypeMusicFavoriteAlbums": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u0430\u043b\u044c\u0431\u043e\u043c\u044b",
+    "ViewTypeMusicFavoriteArtists": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
+    "ViewTypeMusicFavoriteSongs": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u043a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u0438",
+    "ViewTypeFolders": "\u041f\u0430\u043f\u043a\u0438",
+    "ViewTypeLiveTvRecordingGroups": "\u0417\u0430\u043f\u0438\u0441\u0438",
+    "ViewTypeLiveTvChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
+    "ScheduledTaskFailedWithName": "{0} - \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430",
+    "LabelRunningTimeValue": "\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f: {0}",
+    "ScheduledTaskStartedWithName": "{0} - \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u0430",
+    "VersionNumber": "\u0412\u0435\u0440\u0441\u0438\u044f {0}",
+    "PluginInstalledWithName": "{0} - \u0431\u044b\u043b\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
+    "PluginUpdatedWithName": "{0} - \u0431\u044b\u043b\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
+    "PluginUninstalledWithName": "{0} - \u0431\u044b\u043b\u043e \u0443\u0434\u0430\u043b\u0435\u043d\u043e",
+    "ItemAddedWithName": "{0} (\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443)",
+    "ItemRemovedWithName": "{0} (\u0438\u0437\u044a\u044f\u0442\u043e \u0438\u0437 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438)",
+    "LabelIpAddressValue": "IP-\u0430\u0434\u0440\u0435\u0441: {0}",
+    "DeviceOnlineWithName": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0443\u0441\u0442-\u043d\u043e",
+    "UserOnlineFromDevice": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0441 {1} \u0443\u0441\u0442-\u043d\u043e",
+    "ProviderValue": "\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a: {0}",
+    "SubtitlesDownloadedForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u0434\u043b\u044f {0} \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u043b\u0438\u0441\u044c",
+    "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437-\u043b\u044f {0} \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
+    "UserCreatedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0441\u043e\u0437\u0434\u0430\u043d",
+    "UserPasswordChangedWithName": "\u041f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437-\u043b\u044f {0} \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0451\u043d",
+    "UserDeletedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0451\u043d",
+    "MessageServerConfigurationUpdated": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
+    "MessageNamedServerConfigurationUpdatedWithValue": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 (\u0440\u0430\u0437\u0434\u0435\u043b {0}) \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
+    "MessageApplicationUpdated": "Emby Server \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
+    "FailedLoginAttemptWithUserName": "{0} - \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u0445\u043e\u0434\u0430 \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430",
+    "AuthenticationSucceededWithUserName": "{0} - \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f \u0443\u0441\u043f\u0435\u0448\u043d\u0430",
+    "DeviceOfflineWithName": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0440\u0430\u0437\u044a-\u043d\u043e",
+    "UserLockedOutWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d",
+    "UserOfflineFromDevice": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0441 {1} \u0440\u0430\u0437\u044a-\u043d\u043e",
+    "UserStartedPlayingItemWithValues": "{0} - \u0432\u043e\u0441\u043f\u0440. \u00ab{1}\u00bb \u0437\u0430\u043f-\u043d\u043e",
+    "UserStoppedPlayingItemWithValues": "{0} - \u0432\u043e\u0441\u043f\u0440. \u00ab{1}\u00bb \u043e\u0441\u0442-\u043d\u043e",
+    "SubtitleDownloadFailureForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u043a {0} \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c",
+    "HeaderUnidentified": "\u041d\u0435 \u0440\u0430\u0441\u043f\u043e\u0437\u043d\u0430\u043d\u043e",
+    "HeaderImagePrimary": "\u0413\u043e\u043b\u043e\u0432\u043d\u043e\u0439",
+    "HeaderImageBackdrop": "\u0417\u0430\u0434\u043d\u0438\u043a",
+    "HeaderImageLogo": "\u041b\u043e\u0433\u043e\u0442\u0438\u043f",
+    "HeaderUserPrimaryImage": "\u0420\u0438\u0441\u0443\u043d\u043e\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
+    "HeaderOverview": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+    "HeaderShortOverview": "\u041a\u0440\u0430\u0442\u043a\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+    "HeaderType": "\u0422\u0438\u043f",
+    "HeaderSeverity": "\u0412\u0430\u0436\u043d\u043e\u0441\u0442\u044c",
+    "HeaderUser": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c",
+    "HeaderName": "\u0418\u043c\u044f (\u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435)",
+    "HeaderDate": "\u0414\u0430\u0442\u0430",
+    "HeaderPremiereDate": "\u0414\u0430\u0442\u0430 \u043f\u0440\u0435\u043c\u044c\u0435\u0440\u044b",
+    "HeaderDateAdded": "\u0414\u0430\u0442\u0430 \u0434\u043e\u0431.",
+    "HeaderReleaseDate": "\u0414\u0430\u0442\u0430 \u0432\u044b\u043f.",
+    "HeaderRuntime": "\u0414\u043b\u0438\u0442.",
+    "HeaderPlayCount": "\u041a\u043e\u043b-\u0432\u043e \u0432\u043e\u0441\u043f\u0440.",
+    "HeaderSeason": "\u0421\u0435\u0437\u043e\u043d",
+    "HeaderSeasonNumber": "\u2116 \u0441\u0435\u0437\u043e\u043d\u0430",
+    "HeaderSeries": "\u0421\u0435\u0440\u0438\u0430\u043b:",
+    "HeaderNetwork": "\u0422\u0435\u043b\u0435\u0441\u0435\u0442\u044c",
+    "HeaderYear": "\u0413\u043e\u0434:",
+    "HeaderYears": "\u0413\u043e\u0434\u044b:",
+    "HeaderParentalRating": "\u0412\u043e\u0437\u0440. \u043a\u0430\u0442.",
+    "HeaderCommunityRating": "\u041e\u0431\u0449. \u043e\u0446\u0435\u043d\u043a\u0430",
+    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b.",
+    "HeaderSpecials": "\u0421\u043f\u0435\u0446.",
+    "HeaderGameSystems": "\u0418\u0433\u0440. \u0441\u0438\u0441\u0442\u0435\u043c\u044b",
+    "HeaderPlayers": "\u0418\u0433\u0440\u043e\u043a\u0438:",
+    "HeaderAlbumArtists": "\u0418\u0441\u043f-\u043b\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430",
+    "HeaderAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u044b",
+    "HeaderDisc": "\u0414\u0438\u0441\u043a",
+    "HeaderTrack": "\u0414\u043e\u0440-\u043a\u0430",
+    "HeaderAudio": "\u0410\u0443\u0434\u0438\u043e",
+    "HeaderVideo": "\u0412\u0438\u0434\u0435\u043e",
+    "HeaderEmbeddedImage": "\u0412\u043d\u0435\u0434\u0440\u0451\u043d\u043d\u044b\u0439 \u0440\u0438\u0441\u0443\u043d\u043e\u043a",
+    "HeaderResolution": "\u0420\u0430\u0437\u0440.",
+    "HeaderSubtitles": "\u0421\u0443\u0431\u0442.",
+    "HeaderGenres": "\u0416\u0430\u043d\u0440\u044b",
+    "HeaderCountries": "\u0421\u0442\u0440\u0430\u043d\u044b",
+    "HeaderStatus": "\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435",
+    "HeaderTracks": "\u0414\u043e\u0440-\u043a\u0438",
+    "HeaderMusicArtist": "\u041c\u0443\u0437. \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c",
+    "HeaderLocked": "\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043e",
+    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0438\u0438",
+    "HeaderActor": "\u0410\u043a\u0442\u0451\u0440\u044b",
+    "HeaderComposer": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u044b",
+    "HeaderDirector": "\u0420\u0435\u0436\u0438\u0441\u0441\u0451\u0440\u044b",
+    "HeaderGuestStar": "\u041f\u0440\u0438\u0433\u043b. \u0430\u043a\u0442\u0451\u0440",
+    "HeaderProducer": "\u041f\u0440\u043e\u0434\u044e\u0441\u0435\u0440\u044b",
+    "HeaderWriter": "\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0441\u0442\u044b",
+    "HeaderParentalRatings": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
+    "HeaderCommunityRatings": "\u041e\u0431\u0449. \u043e\u0446\u0435\u043d\u043a\u0438",
+    "StartupEmbyServerIsLoading": "Emby Server \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442\u0441\u044f. \u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u0432 \u0431\u043b\u0438\u0436\u0430\u0439\u0448\u0435\u0435 \u0432\u0440\u0435\u043c\u044f."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/sl-SI.json b/Emby.Server.Implementations/Localization/Core/sl-SI.json
new file mode 100644
index 000000000..0631e3fa8
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/sl-SI.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Prosimo pocakajte podatkovna baza Emby Streznika se posodablja. {0}% koncano.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Izhod",
+    "LabelVisitCommunity": "Obiscite Skupnost",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Dokumentacija",
+    "LabelDeveloperResources": "Vsebine za razvijalce",
+    "LabelBrowseLibrary": "Brskanje po knjiznici",
+    "LabelConfigureServer": "Emby Nastavitve",
+    "LabelRestartServer": "Ponovni Zagon Streznika",
+    "CategorySync": "Sync",
+    "CategoryUser": "Uporabnik",
+    "CategorySystem": "Sistem",
+    "CategoryApplication": "Aplikacija",
+    "CategoryPlugin": "Vticnik",
+    "NotificationOptionPluginError": "Napaka v vticniku",
+    "NotificationOptionApplicationUpdateAvailable": "Na voljo je posodobitev",
+    "NotificationOptionApplicationUpdateInstalled": "Posodobitev je bila namescena",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Vticnik namescen",
+    "NotificationOptionPluginUninstalled": "Vticnik odstranjen",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Predvajanje videa koncano",
+    "NotificationOptionAudioPlaybackStopped": "Predvajanje audia koncano",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Napaka v namestitvi",
+    "NotificationOptionNewLibraryContent": "Dodana nova vsebina",
+    "NotificationOptionNewLibraryContentMultiple": "Dodane nove vsebine",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Zahtevan je ponovni zagon",
+    "ViewTypePlaylists": "Playliste",
+    "ViewTypeMovies": "Filmi",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Igre",
+    "ViewTypeMusic": "Glasba",
+    "ViewTypeMusicGenres": "Zvrsti",
+    "ViewTypeMusicArtists": "Izvajalci",
+    "ViewTypeBoxSets": "Zbirke",
+    "ViewTypeChannels": "Kanali",
+    "ViewTypeLiveTV": "TV v Zivo",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Zadnje Igre",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Priljubljeno",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Zvrsti",
+    "ViewTypeTvResume": "Nadaljuj",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Serije",
+    "ViewTypeTvGenres": "Zvrsti",
+    "ViewTypeTvFavoriteSeries": "Priljubljene Serije",
+    "ViewTypeTvFavoriteEpisodes": "Priljubljene Epizode",
+    "ViewTypeMovieResume": "Nadaljuj",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Filmi",
+    "ViewTypeMovieCollections": "Zbirke",
+    "ViewTypeMovieFavorites": "Priljubljeno",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albumi",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Priljubljeni Albumi",
+    "ViewTypeMusicFavoriteArtists": "Priljubljeni Izvajalci",
+    "ViewTypeMusicFavoriteSongs": "Priljubljene skladbe",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Verzija {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "Uporabnik",
+    "HeaderName": "Name",
+    "HeaderDate": "Datum",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/sv.json b/Emby.Server.Implementations/Localization/Core/sv.json
new file mode 100644
index 000000000..4a6565aff
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/sv.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "V\u00e4nligen v\u00e4nta medan databasen p\u00e5 din Emby Server uppgraderas. {0}% klar",
+    "AppDeviceValues": "App: {0}, enhet: {1}",
+    "UserDownloadingItemWithValues": "{0} laddar ned {1}",
+    "FolderTypeMixed": "Blandat inneh\u00e5ll",
+    "FolderTypeMovies": "Filmer",
+    "FolderTypeMusic": "Musik",
+    "FolderTypeAdultVideos": "Inneh\u00e5ll f\u00f6r vuxna",
+    "FolderTypePhotos": "Foton",
+    "FolderTypeMusicVideos": "Musikvideor",
+    "FolderTypeHomeVideos": "Hemvideor",
+    "FolderTypeGames": "Spel",
+    "FolderTypeBooks": "B\u00f6cker",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "\u00c4rv",
+    "HeaderCastCrew": "Rollista & bes\u00e4ttning",
+    "HeaderPeople": "Personer",
+    "ValueSpecialEpisodeName": "Specialavsnitt - {0}",
+    "LabelChapterName": "Kapitel {0}",
+    "NameSeasonNumber": "S\u00e4song {0}",
+    "LabelExit": "Avsluta",
+    "LabelVisitCommunity": "Bes\u00f6k v\u00e5rt diskussionsforum",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api-dokumentation",
+    "LabelDeveloperResources": "Resurser f\u00f6r utvecklare",
+    "LabelBrowseLibrary": "Bl\u00e4ddra i biblioteket",
+    "LabelConfigureServer": "Konfigurera Emby",
+    "LabelRestartServer": "Starta om servern",
+    "CategorySync": "Synkronisera",
+    "CategoryUser": "Anv\u00e4ndare",
+    "CategorySystem": "System",
+    "CategoryApplication": "App",
+    "CategoryPlugin": "Till\u00e4gg",
+    "NotificationOptionPluginError": "Fel uppstod med till\u00e4gget",
+    "NotificationOptionApplicationUpdateAvailable": "Ny programversion tillg\u00e4nglig",
+    "NotificationOptionApplicationUpdateInstalled": "Programuppdatering installerad",
+    "NotificationOptionPluginUpdateInstalled": "Till\u00e4gg har uppdaterats",
+    "NotificationOptionPluginInstalled": "Till\u00e4gg har installerats",
+    "NotificationOptionPluginUninstalled": "Till\u00e4gg har avinstallerats",
+    "NotificationOptionVideoPlayback": "Videouppspelning har p\u00e5b\u00f6rjats",
+    "NotificationOptionAudioPlayback": "Ljuduppspelning har p\u00e5b\u00f6rjats",
+    "NotificationOptionGamePlayback": "Spel har startats",
+    "NotificationOptionVideoPlaybackStopped": "Videouppspelning stoppad",
+    "NotificationOptionAudioPlaybackStopped": "Ljuduppspelning stoppad",
+    "NotificationOptionGamePlaybackStopped": "Spel stoppat",
+    "NotificationOptionTaskFailed": "Schemalagd aktivitet har misslyckats",
+    "NotificationOptionInstallationFailed": "Fel vid installation",
+    "NotificationOptionNewLibraryContent": "Nytt inneh\u00e5ll har tillkommit",
+    "NotificationOptionNewLibraryContentMultiple": "Nytillkommet inneh\u00e5ll finns (flera objekt)",
+    "NotificationOptionCameraImageUploaded": "Kaberabild uppladdad",
+    "NotificationOptionUserLockedOut": "Anv\u00e4ndare har l\u00e5sts ute",
+    "NotificationOptionServerRestartRequired": "Servern m\u00e5ste startas om",
+    "ViewTypePlaylists": "Spellistor",
+    "ViewTypeMovies": "Filmer",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Spel",
+    "ViewTypeMusic": "Musik",
+    "ViewTypeMusicGenres": "Genrer",
+    "ViewTypeMusicArtists": "Artister",
+    "ViewTypeBoxSets": "Samlingar",
+    "ViewTypeChannels": "Kanaler",
+    "ViewTypeLiveTV": "Live-TV",
+    "ViewTypeLiveTvNowPlaying": "Visas nu",
+    "ViewTypeLatestGames": "Senaste spelen",
+    "ViewTypeRecentlyPlayedGames": "Nyligen spelade",
+    "ViewTypeGameFavorites": "Favoriter",
+    "ViewTypeGameSystems": "Spelsystem",
+    "ViewTypeGameGenres": "Genrer",
+    "ViewTypeTvResume": "\u00c5teruppta",
+    "ViewTypeTvNextUp": "N\u00e4stkommande",
+    "ViewTypeTvLatest": "Nytillkommet",
+    "ViewTypeTvShowSeries": "Serier",
+    "ViewTypeTvGenres": "Genrer",
+    "ViewTypeTvFavoriteSeries": "Favoritserier",
+    "ViewTypeTvFavoriteEpisodes": "Favoritavsnitt",
+    "ViewTypeMovieResume": "\u00c5teruppta",
+    "ViewTypeMovieLatest": "Nytillkommet",
+    "ViewTypeMovieMovies": "Filmer",
+    "ViewTypeMovieCollections": "Samlingar",
+    "ViewTypeMovieFavorites": "Favoriter",
+    "ViewTypeMovieGenres": "Genrer",
+    "ViewTypeMusicLatest": "Nytillkommet",
+    "ViewTypeMusicPlaylists": "Spellistor",
+    "ViewTypeMusicAlbums": "Album",
+    "ViewTypeMusicAlbumArtists": "Albumartister",
+    "HeaderOtherDisplaySettings": "Visningsalternativ",
+    "ViewTypeMusicSongs": "L\u00e5tar",
+    "ViewTypeMusicFavorites": "Favoriter",
+    "ViewTypeMusicFavoriteAlbums": "Favoritalbum",
+    "ViewTypeMusicFavoriteArtists": "Favoritartister",
+    "ViewTypeMusicFavoriteSongs": "Favoritl\u00e5tar",
+    "ViewTypeFolders": "Mappar",
+    "ViewTypeLiveTvRecordingGroups": "Inspelningar",
+    "ViewTypeLiveTvChannels": "Kanaler",
+    "ScheduledTaskFailedWithName": "{0} misslyckades",
+    "LabelRunningTimeValue": "Speltid: {0}",
+    "ScheduledTaskStartedWithName": "{0} startad",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} installerades",
+    "PluginUpdatedWithName": "{0} uppdaterades",
+    "PluginUninstalledWithName": "{0} avinstallerades",
+    "ItemAddedWithName": "{0} lades till i biblioteket",
+    "ItemRemovedWithName": "{0} togs bort ur biblioteket",
+    "LabelIpAddressValue": "IP-adress: {0}",
+    "DeviceOnlineWithName": "{0} \u00e4r ansluten",
+    "UserOnlineFromDevice": "{0} \u00e4r uppkopplad fr\u00e5n {1}",
+    "ProviderValue": "K\u00e4lla: {0}",
+    "SubtitlesDownloadedForItem": "Undertexter har laddats ner f\u00f6r {0}",
+    "UserConfigurationUpdatedWithName": "Anv\u00e4ndarinst\u00e4llningarna f\u00f6r {0} har uppdaterats",
+    "UserCreatedWithName": "Anv\u00e4ndaren {0} har skapats",
+    "UserPasswordChangedWithName": "L\u00f6senordet f\u00f6r {0} har \u00e4ndrats",
+    "UserDeletedWithName": "Anv\u00e4ndaren {0} har tagits bort",
+    "MessageServerConfigurationUpdated": "Server konfigurationen har uppdaterats",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Serverinst\u00e4llningarnas del {0} ar uppdaterats",
+    "MessageApplicationUpdated": "Emby Server har uppdaterats",
+    "FailedLoginAttemptWithUserName": "Misslyckat inloggningsf\u00f6rs\u00f6k fr\u00e5n {0}",
+    "AuthenticationSucceededWithUserName": "{0} har autentiserats",
+    "DeviceOfflineWithName": "{0} har avbrutit anslutningen",
+    "UserLockedOutWithName": "Anv\u00e4ndare {0} har l\u00e5sts ute",
+    "UserOfflineFromDevice": "{0} har avbrutit anslutningen fr\u00e5n {1}",
+    "UserStartedPlayingItemWithValues": "{0} har p\u00e5b\u00f6rjat uppspelning av {1}",
+    "UserStoppedPlayingItemWithValues": "{0} har avslutat uppspelning av {1}",
+    "SubtitleDownloadFailureForItem": "Nerladdning av undertexter f\u00f6r {0} misslyckades",
+    "HeaderUnidentified": "Oidentifierad",
+    "HeaderImagePrimary": "Huvudbild",
+    "HeaderImageBackdrop": "Bakgrundsbild",
+    "HeaderImageLogo": "Logotyp",
+    "HeaderUserPrimaryImage": "Anv\u00e4ndarbild",
+    "HeaderOverview": "\u00d6versikt",
+    "HeaderShortOverview": "Kort \u00f6versikt",
+    "HeaderType": "Typ",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "Anv\u00e4ndare",
+    "HeaderName": "Namn",
+    "HeaderDate": "Datum",
+    "HeaderPremiereDate": "Premi\u00e4rdatum",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Premi\u00e4rdatum:",
+    "HeaderRuntime": "Speltid",
+    "HeaderPlayCount": "Antal spelningar",
+    "HeaderSeason": "S\u00e4song",
+    "HeaderSeasonNumber": "S\u00e4songsnummer:",
+    "HeaderSeries": "Serie:",
+    "HeaderNetwork": "TV-bolag",
+    "HeaderYear": "\u00c5r:",
+    "HeaderYears": "\u00c5r:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Anv\u00e4ndaromd\u00f6me",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specialavsnitt",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Spelare:",
+    "HeaderAlbumArtists": "Albumartister",
+    "HeaderAlbums": "Album",
+    "HeaderDisc": "Skiva",
+    "HeaderTrack": "Sp\u00e5r",
+    "HeaderAudio": "Ljud",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Infogad bild",
+    "HeaderResolution": "Uppl\u00f6sning",
+    "HeaderSubtitles": "Undertexter",
+    "HeaderGenres": "Genrer",
+    "HeaderCountries": "L\u00e4nder",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Sp\u00e5r",
+    "HeaderMusicArtist": "Musikartist",
+    "HeaderLocked": "L\u00e5st",
+    "HeaderStudios": "Studior",
+    "HeaderActor": "Sk\u00e5despelare",
+    "HeaderComposer": "Komposit\u00f6rer",
+    "HeaderDirector": "Regiss\u00f6r",
+    "HeaderGuestStar": "G\u00e4startist",
+    "HeaderProducer": "Producenter",
+    "HeaderWriter": "F\u00f6rfattare",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server startar. V\u00e4nligen f\u00f6rs\u00f6k igen om en kort stund."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/tr.json b/Emby.Server.Implementations/Localization/Core/tr.json
new file mode 100644
index 000000000..a691e9d02
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/tr.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Cikis",
+    "LabelVisitCommunity": "Bizi Ziyaret Edin",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "K\u00fct\u00fcphane",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "Server Yeniden Baslat",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Uygulamalar",
+    "CategoryPlugin": "Eklenti",
+    "NotificationOptionPluginError": "Eklenti Ba\u015far\u0131s\u0131z",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Sunucu yeniden ba\u015flat\u0131lmal\u0131",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Versiyon {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Durum",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/uk.json b/Emby.Server.Implementations/Localization/Core/uk.json
new file mode 100644
index 000000000..0dc6afe8a
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/uk.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "\u0424\u0456\u043b\u044c\u043c\u0438",
+    "FolderTypeMusic": "\u041c\u0443\u0437\u0438\u043a\u0430",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "\u0421\u0432\u0456\u0442\u043b\u0438\u043d\u0438",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "\u0406\u0433\u0440\u0438",
+    "FolderTypeBooks": "\u041a\u043d\u0438\u0433\u0438",
+    "FolderTypeTvShows": "\u0422\u0411",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "\u0412\u0438\u0439\u0442\u0438",
+    "LabelVisitCommunity": "Visit Community",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Browse Library",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "\u0424\u0456\u043b\u044c\u043c\u0438",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "\u041a\u043e\u043b\u0435\u043a\u0446\u0456\u0457",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "\u041e\u0441\u0442\u0430\u043d\u043d\u0456 \u0456\u0433\u0440\u0438",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "\u0424\u0456\u043b\u044c\u043c\u0438",
+    "ViewTypeMovieCollections": "\u041a\u043e\u043b\u0435\u043a\u0446\u0456\u0457",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "\u041e\u0441\u0442\u0430\u043d\u043d\u0456",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "\u0421\u0435\u0437\u043e\u043d",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u0438",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0438",
+    "HeaderDisc": "\u0414\u0438\u0441\u043a",
+    "HeaderTrack": "\u0414\u043e\u0440\u0456\u0436\u043a\u0430",
+    "HeaderAudio": "\u0410\u0443\u0434\u0456\u043e",
+    "HeaderVideo": "\u0412\u0456\u0434\u0435\u043e",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "\u0414\u043e\u0440\u0456\u0436\u043a\u0438",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0456\u0457",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
new file mode 100644
index 000000000..6ea1d1d3f
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Tho\u00e1t",
+    "LabelVisitCommunity": "Gh\u00e9 th\u0103m trang C\u1ed9ng \u0111\u1ed3ng",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api Documentation",
+    "LabelDeveloperResources": "Developer Resources",
+    "LabelBrowseLibrary": "Duy\u1ec7t th\u01b0 vi\u1ec7n",
+    "LabelConfigureServer": "Configure Emby",
+    "LabelRestartServer": "Kh\u1edfi \u0111\u1ed9ng l\u1ea1i m\u00e1y ch\u1ee7",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "T\u00ean",
+    "HeaderDate": "Ng\u00e0y",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Tr\u1ea1ng th\u00e1i",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
new file mode 100644
index 000000000..580832a9e
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App\uff1a {0}\uff0c\u8bbe\u5907\uff1a {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "\u6df7\u5408\u5185\u5bb9",
+    "FolderTypeMovies": "\u7535\u5f71",
+    "FolderTypeMusic": "\u97f3\u4e50",
+    "FolderTypeAdultVideos": "\u6210\u4eba\u89c6\u9891",
+    "FolderTypePhotos": "\u56fe\u7247",
+    "FolderTypeMusicVideos": "\u97f3\u4e50\u89c6\u9891",
+    "FolderTypeHomeVideos": "\u5bb6\u5ead\u89c6\u9891",
+    "FolderTypeGames": "\u6e38\u620f",
+    "FolderTypeBooks": "\u4e66\u7c4d",
+    "FolderTypeTvShows": "\u7535\u89c6",
+    "FolderTypeInherit": "\u7ee7\u627f",
+    "HeaderCastCrew": "\u6f14\u804c\u4eba\u5458",
+    "HeaderPeople": "\u4eba\u7269",
+    "ValueSpecialEpisodeName": "\u7279\u522b - {0}",
+    "LabelChapterName": "\u7ae0\u8282 {0}",
+    "NameSeasonNumber": "\u5b63 {0}",
+    "LabelExit": "\u9000\u51fa",
+    "LabelVisitCommunity": "\u8bbf\u95ee\u793e\u533a",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "API\u6587\u6863",
+    "LabelDeveloperResources": "\u5f00\u53d1\u8005\u8d44\u6e90",
+    "LabelBrowseLibrary": "\u6d4f\u89c8\u5a92\u4f53\u5e93",
+    "LabelConfigureServer": "\u914d\u7f6eEmby",
+    "LabelRestartServer": "\u91cd\u542f\u670d\u52a1\u5668",
+    "CategorySync": "\u540c\u6b65",
+    "CategoryUser": "\u7528\u6237",
+    "CategorySystem": "\u7cfb\u7edf",
+    "CategoryApplication": "\u5e94\u7528\u7a0b\u5e8f",
+    "CategoryPlugin": "\u63d2\u4ef6",
+    "NotificationOptionPluginError": "\u63d2\u4ef6\u5931\u8d25",
+    "NotificationOptionApplicationUpdateAvailable": "\u6709\u53ef\u7528\u7684\u5e94\u7528\u7a0b\u5e8f\u66f4\u65b0",
+    "NotificationOptionApplicationUpdateInstalled": "\u5e94\u7528\u7a0b\u5e8f\u66f4\u65b0\u5df2\u5b89\u88c5",
+    "NotificationOptionPluginUpdateInstalled": "\u63d2\u4ef6\u66f4\u65b0\u5df2\u5b89\u88c5",
+    "NotificationOptionPluginInstalled": "\u63d2\u4ef6\u5df2\u5b89\u88c5",
+    "NotificationOptionPluginUninstalled": "\u63d2\u4ef6\u5df2\u5378\u8f7d",
+    "NotificationOptionVideoPlayback": "\u89c6\u9891\u5f00\u59cb\u64ad\u653e",
+    "NotificationOptionAudioPlayback": "\u97f3\u9891\u5f00\u59cb\u64ad\u653e",
+    "NotificationOptionGamePlayback": "\u6e38\u620f\u5f00\u59cb",
+    "NotificationOptionVideoPlaybackStopped": "\u89c6\u9891\u64ad\u653e\u505c\u6b62",
+    "NotificationOptionAudioPlaybackStopped": "\u97f3\u9891\u64ad\u653e\u505c\u6b62",
+    "NotificationOptionGamePlaybackStopped": "\u6e38\u620f\u505c\u6b62",
+    "NotificationOptionTaskFailed": "\u8ba1\u5212\u4efb\u52a1\u5931\u8d25",
+    "NotificationOptionInstallationFailed": "\u5b89\u88c5\u5931\u8d25",
+    "NotificationOptionNewLibraryContent": "\u6dfb\u52a0\u65b0\u5185\u5bb9",
+    "NotificationOptionNewLibraryContentMultiple": "\u65b0\u7684\u5185\u5bb9\u52a0\u5165\uff08\u591a\u4e2a\uff09",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "\u9700\u8981\u91cd\u65b0\u542f\u52a8\u670d\u52a1\u5668",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "\u7535\u5f71",
+    "ViewTypeTvShows": "\u7535\u89c6",
+    "ViewTypeGames": "\u6e38\u620f",
+    "ViewTypeMusic": "\u97f3\u4e50",
+    "ViewTypeMusicGenres": "\u98ce\u683c",
+    "ViewTypeMusicArtists": "\u827a\u672f\u5bb6",
+    "ViewTypeBoxSets": "\u5408\u96c6",
+    "ViewTypeChannels": "\u9891\u9053",
+    "ViewTypeLiveTV": "\u7535\u89c6\u76f4\u64ad",
+    "ViewTypeLiveTvNowPlaying": "\u73b0\u5728\u64ad\u653e",
+    "ViewTypeLatestGames": "\u6700\u65b0\u6e38\u620f",
+    "ViewTypeRecentlyPlayedGames": "\u6700\u8fd1\u64ad\u653e",
+    "ViewTypeGameFavorites": "\u6211\u7684\u6700\u7231",
+    "ViewTypeGameSystems": "\u6e38\u620f\u7cfb\u7edf",
+    "ViewTypeGameGenres": "\u98ce\u683c",
+    "ViewTypeTvResume": "\u6062\u590d\u64ad\u653e",
+    "ViewTypeTvNextUp": "\u4e0b\u4e00\u4e2a",
+    "ViewTypeTvLatest": "\u6700\u65b0",
+    "ViewTypeTvShowSeries": "\u7535\u89c6\u5267",
+    "ViewTypeTvGenres": "\u98ce\u683c",
+    "ViewTypeTvFavoriteSeries": "\u6700\u559c\u6b22\u7684\u7535\u89c6\u5267",
+    "ViewTypeTvFavoriteEpisodes": "\u6700\u559c\u6b22\u7684\u5267\u96c6",
+    "ViewTypeMovieResume": "\u6062\u590d\u64ad\u653e",
+    "ViewTypeMovieLatest": "\u6700\u65b0",
+    "ViewTypeMovieMovies": "\u7535\u5f71",
+    "ViewTypeMovieCollections": "\u5408\u96c6",
+    "ViewTypeMovieFavorites": "\u6536\u85cf\u5939",
+    "ViewTypeMovieGenres": "\u98ce\u683c",
+    "ViewTypeMusicLatest": "\u6700\u65b0",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "\u4e13\u8f91",
+    "ViewTypeMusicAlbumArtists": "\u4e13\u8f91\u827a\u672f\u5bb6",
+    "HeaderOtherDisplaySettings": "\u663e\u793a\u8bbe\u7f6e",
+    "ViewTypeMusicSongs": "\u6b4c\u66f2",
+    "ViewTypeMusicFavorites": "\u6211\u7684\u6700\u7231",
+    "ViewTypeMusicFavoriteAlbums": "\u6700\u7231\u7684\u4e13\u8f91",
+    "ViewTypeMusicFavoriteArtists": "\u6700\u7231\u7684\u827a\u672f\u5bb6",
+    "ViewTypeMusicFavoriteSongs": "\u6700\u7231\u7684\u6b4c\u66f2",
+    "ViewTypeFolders": "\u6587\u4ef6\u5939",
+    "ViewTypeLiveTvRecordingGroups": "\u5f55\u5236",
+    "ViewTypeLiveTvChannels": "\u9891\u9053",
+    "ScheduledTaskFailedWithName": "{0} \u5931\u8d25",
+    "LabelRunningTimeValue": "\u8fd0\u884c\u65f6\u95f4\uff1a {0}",
+    "ScheduledTaskStartedWithName": "{0} \u5f00\u59cb",
+    "VersionNumber": "\u7248\u672c {0}",
+    "PluginInstalledWithName": "{0} \u5df2\u5b89\u88c5",
+    "PluginUpdatedWithName": "{0} \u5df2\u66f4\u65b0",
+    "PluginUninstalledWithName": "{0} \u5df2\u5378\u8f7d",
+    "ItemAddedWithName": "{0} \u5df2\u6dfb\u52a0\u5230\u5a92\u4f53\u5e93",
+    "ItemRemovedWithName": "{0} \u5df2\u4ece\u5a92\u4f53\u5e93\u4e2d\u79fb\u9664",
+    "LabelIpAddressValue": "Ip \u5730\u5740\uff1a {0}",
+    "DeviceOnlineWithName": "{0} \u5df2\u8fde\u63a5",
+    "UserOnlineFromDevice": "{0} \u5728\u7ebf\uff0c\u6765\u81ea {1}",
+    "ProviderValue": "\u63d0\u4f9b\u8005\uff1a {0}",
+    "SubtitlesDownloadedForItem": "\u5df2\u4e3a {0} \u4e0b\u8f7d\u4e86\u5b57\u5e55",
+    "UserConfigurationUpdatedWithName": "\u7528\u6237\u914d\u7f6e\u5df2\u66f4\u65b0\u4e3a {0}",
+    "UserCreatedWithName": "\u7528\u6237 {0} \u5df2\u88ab\u521b\u5efa",
+    "UserPasswordChangedWithName": "\u5df2\u4e3a\u7528\u6237 {0} \u66f4\u6539\u5bc6\u7801",
+    "UserDeletedWithName": "\u7528\u6237 {0} \u5df2\u88ab\u5220\u9664",
+    "MessageServerConfigurationUpdated": "\u670d\u52a1\u5668\u914d\u7f6e\u5df2\u66f4\u65b0",
+    "MessageNamedServerConfigurationUpdatedWithValue": "\u670d\u52a1\u5668\u914d\u7f6e {0} \u90e8\u5206\u5df2\u66f4\u65b0",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "\u5931\u8d25\u7684\u767b\u5f55\u5c1d\u8bd5\uff0c\u6765\u81ea {0}",
+    "AuthenticationSucceededWithUserName": "{0} \u6210\u529f\u88ab\u6388\u6743",
+    "DeviceOfflineWithName": "{0} \u5df2\u65ad\u5f00\u8fde\u63a5",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} \u5df2\u4ece {1} \u65ad\u5f00\u8fde\u63a5",
+    "UserStartedPlayingItemWithValues": "{0} \u5f00\u59cb\u64ad\u653e {1}",
+    "UserStoppedPlayingItemWithValues": "{0} \u505c\u6b62\u64ad\u653e {1}",
+    "SubtitleDownloadFailureForItem": "\u4e3a {0} \u4e0b\u8f7d\u5b57\u5e55\u5931\u8d25",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "\u7528\u6237",
+    "HeaderName": "\u540d\u5b57",
+    "HeaderDate": "\u65e5\u671f",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "\u53d1\u884c\u65e5\u671f",
+    "HeaderRuntime": "\u64ad\u653e\u65f6\u95f4",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "\u5b63",
+    "HeaderSeasonNumber": "\u591a\u5c11\u5b63",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "\u7f51\u7edc",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "\u516c\u4f17\u8bc4\u5206",
+    "HeaderTrailers": "\u9884\u544a\u7247",
+    "HeaderSpecials": "\u7279\u96c6",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "\u4e13\u8f91",
+    "HeaderDisc": "\u5149\u76d8",
+    "HeaderTrack": "\u97f3\u8f68",
+    "HeaderAudio": "\u97f3\u9891",
+    "HeaderVideo": "\u89c6\u9891",
+    "HeaderEmbeddedImage": "\u5d4c\u5165\u5f0f\u56fe\u50cf",
+    "HeaderResolution": "\u5206\u8fa8\u7387",
+    "HeaderSubtitles": "\u5b57\u5e55",
+    "HeaderGenres": "\u98ce\u683c",
+    "HeaderCountries": "\u56fd\u5bb6",
+    "HeaderStatus": "\u72b6\u6001",
+    "HeaderTracks": "\u97f3\u8f68",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "\u5de5\u4f5c\u5ba4",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "\u5bb6\u957f\u5206\u7ea7",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/zh-HK.json b/Emby.Server.Implementations/Localization/Core/zh-HK.json
new file mode 100644
index 000000000..a70e7a003
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "\u6df7\u5408\u5167\u5bb9",
+    "FolderTypeMovies": "\u96fb\u5f71",
+    "FolderTypeMusic": "\u97f3\u6a02",
+    "FolderTypeAdultVideos": "\u6210\u4eba\u5f71\u7247",
+    "FolderTypePhotos": "\u76f8\u7247",
+    "FolderTypeMusicVideos": "MV",
+    "FolderTypeHomeVideos": "\u500b\u4eba\u5f71\u7247",
+    "FolderTypeGames": "\u904a\u6232",
+    "FolderTypeBooks": "\u66f8\u85c9",
+    "FolderTypeTvShows": "\u96fb\u8996\u7bc0\u76ee",
+    "FolderTypeInherit": "\u7e7c\u627f",
+    "HeaderCastCrew": "\u6f14\u54e1\u9663\u5bb9",
+    "HeaderPeople": "\u4eba\u7269",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "\u5287\u96c6\u5b63\u5ea6 {0}",
+    "LabelExit": "\u96e2\u958b",
+    "LabelVisitCommunity": "\u8a2a\u554f\u8a0e\u8ad6\u5340",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Api \u6587\u4ef6",
+    "LabelDeveloperResources": "\u958b\u767c\u8005\u8cc7\u6e90",
+    "LabelBrowseLibrary": "\u700f\u89bd\u8cc7\u6599\u5eab",
+    "LabelConfigureServer": "\u8a2d\u7f6e Emby",
+    "LabelRestartServer": "\u91cd\u65b0\u555f\u52d5\u4f3a\u670d\u5668",
+    "CategorySync": "\u540c\u6b65",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "\u9700\u8981\u91cd\u65b0\u555f\u52d5",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "\u904a\u6232",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "\u85cf\u54c1",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "\u6700\u8fd1\u904a\u6232",
+    "ViewTypeRecentlyPlayedGames": "\u6700\u8fd1\u64ad\u653e",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "\u904a\u6232\u7cfb\u7d71",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "\u96fb\u8996\u5287",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "\u6211\u7684\u6700\u611b\u96fb\u8996\u5287",
+    "ViewTypeTvFavoriteEpisodes": "\u6211\u7684\u6700\u611b\u5287\u96c6",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "\u85cf\u54c1",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "\u6b4c\u66f2",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "\u6211\u7684\u6700\u611b\u6b4c\u66f2",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "\u7248\u672c {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "\u5df2\u7d93\u70ba {0} \u4e0b\u8f09\u4e86\u5b57\u5e55",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "\u70ba {0} \u4e0b\u8f09\u5b57\u5e55\u5931\u6557",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "\u540d\u7a31",
+    "HeaderDate": "\u65e5\u671f",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "\u5287\u96c6\u5b63\u5ea6",
+    "HeaderSeasonNumber": "\u5287\u96c6\u5b63\u5ea6\u6578\u76ee",
+    "HeaderSeries": "\u96fb\u8996\u5287\uff1a",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "\u904a\u6232\u7cfb\u7d71",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "\u97f3\u8a0a",
+    "HeaderVideo": "\u5f71\u7247",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "\u5b57\u5e55",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "\u72c0\u614b",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "\u6b4c\u624b",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "\u7279\u7d04\u660e\u661f",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/zh-TW.json b/Emby.Server.Implementations/Localization/Core/zh-TW.json
new file mode 100644
index 000000000..b711aab1f
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/zh-TW.json
@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "\u8acb\u7a0d\u5019\uff0cEmby\u4f3a\u670d\u5668\u8cc7\u6599\u5eab\u6b63\u5728\u66f4\u65b0...\uff08\u5df2\u5b8c\u6210{0}%\uff09",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "\u62cd\u651d\u4eba\u54e1\u53ca\u6f14\u54e1",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "\u96e2\u958b",
+    "LabelVisitCommunity": "\u8a2a\u554f\u793e\u7fa4",
+    "LabelGithub": "GitHub",
+    "LabelApiDocumentation": "API\u8aaa\u660e\u6587\u4ef6",
+    "LabelDeveloperResources": "\u958b\u767c\u4eba\u54e1\u5c08\u5340",
+    "LabelBrowseLibrary": "\u700f\u89bd\u5a92\u9ad4\u6ac3",
+    "LabelConfigureServer": "Emby\u8a2d\u5b9a",
+    "LabelRestartServer": "\u91cd\u65b0\u555f\u52d5\u4f3a\u670d\u5668",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "\u96fb\u8996",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "\u7248\u672c{0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "ProviderValue": "Provider: {0}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Emby Server has been updated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "\u72c0\u614b",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
new file mode 100644
index 000000000..120f445c2
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -0,0 +1,433 @@
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Serialization;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Reflection;
+
+namespace Emby.Server.Implementations.Localization
+{
+    /// <summary>
+    /// Class LocalizationManager
+    /// </summary>
+    public class LocalizationManager : ILocalizationManager
+    {
+        /// <summary>
+        /// The _configuration manager
+        /// </summary>
+        private readonly IServerConfigurationManager _configurationManager;
+
+        /// <summary>
+        /// The us culture
+        /// </summary>
+        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
+        private readonly ConcurrentDictionary<string, Dictionary<string, ParentalRating>> _allParentalRatings =
+            new ConcurrentDictionary<string, Dictionary<string, ParentalRating>>(StringComparer.OrdinalIgnoreCase);
+
+        private readonly IFileSystem _fileSystem;
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly ILogger _logger;
+        private readonly IAssemblyInfo _assemblyInfo;
+        private readonly ITextLocalizer _textLocalizer;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LocalizationManager" /> class.
+        /// </summary>
+        /// <param name="configurationManager">The configuration manager.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="jsonSerializer">The json serializer.</param>
+        public LocalizationManager(IServerConfigurationManager configurationManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer, ILogger logger, IAssemblyInfo assemblyInfo, ITextLocalizer textLocalizer)
+        {
+            _configurationManager = configurationManager;
+            _fileSystem = fileSystem;
+            _jsonSerializer = jsonSerializer;
+            _logger = logger;
+            _assemblyInfo = assemblyInfo;
+            _textLocalizer = textLocalizer;
+
+            ExtractAll();
+        }
+
+        private void ExtractAll()
+        {
+            var type = GetType();
+            var resourcePath = type.Namespace + ".Ratings.";
+
+            var localizationPath = LocalizationPath;
+
+			_fileSystem.CreateDirectory(localizationPath);
+
+            var existingFiles = GetRatingsFiles(localizationPath)
+                .Select(Path.GetFileName)
+                .ToList();
+
+            // Extract from the assembly
+            foreach (var resource in _assemblyInfo
+                .GetManifestResourceNames(type)
+                .Where(i => i.StartsWith(resourcePath)))
+            {
+                var filename = "ratings-" + resource.Substring(resourcePath.Length);
+
+                if (!existingFiles.Contains(filename))
+                {
+                    using (var stream = _assemblyInfo.GetManifestResourceStream(type, resource))
+                    {
+                        var target = Path.Combine(localizationPath, filename);
+                        _logger.Info("Extracting ratings to {0}", target);
+
+                        using (var fs = _fileSystem.GetFileStream(target, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+                        {
+                            stream.CopyTo(fs);
+                        }
+                    }
+                }
+            }
+            
+            foreach (var file in GetRatingsFiles(localizationPath))
+            {
+                LoadRatings(file);
+            }
+        }
+
+        private List<string> GetRatingsFiles(string directory)
+        {
+            return _fileSystem.GetFilePaths(directory, false)
+                .Where(i => string.Equals(Path.GetExtension(i), ".txt", StringComparison.OrdinalIgnoreCase))
+                .Where(i => Path.GetFileName(i).StartsWith("ratings-", StringComparison.OrdinalIgnoreCase))
+                .ToList();
+        }
+
+        /// <summary>
+        /// Gets the localization path.
+        /// </summary>
+        /// <value>The localization path.</value>
+        public string LocalizationPath
+        {
+            get
+            {
+                return Path.Combine(_configurationManager.ApplicationPaths.ProgramDataPath, "localization");
+            }
+        }
+
+        public string RemoveDiacritics(string text)
+        {
+            return _textLocalizer.RemoveDiacritics(text);
+        }
+
+        public string NormalizeFormKD(string text)
+        {
+            return _textLocalizer.NormalizeFormKD(text);
+        }
+
+        /// <summary>
+        /// Gets the cultures.
+        /// </summary>
+        /// <returns>IEnumerable{CultureDto}.</returns>
+        public IEnumerable<CultureDto> GetCultures()
+        {
+            var type = GetType();
+            var path = type.Namespace + ".iso6392.txt";
+
+            var list = new List<CultureDto>();
+
+            using (var stream = _assemblyInfo.GetManifestResourceStream(type, path))
+            {
+                using (var reader = new StreamReader(stream))
+                {
+                    while (!reader.EndOfStream)
+                    {
+                        var line = reader.ReadLine();
+
+                        if (!string.IsNullOrWhiteSpace(line))
+                        {
+                            var parts = line.Split('|');
+
+                            if (parts.Length == 5)
+                            {
+                                list.Add(new CultureDto
+                                {
+                                    DisplayName = parts[3],
+                                    Name = parts[3],
+                                    ThreeLetterISOLanguageName = parts[0],
+                                    TwoLetterISOLanguageName = parts[2]
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+
+            return list.Where(i => !string.IsNullOrWhiteSpace(i.Name) &&
+                !string.IsNullOrWhiteSpace(i.DisplayName) &&
+                !string.IsNullOrWhiteSpace(i.ThreeLetterISOLanguageName) &&
+                !string.IsNullOrWhiteSpace(i.TwoLetterISOLanguageName));
+        }
+
+        /// <summary>
+        /// Gets the countries.
+        /// </summary>
+        /// <returns>IEnumerable{CountryInfo}.</returns>
+        public IEnumerable<CountryInfo> GetCountries()
+        {
+            var type = GetType();
+            var path = type.Namespace + ".countries.json";
+
+            using (var stream = _assemblyInfo.GetManifestResourceStream(type, path))
+            {
+                return _jsonSerializer.DeserializeFromStream<List<CountryInfo>>(stream);
+            }
+        }
+
+        /// <summary>
+        /// Gets the parental ratings.
+        /// </summary>
+        /// <returns>IEnumerable{ParentalRating}.</returns>
+        public IEnumerable<ParentalRating> GetParentalRatings()
+        {
+            return GetParentalRatingsDictionary().Values.ToList();
+        }
+
+        /// <summary>
+        /// Gets the parental ratings dictionary.
+        /// </summary>
+        /// <returns>Dictionary{System.StringParentalRating}.</returns>
+        private Dictionary<string, ParentalRating> GetParentalRatingsDictionary()
+        {
+            var countryCode = _configurationManager.Configuration.MetadataCountryCode;
+
+            if (string.IsNullOrEmpty(countryCode))
+            {
+                countryCode = "us";
+            }
+
+            var ratings = GetRatings(countryCode);
+
+            if (ratings == null)
+            {
+                ratings = GetRatings("us");
+            }
+
+            return ratings;
+        }
+
+        /// <summary>
+        /// Gets the ratings.
+        /// </summary>
+        /// <param name="countryCode">The country code.</param>
+        private Dictionary<string, ParentalRating> GetRatings(string countryCode)
+        {
+            Dictionary<string, ParentalRating> value;
+
+            _allParentalRatings.TryGetValue(countryCode, out value);
+
+            return value;
+        }
+
+        /// <summary>
+        /// Loads the ratings.
+        /// </summary>
+        /// <param name="file">The file.</param>
+        /// <returns>Dictionary{System.StringParentalRating}.</returns>
+        private void LoadRatings(string file)
+        {
+			var dict = _fileSystem.ReadAllLines(file).Select(i =>
+            {
+                if (!string.IsNullOrWhiteSpace(i))
+                {
+                    var parts = i.Split(',');
+
+                    if (parts.Length == 2)
+                    {
+                        int value;
+
+                        if (int.TryParse(parts[1], NumberStyles.Integer, UsCulture, out value))
+                        {
+                            return new ParentalRating { Name = parts[0], Value = value };
+                        }
+                    }
+                }
+
+                return null;
+
+            })
+            .Where(i => i != null)
+            .ToDictionary(i => i.Name, StringComparer.OrdinalIgnoreCase);
+
+            var countryCode = _fileSystem.GetFileNameWithoutExtension(file)
+                .Split('-')
+                .Last();
+
+            _allParentalRatings.TryAdd(countryCode, dict);
+        }
+
+        private readonly string[] _unratedValues = {"n/a", "unrated", "not rated"};
+
+        /// <summary>
+        /// Gets the rating level.
+        /// </summary>
+        public int? GetRatingLevel(string rating)
+        {
+            if (string.IsNullOrEmpty(rating))
+            {
+                throw new ArgumentNullException("rating");
+            }
+
+            if (_unratedValues.Contains(rating, StringComparer.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Fairly common for some users to have "Rated R" in their rating field
+            rating = rating.Replace("Rated ", string.Empty, StringComparison.OrdinalIgnoreCase);
+
+            var ratingsDictionary = GetParentalRatingsDictionary();
+
+            ParentalRating value;
+
+            if (!ratingsDictionary.TryGetValue(rating, out value))
+            {
+                // If we don't find anything check all ratings systems
+                foreach (var dictionary in _allParentalRatings.Values)
+                {
+                    if (dictionary.TryGetValue(rating, out value))
+                    {
+                        return value.Value;
+                    }
+                }
+            }
+
+            return value == null ? (int?)null : value.Value;
+        }
+
+        public string GetLocalizedString(string phrase)
+        {
+            return GetLocalizedString(phrase, _configurationManager.Configuration.UICulture);
+        }
+
+        public string GetLocalizedString(string phrase, string culture)
+        {
+            var dictionary = GetLocalizationDictionary(culture);
+
+            string value;
+
+            if (dictionary.TryGetValue(phrase, out value))
+            {
+                return value;
+            }
+
+            return phrase;
+        }
+
+        private readonly ConcurrentDictionary<string, Dictionary<string, string>> _dictionaries =
+            new ConcurrentDictionary<string, Dictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
+
+        public Dictionary<string, string> GetLocalizationDictionary(string culture)
+        {
+            const string prefix = "Core";
+            var key = prefix + culture;
+
+            return _dictionaries.GetOrAdd(key, k => GetDictionary(prefix, culture, "core.json"));
+        }
+
+        private Dictionary<string, string> GetDictionary(string prefix, string culture, string baseFilename)
+        {
+            var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            var namespaceName = GetType().Namespace + "." + prefix;
+
+            CopyInto(dictionary, namespaceName + "." + baseFilename);
+            CopyInto(dictionary, namespaceName + "." + GetResourceFilename(culture));
+
+            return dictionary;
+        }
+
+        private void CopyInto(IDictionary<string, string> dictionary, string resourcePath)
+        {
+            using (var stream = _assemblyInfo.GetManifestResourceStream(GetType(), resourcePath))
+            {
+                if (stream != null)
+                {
+                    var dict = _jsonSerializer.DeserializeFromStream<Dictionary<string, string>>(stream);
+
+                    foreach (var key in dict.Keys)
+                    {
+                        dictionary[key] = dict[key];
+                    }
+                }
+            }
+        }
+
+        private string GetResourceFilename(string culture)
+        {
+            var parts = culture.Split('-');
+
+            if (parts.Length == 2)
+            {
+                culture = parts[0].ToLower() + "-" + parts[1].ToUpper();
+            }
+            else
+            {
+                culture = culture.ToLower();
+            }
+
+            return culture + ".json";
+        }
+
+        public IEnumerable<LocalizatonOption> GetLocalizationOptions()
+        {
+            return new List<LocalizatonOption>
+            {
+                new LocalizatonOption{ Name="Arabic", Value="ar"},
+                new LocalizatonOption{ Name="Bulgarian (Bulgaria)", Value="bg-BG"},
+                new LocalizatonOption{ Name="Catalan", Value="ca"},
+                new LocalizatonOption{ Name="Chinese Simplified", Value="zh-CN"},
+                new LocalizatonOption{ Name="Chinese Traditional", Value="zh-TW"},
+                new LocalizatonOption{ Name="Croatian", Value="hr"},
+                new LocalizatonOption{ Name="Czech", Value="cs"},
+                new LocalizatonOption{ Name="Danish", Value="da"},
+                new LocalizatonOption{ Name="Dutch", Value="nl"},
+                new LocalizatonOption{ Name="English (United Kingdom)", Value="en-GB"},
+                new LocalizatonOption{ Name="English (United States)", Value="en-us"},
+                new LocalizatonOption{ Name="Finnish", Value="fi"},
+                new LocalizatonOption{ Name="French", Value="fr"},
+                new LocalizatonOption{ Name="French (Canada)", Value="fr-CA"},
+                new LocalizatonOption{ Name="German", Value="de"},
+                new LocalizatonOption{ Name="Greek", Value="el"},
+                new LocalizatonOption{ Name="Hebrew", Value="he"},
+                new LocalizatonOption{ Name="Hungarian", Value="hu"},
+                new LocalizatonOption{ Name="Indonesian", Value="id"},
+                new LocalizatonOption{ Name="Italian", Value="it"},
+                new LocalizatonOption{ Name="Kazakh", Value="kk"},
+                new LocalizatonOption{ Name="Norwegian Bokmål", Value="nb"},
+                new LocalizatonOption{ Name="Polish", Value="pl"},
+                new LocalizatonOption{ Name="Portuguese (Brazil)", Value="pt-BR"},
+                new LocalizatonOption{ Name="Portuguese (Portugal)", Value="pt-PT"},
+                new LocalizatonOption{ Name="Russian", Value="ru"},
+                new LocalizatonOption{ Name="Slovenian (Slovenia)", Value="sl-SI"},
+                new LocalizatonOption{ Name="Spanish", Value="es-ES"},
+                new LocalizatonOption{ Name="Spanish (Mexico)", Value="es-MX"},
+                new LocalizatonOption{ Name="Swedish", Value="sv"},
+                new LocalizatonOption{ Name="Turkish", Value="tr"},
+                new LocalizatonOption{ Name="Ukrainian", Value="uk"},
+                new LocalizatonOption{ Name="Vietnamese", Value="vi"}
+
+            }.OrderBy(i => i.Name);
+        }
+    }
+
+    public interface ITextLocalizer
+    {
+        string RemoveDiacritics(string text);
+
+        string NormalizeFormKD(string text);
+    }
+}
diff --git a/Emby.Server.Implementations/Localization/Ratings/au.txt b/Emby.Server.Implementations/Localization/Ratings/au.txt
new file mode 100644
index 000000000..fa60f5305
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/au.txt
@@ -0,0 +1,8 @@
+AU-G,1
+AU-PG,5
+AU-M,6
+AU-MA15+,7
+AU-M15+,8
+AU-R18+,9 
+AU-X18+,10
+AU-RC,11
diff --git a/Emby.Server.Implementations/Localization/Ratings/be.txt b/Emby.Server.Implementations/Localization/Ratings/be.txt
new file mode 100644
index 000000000..99a53f664
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/be.txt
@@ -0,0 +1,6 @@
+BE-AL,1
+BE-MG6,2
+BE-6,3
+BE-9,5
+BE-12,6
+BE-16,8
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/br.txt b/Emby.Server.Implementations/Localization/Ratings/br.txt
new file mode 100644
index 000000000..62f00fb87
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/br.txt
@@ -0,0 +1,6 @@
+BR-L,1
+BR-10,5
+BR-12,7
+BR-14,8
+BR-16,8
+BR-18,9
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/ca.txt b/Emby.Server.Implementations/Localization/Ratings/ca.txt
new file mode 100644
index 000000000..5a110648c
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/ca.txt
@@ -0,0 +1,6 @@
+CA-G,1
+CA-PG,5
+CA-14A,7
+CA-A,8
+CA-18A,9
+CA-R,10
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/co.txt b/Emby.Server.Implementations/Localization/Ratings/co.txt
new file mode 100644
index 000000000..a694a0be6
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/co.txt
@@ -0,0 +1,8 @@
+CO-T,1
+CO-7,5
+CO-12,7
+CO-15,8
+CO-18,10
+CO-X,100
+CO-BANNED,15
+CO-E,15
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/de.txt b/Emby.Server.Implementations/Localization/Ratings/de.txt
new file mode 100644
index 000000000..ad1f18619
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/de.txt
@@ -0,0 +1,10 @@
+DE-0,1
+FSK-0,1
+DE-6,5
+FSK-6,5
+DE-12,7
+FSK-12,7
+DE-16,8
+FSK-16,8
+DE-18,9
+FSK-18,9
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/dk.txt b/Emby.Server.Implementations/Localization/Ratings/dk.txt
new file mode 100644
index 000000000..b9a085e01
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/dk.txt
@@ -0,0 +1,4 @@
+DA-A,1
+DA-7,5
+DA-11,6
+DA-15,8
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/fr.txt b/Emby.Server.Implementations/Localization/Ratings/fr.txt
new file mode 100644
index 000000000..2bb205b0d
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/fr.txt
@@ -0,0 +1,5 @@
+FR-U,1
+FR-10,5
+FR-12,7
+FR-16,9
+FR-18,10
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/gb.txt b/Emby.Server.Implementations/Localization/Ratings/gb.txt
new file mode 100644
index 000000000..c1f7d0452
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/gb.txt
@@ -0,0 +1,7 @@
+GB-U,1
+GB-PG,5
+GB-12,6
+GB-12A,7
+GB-15,8
+GB-18,9
+GB-R18,15
diff --git a/Emby.Server.Implementations/Localization/Ratings/ie.txt b/Emby.Server.Implementations/Localization/Ratings/ie.txt
new file mode 100644
index 000000000..283f07767
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/ie.txt
@@ -0,0 +1,6 @@
+IE-G,1
+IE-PG,5
+IE-12A,7
+IE-15A,8
+IE-16,9
+IE-18,10
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/jp.txt b/Emby.Server.Implementations/Localization/Ratings/jp.txt
new file mode 100644
index 000000000..2e1da30d8
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/jp.txt
@@ -0,0 +1,4 @@
+JP-G,1
+JP-PG12,7
+JP-15+,8
+JP-18+,10
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/kz.txt b/Emby.Server.Implementations/Localization/Ratings/kz.txt
new file mode 100644
index 000000000..b31e12d96
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/kz.txt
@@ -0,0 +1,6 @@
+KZ-К,1
+KZ-БА,6
+KZ-Б14,7
+KZ-Е16,8
+KZ-Е18,10
+KZ-НА,15
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/mx.txt b/Emby.Server.Implementations/Localization/Ratings/mx.txt
new file mode 100644
index 000000000..93b609c3d
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/mx.txt
@@ -0,0 +1,6 @@
+MX-AA,1
+MX-A,5
+MX-B,7
+MX-B-15,8
+MX-C,9
+MX-D,10
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/nl.txt b/Emby.Server.Implementations/Localization/Ratings/nl.txt
new file mode 100644
index 000000000..f69cc2bcc
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/nl.txt
@@ -0,0 +1,6 @@
+NL-AL,1
+NL-MG6,2
+NL-6,3
+NL-9,5
+NL-12,6
+NL-16,8
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/nz.txt b/Emby.Server.Implementations/Localization/Ratings/nz.txt
new file mode 100644
index 000000000..bc761dcab
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/nz.txt
@@ -0,0 +1,10 @@
+NZ-G,1
+NZ-PG,5
+NZ-M,9
+NZ-R13,7
+NZ-R15,8
+NZ-R16,9
+NZ-R18,10
+NZ-RP13,7
+NZ-RP16,9
+NZ-R,10
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Ratings/ru.txt b/Emby.Server.Implementations/Localization/Ratings/ru.txt
new file mode 100644
index 000000000..1bc94affd
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/ru.txt
@@ -0,0 +1,5 @@
+RU-0+,1
+RU-6+,3
+RU-12+,7
+RU-16+,9
+RU-18+,10
diff --git a/Emby.Server.Implementations/Localization/Ratings/us.txt b/Emby.Server.Implementations/Localization/Ratings/us.txt
new file mode 100644
index 000000000..3f5311e0e
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Ratings/us.txt
@@ -0,0 +1,22 @@
+G,1
+E,1
+EC,1
+TV-G,1
+TV-Y,2
+TV-Y7,3
+TV-Y7-FV,4
+PG,5
+TV-PG,5
+PG-13,7
+T,7
+TV-14,8
+R,9
+M,9
+TV-MA,9
+NC-17,10
+AO,15
+RP,15
+UR,15
+NR,15
+X,15
+XXX,100
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/countries.json b/Emby.Server.Implementations/Localization/countries.json
new file mode 100644
index 000000000..e671b3685
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/countries.json
@@ -0,0 +1 @@
+[{"Name":"AF","DisplayName":"Afghanistan","TwoLetterISORegionName":"AF","ThreeLetterISORegionName":"AFG"},{"Name":"AL","DisplayName":"Albania","TwoLetterISORegionName":"AL","ThreeLetterISORegionName":"ALB"},{"Name":"DZ","DisplayName":"Algeria","TwoLetterISORegionName":"DZ","ThreeLetterISORegionName":"DZA"},{"Name":"AR","DisplayName":"Argentina","TwoLetterISORegionName":"AR","ThreeLetterISORegionName":"ARG"},{"Name":"AM","DisplayName":"Armenia","TwoLetterISORegionName":"AM","ThreeLetterISORegionName":"ARM"},{"Name":"AU","DisplayName":"Australia","TwoLetterISORegionName":"AU","ThreeLetterISORegionName":"AUS"},{"Name":"AT","DisplayName":"Austria","TwoLetterISORegionName":"AT","ThreeLetterISORegionName":"AUT"},{"Name":"AZ","DisplayName":"Azerbaijan","TwoLetterISORegionName":"AZ","ThreeLetterISORegionName":"AZE"},{"Name":"BH","DisplayName":"Bahrain","TwoLetterISORegionName":"BH","ThreeLetterISORegionName":"BHR"},{"Name":"BD","DisplayName":"Bangladesh","TwoLetterISORegionName":"BD","ThreeLetterISORegionName":"BGD"},{"Name":"BY","DisplayName":"Belarus","TwoLetterISORegionName":"BY","ThreeLetterISORegionName":"BLR"},{"Name":"BE","DisplayName":"Belgium","TwoLetterISORegionName":"BE","ThreeLetterISORegionName":"BEL"},{"Name":"BZ","DisplayName":"Belize","TwoLetterISORegionName":"BZ","ThreeLetterISORegionName":"BLZ"},{"Name":"VE","DisplayName":"Bolivarian Republic of Venezuela","TwoLetterISORegionName":"VE","ThreeLetterISORegionName":"VEN"},{"Name":"BO","DisplayName":"Bolivia","TwoLetterISORegionName":"BO","ThreeLetterISORegionName":"BOL"},{"Name":"BA","DisplayName":"Bosnia and Herzegovina","TwoLetterISORegionName":"BA","ThreeLetterISORegionName":"BIH"},{"Name":"BW","DisplayName":"Botswana","TwoLetterISORegionName":"BW","ThreeLetterISORegionName":"BWA"},{"Name":"BR","DisplayName":"Brazil","TwoLetterISORegionName":"BR","ThreeLetterISORegionName":"BRA"},{"Name":"BN","DisplayName":"Brunei Darussalam","TwoLetterISORegionName":"BN","ThreeLetterISORegionName":"BRN"},{"Name":"BG","DisplayName":"Bulgaria","TwoLetterISORegionName":"BG","ThreeLetterISORegionName":"BGR"},{"Name":"KH","DisplayName":"Cambodia","TwoLetterISORegionName":"KH","ThreeLetterISORegionName":"KHM"},{"Name":"CM","DisplayName":"Cameroon","TwoLetterISORegionName":"CM","ThreeLetterISORegionName":"CMR"},{"Name":"CA","DisplayName":"Canada","TwoLetterISORegionName":"CA","ThreeLetterISORegionName":"CAN"},{"Name":"029","DisplayName":"Caribbean","TwoLetterISORegionName":"029","ThreeLetterISORegionName":"029"},{"Name":"CL","DisplayName":"Chile","TwoLetterISORegionName":"CL","ThreeLetterISORegionName":"CHL"},{"Name":"CO","DisplayName":"Colombia","TwoLetterISORegionName":"CO","ThreeLetterISORegionName":"COL"},{"Name":"CD","DisplayName":"Congo [DRC]","TwoLetterISORegionName":"CD","ThreeLetterISORegionName":"COD"},{"Name":"CR","DisplayName":"Costa Rica","TwoLetterISORegionName":"CR","ThreeLetterISORegionName":"CRI"},{"Name":"HR","DisplayName":"Croatia","TwoLetterISORegionName":"HR","ThreeLetterISORegionName":"HRV"},{"Name":"CZ","DisplayName":"Czech Republic","TwoLetterISORegionName":"CZ","ThreeLetterISORegionName":"CZE"},{"Name":"DK","DisplayName":"Denmark","TwoLetterISORegionName":"DK","ThreeLetterISORegionName":"DNK"},{"Name":"DO","DisplayName":"Dominican Republic","TwoLetterISORegionName":"DO","ThreeLetterISORegionName":"DOM"},{"Name":"EC","DisplayName":"Ecuador","TwoLetterISORegionName":"EC","ThreeLetterISORegionName":"ECU"},{"Name":"EG","DisplayName":"Egypt","TwoLetterISORegionName":"EG","ThreeLetterISORegionName":"EGY"},{"Name":"SV","DisplayName":"El Salvador","TwoLetterISORegionName":"SV","ThreeLetterISORegionName":"SLV"},{"Name":"ER","DisplayName":"Eritrea","TwoLetterISORegionName":"ER","ThreeLetterISORegionName":"ERI"},{"Name":"EE","DisplayName":"Estonia","TwoLetterISORegionName":"EE","ThreeLetterISORegionName":"EST"},{"Name":"ET","DisplayName":"Ethiopia","TwoLetterISORegionName":"ET","ThreeLetterISORegionName":"ETH"},{"Name":"FO","DisplayName":"Faroe Islands","TwoLetterISORegionName":"FO","ThreeLetterISORegionName":"FRO"},{"Name":"FI","DisplayName":"Finland","TwoLetterISORegionName":"FI","ThreeLetterISORegionName":"FIN"},{"Name":"FR","DisplayName":"France","TwoLetterISORegionName":"FR","ThreeLetterISORegionName":"FRA"},{"Name":"GE","DisplayName":"Georgia","TwoLetterISORegionName":"GE","ThreeLetterISORegionName":"GEO"},{"Name":"DE","DisplayName":"Germany","TwoLetterISORegionName":"DE","ThreeLetterISORegionName":"DEU"},{"Name":"GR","DisplayName":"Greece","TwoLetterISORegionName":"GR","ThreeLetterISORegionName":"GRC"},{"Name":"GL","DisplayName":"Greenland","TwoLetterISORegionName":"GL","ThreeLetterISORegionName":"GRL"},{"Name":"GT","DisplayName":"Guatemala","TwoLetterISORegionName":"GT","ThreeLetterISORegionName":"GTM"},{"Name":"HT","DisplayName":"Haiti","TwoLetterISORegionName":"HT","ThreeLetterISORegionName":"HTI"},{"Name":"HN","DisplayName":"Honduras","TwoLetterISORegionName":"HN","ThreeLetterISORegionName":"HND"},{"Name":"HK","DisplayName":"Hong Kong S.A.R.","TwoLetterISORegionName":"HK","ThreeLetterISORegionName":"HKG"},{"Name":"HU","DisplayName":"Hungary","TwoLetterISORegionName":"HU","ThreeLetterISORegionName":"HUN"},{"Name":"IS","DisplayName":"Iceland","TwoLetterISORegionName":"IS","ThreeLetterISORegionName":"ISL"},{"Name":"IN","DisplayName":"India","TwoLetterISORegionName":"IN","ThreeLetterISORegionName":"IND"},{"Name":"ID","DisplayName":"Indonesia","TwoLetterISORegionName":"ID","ThreeLetterISORegionName":"IDN"},{"Name":"IR","DisplayName":"Iran","TwoLetterISORegionName":"IR","ThreeLetterISORegionName":"IRN"},{"Name":"IQ","DisplayName":"Iraq","TwoLetterISORegionName":"IQ","ThreeLetterISORegionName":"IRQ"},{"Name":"IE","DisplayName":"Ireland","TwoLetterISORegionName":"IE","ThreeLetterISORegionName":"IRL"},{"Name":"PK","DisplayName":"Islamic Republic of Pakistan","TwoLetterISORegionName":"PK","ThreeLetterISORegionName":"PAK"},{"Name":"IL","DisplayName":"Israel","TwoLetterISORegionName":"IL","ThreeLetterISORegionName":"ISR"},{"Name":"IT","DisplayName":"Italy","TwoLetterISORegionName":"IT","ThreeLetterISORegionName":"ITA"},{"Name":"CI","DisplayName":"Ivory Coast","TwoLetterISORegionName":"CI","ThreeLetterISORegionName":"CIV"},{"Name":"JM","DisplayName":"Jamaica","TwoLetterISORegionName":"JM","ThreeLetterISORegionName":"JAM"},{"Name":"JP","DisplayName":"Japan","TwoLetterISORegionName":"JP","ThreeLetterISORegionName":"JPN"},{"Name":"JO","DisplayName":"Jordan","TwoLetterISORegionName":"JO","ThreeLetterISORegionName":"JOR"},{"Name":"KZ","DisplayName":"Kazakhstan","TwoLetterISORegionName":"KZ","ThreeLetterISORegionName":"KAZ"},{"Name":"KE","DisplayName":"Kenya","TwoLetterISORegionName":"KE","ThreeLetterISORegionName":"KEN"},{"Name":"KR","DisplayName":"Korea","TwoLetterISORegionName":"KR","ThreeLetterISORegionName":"KOR"},{"Name":"KW","DisplayName":"Kuwait","TwoLetterISORegionName":"KW","ThreeLetterISORegionName":"KWT"},{"Name":"KG","DisplayName":"Kyrgyzstan","TwoLetterISORegionName":"KG","ThreeLetterISORegionName":"KGZ"},{"Name":"LA","DisplayName":"Lao P.D.R.","TwoLetterISORegionName":"LA","ThreeLetterISORegionName":"LAO"},{"Name":"419","DisplayName":"Latin America","TwoLetterISORegionName":"419","ThreeLetterISORegionName":"419"},{"Name":"LV","DisplayName":"Latvia","TwoLetterISORegionName":"LV","ThreeLetterISORegionName":"LVA"},{"Name":"LB","DisplayName":"Lebanon","TwoLetterISORegionName":"LB","ThreeLetterISORegionName":"LBN"},{"Name":"LY","DisplayName":"Libya","TwoLetterISORegionName":"LY","ThreeLetterISORegionName":"LBY"},{"Name":"LI","DisplayName":"Liechtenstein","TwoLetterISORegionName":"LI","ThreeLetterISORegionName":"LIE"},{"Name":"LT","DisplayName":"Lithuania","TwoLetterISORegionName":"LT","ThreeLetterISORegionName":"LTU"},{"Name":"LU","DisplayName":"Luxembourg","TwoLetterISORegionName":"LU","ThreeLetterISORegionName":"LUX"},{"Name":"MO","DisplayName":"Macao S.A.R.","TwoLetterISORegionName":"MO","ThreeLetterISORegionName":"MAC"},{"Name":"MK","DisplayName":"Macedonia (FYROM)","TwoLetterISORegionName":"MK","ThreeLetterISORegionName":"MKD"},{"Name":"MY","DisplayName":"Malaysia","TwoLetterISORegionName":"MY","ThreeLetterISORegionName":"MYS"},{"Name":"MV","DisplayName":"Maldives","TwoLetterISORegionName":"MV","ThreeLetterISORegionName":"MDV"},{"Name":"ML","DisplayName":"Mali","TwoLetterISORegionName":"ML","ThreeLetterISORegionName":"MLI"},{"Name":"MT","DisplayName":"Malta","TwoLetterISORegionName":"MT","ThreeLetterISORegionName":"MLT"},{"Name":"MX","DisplayName":"Mexico","TwoLetterISORegionName":"MX","ThreeLetterISORegionName":"MEX"},{"Name":"MN","DisplayName":"Mongolia","TwoLetterISORegionName":"MN","ThreeLetterISORegionName":"MNG"},{"Name":"ME","DisplayName":"Montenegro","TwoLetterISORegionName":"ME","ThreeLetterISORegionName":"MNE"},{"Name":"MA","DisplayName":"Morocco","TwoLetterISORegionName":"MA","ThreeLetterISORegionName":"MAR"},{"Name":"NP","DisplayName":"Nepal","TwoLetterISORegionName":"NP","ThreeLetterISORegionName":"NPL"},{"Name":"NL","DisplayName":"Netherlands","TwoLetterISORegionName":"NL","ThreeLetterISORegionName":"NLD"},{"Name":"NZ","DisplayName":"New Zealand","TwoLetterISORegionName":"NZ","ThreeLetterISORegionName":"NZL"},{"Name":"NI","DisplayName":"Nicaragua","TwoLetterISORegionName":"NI","ThreeLetterISORegionName":"NIC"},{"Name":"NG","DisplayName":"Nigeria","TwoLetterISORegionName":"NG","ThreeLetterISORegionName":"NGA"},{"Name":"NO","DisplayName":"Norway","TwoLetterISORegionName":"NO","ThreeLetterISORegionName":"NOR"},{"Name":"OM","DisplayName":"Oman","TwoLetterISORegionName":"OM","ThreeLetterISORegionName":"OMN"},{"Name":"PA","DisplayName":"Panama","TwoLetterISORegionName":"PA","ThreeLetterISORegionName":"PAN"},{"Name":"PY","DisplayName":"Paraguay","TwoLetterISORegionName":"PY","ThreeLetterISORegionName":"PRY"},{"Name":"CN","DisplayName":"People's Republic of China","TwoLetterISORegionName":"CN","ThreeLetterISORegionName":"CHN"},{"Name":"PE","DisplayName":"Peru","TwoLetterISORegionName":"PE","ThreeLetterISORegionName":"PER"},{"Name":"PH","DisplayName":"Philippines","TwoLetterISORegionName":"PH","ThreeLetterISORegionName":"PHL"},{"Name":"PL","DisplayName":"Poland","TwoLetterISORegionName":"PL","ThreeLetterISORegionName":"POL"},{"Name":"PT","DisplayName":"Portugal","TwoLetterISORegionName":"PT","ThreeLetterISORegionName":"PRT"},{"Name":"MC","DisplayName":"Principality of Monaco","TwoLetterISORegionName":"MC","ThreeLetterISORegionName":"MCO"},{"Name":"PR","DisplayName":"Puerto Rico","TwoLetterISORegionName":"PR","ThreeLetterISORegionName":"PRI"},{"Name":"QA","DisplayName":"Qatar","TwoLetterISORegionName":"QA","ThreeLetterISORegionName":"QAT"},{"Name":"MD","DisplayName":"Republica Moldova","TwoLetterISORegionName":"MD","ThreeLetterISORegionName":"MDA"},{"Name":"RE","DisplayName":"Réunion","TwoLetterISORegionName":"RE","ThreeLetterISORegionName":"REU"},{"Name":"RO","DisplayName":"Romania","TwoLetterISORegionName":"RO","ThreeLetterISORegionName":"ROU"},{"Name":"RU","DisplayName":"Russia","TwoLetterISORegionName":"RU","ThreeLetterISORegionName":"RUS"},{"Name":"RW","DisplayName":"Rwanda","TwoLetterISORegionName":"RW","ThreeLetterISORegionName":"RWA"},{"Name":"SA","DisplayName":"Saudi Arabia","TwoLetterISORegionName":"SA","ThreeLetterISORegionName":"SAU"},{"Name":"SN","DisplayName":"Senegal","TwoLetterISORegionName":"SN","ThreeLetterISORegionName":"SEN"},{"Name":"RS","DisplayName":"Serbia","TwoLetterISORegionName":"RS","ThreeLetterISORegionName":"SRB"},{"Name":"CS","DisplayName":"Serbia and Montenegro (Former)","TwoLetterISORegionName":"CS","ThreeLetterISORegionName":"SCG"},{"Name":"SG","DisplayName":"Singapore","TwoLetterISORegionName":"SG","ThreeLetterISORegionName":"SGP"},{"Name":"SK","DisplayName":"Slovakia","TwoLetterISORegionName":"SK","ThreeLetterISORegionName":"SVK"},{"Name":"SI","DisplayName":"Slovenia","TwoLetterISORegionName":"SI","ThreeLetterISORegionName":"SVN"},{"Name":"SO","DisplayName":"Soomaaliya","TwoLetterISORegionName":"SO","ThreeLetterISORegionName":"SOM"},{"Name":"ZA","DisplayName":"South Africa","TwoLetterISORegionName":"ZA","ThreeLetterISORegionName":"ZAF"},{"Name":"ES","DisplayName":"Spain","TwoLetterISORegionName":"ES","ThreeLetterISORegionName":"ESP"},{"Name":"LK","DisplayName":"Sri Lanka","TwoLetterISORegionName":"LK","ThreeLetterISORegionName":"LKA"},{"Name":"SE","DisplayName":"Sweden","TwoLetterISORegionName":"SE","ThreeLetterISORegionName":"SWE"},{"Name":"CH","DisplayName":"Switzerland","TwoLetterISORegionName":"CH","ThreeLetterISORegionName":"CHE"},{"Name":"SY","DisplayName":"Syria","TwoLetterISORegionName":"SY","ThreeLetterISORegionName":"SYR"},{"Name":"TW","DisplayName":"Taiwan","TwoLetterISORegionName":"TW","ThreeLetterISORegionName":"TWN"},{"Name":"TJ","DisplayName":"Tajikistan","TwoLetterISORegionName":"TJ","ThreeLetterISORegionName":"TAJ"},{"Name":"TH","DisplayName":"Thailand","TwoLetterISORegionName":"TH","ThreeLetterISORegionName":"THA"},{"Name":"TT","DisplayName":"Trinidad and Tobago","TwoLetterISORegionName":"TT","ThreeLetterISORegionName":"TTO"},{"Name":"TN","DisplayName":"Tunisia","TwoLetterISORegionName":"TN","ThreeLetterISORegionName":"TUN"},{"Name":"TR","DisplayName":"Turkey","TwoLetterISORegionName":"TR","ThreeLetterISORegionName":"TUR"},{"Name":"TM","DisplayName":"Turkmenistan","TwoLetterISORegionName":"TM","ThreeLetterISORegionName":"TKM"},{"Name":"AE","DisplayName":"U.A.E.","TwoLetterISORegionName":"AE","ThreeLetterISORegionName":"ARE"},{"Name":"UA","DisplayName":"Ukraine","TwoLetterISORegionName":"UA","ThreeLetterISORegionName":"UKR"},{"Name":"GB","DisplayName":"United Kingdom","TwoLetterISORegionName":"GB","ThreeLetterISORegionName":"GBR"},{"Name":"US","DisplayName":"United States","TwoLetterISORegionName":"US","ThreeLetterISORegionName":"USA"},{"Name":"UY","DisplayName":"Uruguay","TwoLetterISORegionName":"UY","ThreeLetterISORegionName":"URY"},{"Name":"UZ","DisplayName":"Uzbekistan","TwoLetterISORegionName":"UZ","ThreeLetterISORegionName":"UZB"},{"Name":"VN","DisplayName":"Vietnam","TwoLetterISORegionName":"VN","ThreeLetterISORegionName":"VNM"},{"Name":"YE","DisplayName":"Yemen","TwoLetterISORegionName":"YE","ThreeLetterISORegionName":"YEM"},{"Name":"ZW","DisplayName":"Zimbabwe","TwoLetterISORegionName":"ZW","ThreeLetterISORegionName":"ZWE"}]
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/iso6392.txt b/Emby.Server.Implementations/Localization/iso6392.txt
new file mode 100644
index 000000000..665a5375e
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/iso6392.txt
@@ -0,0 +1,487 @@
+aar||aa|Afar|afar
+abk||ab|Abkhazian|abkhaze
+ace|||Achinese|aceh
+ach|||Acoli|acoli
+ada|||Adangme|adangme
+ady|||Adyghe; Adygei|adyghé
+afa|||Afro-Asiatic languages|afro-asiatiques, langues
+afh|||Afrihili|afrihili
+afr||af|Afrikaans|afrikaans
+ain|||Ainu|aïnou
+aka||ak|Akan|akan
+akk|||Akkadian|akkadien
+alb|sqi|sq|Albanian|albanais
+ale|||Aleut|aléoute
+alg|||Algonquian languages|algonquines, langues
+alt|||Southern Altai|altai du Sud
+amh||am|Amharic|amharique
+ang|||English, Old (ca.450-1100)|anglo-saxon (ca.450-1100)
+anp|||Angika|angika
+apa|||Apache languages|apaches, langues
+ara||ar|Arabic|arabe
+arc|||Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)|araméen d'empire (700-300 BCE)
+arg||an|Aragonese|aragonais
+arm|hye|hy|Armenian|arménien
+arn|||Mapudungun; Mapuche|mapudungun; mapuche; mapuce
+arp|||Arapaho|arapaho
+art|||Artificial languages|artificielles, langues
+arw|||Arawak|arawak
+asm||as|Assamese|assamais
+ast|||Asturian; Bable; Leonese; Asturleonese|asturien; bable; léonais; asturoléonais
+ath|||Athapascan languages|athapascanes, langues
+aus|||Australian languages|australiennes, langues
+ava||av|Avaric|avar
+ave||ae|Avestan|avestique
+awa|||Awadhi|awadhi
+aym||ay|Aymara|aymara
+aze||az|Azerbaijani|azéri
+bad|||Banda languages|banda, langues
+bai|||Bamileke languages|bamiléké, langues
+bak||ba|Bashkir|bachkir
+bal|||Baluchi|baloutchi
+bam||bm|Bambara|bambara
+ban|||Balinese|balinais
+baq|eus|eu|Basque|basque
+bas|||Basa|basa
+bat|||Baltic languages|baltes, langues
+bej|||Beja; Bedawiyet|bedja
+bel||be|Belarusian|biélorusse
+bem|||Bemba|bemba
+ben||bn|Bengali|bengali
+ber|||Berber languages|berbères, langues
+bho|||Bhojpuri|bhojpuri
+bih||bh|Bihari languages|langues biharis
+bik|||Bikol|bikol
+bin|||Bini; Edo|bini; edo
+bis||bi|Bislama|bichlamar
+bla|||Siksika|blackfoot
+bnt|||Bantu (Other)|bantoues, autres langues
+bos||bs|Bosnian|bosniaque
+bra|||Braj|braj
+bre||br|Breton|breton
+btk|||Batak languages|batak, langues
+bua|||Buriat|bouriate
+bug|||Buginese|bugi
+bul||bg|Bulgarian|bulgare
+bur|mya|my|Burmese|birman
+byn|||Blin; Bilin|blin; bilen
+cad|||Caddo|caddo
+cai|||Central American Indian languages|amérindiennes de L'Amérique centrale, langues
+car|||Galibi Carib|karib; galibi; carib
+cat||ca|Catalan; Valencian|catalan; valencien
+cau|||Caucasian languages|caucasiennes, langues
+ceb|||Cebuano|cebuano
+cel|||Celtic languages|celtiques, langues; celtes, langues
+cha||ch|Chamorro|chamorro
+chb|||Chibcha|chibcha
+che||ce|Chechen|tchétchène
+chg|||Chagatai|djaghataï
+chi|zho|zh|Chinese|chinois
+chk|||Chuukese|chuuk
+chm|||Mari|mari
+chn|||Chinook jargon|chinook, jargon
+cho|||Choctaw|choctaw
+chp|||Chipewyan; Dene Suline|chipewyan
+chr|||Cherokee|cherokee
+chu||cu|Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic|slavon d'église; vieux slave; slavon liturgique; vieux bulgare
+chv||cv|Chuvash|tchouvache
+chy|||Cheyenne|cheyenne
+cmc|||Chamic languages|chames, langues
+cop|||Coptic|copte
+cor||kw|Cornish|cornique
+cos||co|Corsican|corse
+cpe|||Creoles and pidgins, English based|créoles et pidgins basés sur l'anglais
+cpf|||Creoles and pidgins, French-based |créoles et pidgins basés sur le français
+cpp|||Creoles and pidgins, Portuguese-based |créoles et pidgins basés sur le portugais
+cre||cr|Cree|cree
+crh|||Crimean Tatar; Crimean Turkish|tatar de Crimé
+crp|||Creoles and pidgins |créoles et pidgins
+csb|||Kashubian|kachoube
+cus|||Cushitic languages|couchitiques, langues
+cze|ces|cs|Czech|tchèque
+dak|||Dakota|dakota
+dan||da|Danish|danois
+dar|||Dargwa|dargwa
+day|||Land Dayak languages|dayak, langues
+del|||Delaware|delaware
+den|||Slave (Athapascan)|esclave (athapascan)
+dgr|||Dogrib|dogrib
+din|||Dinka|dinka
+div||dv|Divehi; Dhivehi; Maldivian|maldivien
+doi|||Dogri|dogri
+dra|||Dravidian languages|dravidiennes, langues
+dsb|||Lower Sorbian|bas-sorabe
+dua|||Duala|douala
+dum|||Dutch, Middle (ca.1050-1350)|néerlandais moyen (ca. 1050-1350)
+dut|nld|nl|Dutch; Flemish|néerlandais; flamand
+dyu|||Dyula|dioula
+dzo||dz|Dzongkha|dzongkha
+efi|||Efik|efik
+egy|||Egyptian (Ancient)|égyptien
+eka|||Ekajuk|ekajuk
+elx|||Elamite|élamite
+eng||en|English|anglais
+enm|||English, Middle (1100-1500)|anglais moyen (1100-1500)
+epo||eo|Esperanto|espéranto
+est||et|Estonian|estonien
+ewe||ee|Ewe|éwé
+ewo|||Ewondo|éwondo
+fan|||Fang|fang
+fao||fo|Faroese|féroïen
+fat|||Fanti|fanti
+fij||fj|Fijian|fidjien
+fil|||Filipino; Pilipino|filipino; pilipino
+fin||fi|Finnish|finnois
+fiu|||Finno-Ugrian languages|finno-ougriennes, langues
+fon|||Fon|fon
+fre|fra|fr|French|français
+frm|||French, Middle (ca.1400-1600)|français moyen (1400-1600)
+fro|||French, Old (842-ca.1400)|français ancien (842-ca.1400)
+frr|||Northern Frisian|frison septentrional
+frs|||Eastern Frisian|frison oriental
+fry||fy|Western Frisian|frison occidental
+ful||ff|Fulah|peul
+fur|||Friulian|frioulan
+gaa|||Ga|ga
+gay|||Gayo|gayo
+gba|||Gbaya|gbaya
+gem|||Germanic languages|germaniques, langues
+geo|kat|ka|Georgian|géorgien
+ger|deu|de|German|allemand
+gez|||Geez|guèze
+gil|||Gilbertese|kiribati
+gla||gd|Gaelic; Scottish Gaelic|gaélique; gaélique écossais
+gle||ga|Irish|irlandais
+glg||gl|Galician|galicien
+glv||gv|Manx|manx; mannois
+gmh|||German, Middle High (ca.1050-1500)|allemand, moyen haut (ca. 1050-1500)
+goh|||German, Old High (ca.750-1050)|allemand, vieux haut (ca. 750-1050)
+gon|||Gondi|gond
+gor|||Gorontalo|gorontalo
+got|||Gothic|gothique
+grb|||Grebo|grebo
+grc|||Greek, Ancient (to 1453)|grec ancien (jusqu'à 1453)
+gre|ell|el|Greek, Modern (1453-)|grec moderne (après 1453)
+grn||gn|Guarani|guarani
+gsw|||Swiss German; Alemannic; Alsatian|suisse alémanique; alémanique; alsacien
+guj||gu|Gujarati|goudjrati
+gwi|||Gwich'in|gwich'in
+hai|||Haida|haida
+hat||ht|Haitian; Haitian Creole|haïtien; créole haïtien
+hau||ha|Hausa|haoussa
+haw|||Hawaiian|hawaïen
+heb||he|Hebrew|hébreu
+her||hz|Herero|herero
+hil|||Hiligaynon|hiligaynon
+him|||Himachali languages; Western Pahari languages|langues himachalis; langues paharis occidentales
+hin||hi|Hindi|hindi
+hit|||Hittite|hittite
+hmn|||Hmong; Mong|hmong
+hmo||ho|Hiri Motu|hiri motu
+hrv||hr|Croatian|croate
+hsb|||Upper Sorbian|haut-sorabe
+hun||hu|Hungarian|hongrois
+hup|||Hupa|hupa
+iba|||Iban|iban
+ibo||ig|Igbo|igbo
+ice|isl|is|Icelandic|islandais
+ido||io|Ido|ido
+iii||ii|Sichuan Yi; Nuosu|yi de Sichuan
+ijo|||Ijo languages|ijo, langues
+iku||iu|Inuktitut|inuktitut
+ile||ie|Interlingue; Occidental|interlingue
+ilo|||Iloko|ilocano
+ina||ia|Interlingua (International Auxiliary Language Association)|interlingua (langue auxiliaire internationale)
+inc|||Indic languages|indo-aryennes, langues
+ind||id|Indonesian|indonésien
+ine|||Indo-European languages|indo-européennes, langues
+inh|||Ingush|ingouche
+ipk||ik|Inupiaq|inupiaq
+ira|||Iranian languages|iraniennes, langues
+iro|||Iroquoian languages|iroquoises, langues
+ita||it|Italian|italien
+jav||jv|Javanese|javanais
+jbo|||Lojban|lojban
+jpn||ja|Japanese|japonais
+jpr|||Judeo-Persian|judéo-persan
+jrb|||Judeo-Arabic|judéo-arabe
+kaa|||Kara-Kalpak|karakalpak
+kab|||Kabyle|kabyle
+kac|||Kachin; Jingpho|kachin; jingpho
+kal||kl|Kalaallisut; Greenlandic|groenlandais
+kam|||Kamba|kamba
+kan||kn|Kannada|kannada
+kar|||Karen languages|karen, langues
+kas||ks|Kashmiri|kashmiri
+kau||kr|Kanuri|kanouri
+kaw|||Kawi|kawi
+kaz||kk|Kazakh|kazakh
+kbd|||Kabardian|kabardien
+kha|||Khasi|khasi
+khi|||Khoisan languages|khoïsan, langues
+khm||km|Central Khmer|khmer central
+kho|||Khotanese; Sakan|khotanais; sakan
+kik||ki|Kikuyu; Gikuyu|kikuyu
+kin||rw|Kinyarwanda|rwanda
+kir||ky|Kirghiz; Kyrgyz|kirghiz
+kmb|||Kimbundu|kimbundu
+kok|||Konkani|konkani
+kom||kv|Komi|kom
+kon||kg|Kongo|kongo
+kor||ko|Korean|coréen
+kos|||Kosraean|kosrae
+kpe|||Kpelle|kpellé
+krc|||Karachay-Balkar|karatchai balkar
+krl|||Karelian|carélien
+kro|||Kru languages|krou, langues
+kru|||Kurukh|kurukh
+kua||kj|Kuanyama; Kwanyama|kuanyama; kwanyama
+kum|||Kumyk|koumyk
+kur||ku|Kurdish|kurde
+kut|||Kutenai|kutenai
+lad|||Ladino|judéo-espagnol
+lah|||Lahnda|lahnda
+lam|||Lamba|lamba
+lao||lo|Lao|lao
+lat||la|Latin|latin
+lav||lv|Latvian|letton
+lez|||Lezghian|lezghien
+lim||li|Limburgan; Limburger; Limburgish|limbourgeois
+lin||ln|Lingala|lingala
+lit||lt|Lithuanian|lituanien
+lol|||Mongo|mongo
+loz|||Lozi|lozi
+ltz||lb|Luxembourgish; Letzeburgesch|luxembourgeois
+lua|||Luba-Lulua|luba-lulua
+lub||lu|Luba-Katanga|luba-katanga
+lug||lg|Ganda|ganda
+lui|||Luiseno|luiseno
+lun|||Lunda|lunda
+luo|||Luo (Kenya and Tanzania)|luo (Kenya et Tanzanie)
+lus|||Lushai|lushai
+mac|mkd|mk|Macedonian|macédonien
+mad|||Madurese|madourais
+mag|||Magahi|magahi
+mah||mh|Marshallese|marshall
+mai|||Maithili|maithili
+mak|||Makasar|makassar
+mal||ml|Malayalam|malayalam
+man|||Mandingo|mandingue
+mao|mri|mi|Maori|maori
+map|||Austronesian languages|austronésiennes, langues
+mar||mr|Marathi|marathe
+mas|||Masai|massaï
+may|msa|ms|Malay|malais
+mdf|||Moksha|moksa
+mdr|||Mandar|mandar
+men|||Mende|mendé
+mga|||Irish, Middle (900-1200)|irlandais moyen (900-1200)
+mic|||Mi'kmaq; Micmac|mi'kmaq; micmac
+min|||Minangkabau|minangkabau
+mis|||Uncoded languages|langues non codées
+mkh|||Mon-Khmer languages|môn-khmer, langues
+mlg||mg|Malagasy|malgache
+mlt||mt|Maltese|maltais
+mnc|||Manchu|mandchou
+mni|||Manipuri|manipuri
+mno|||Manobo languages|manobo, langues
+moh|||Mohawk|mohawk
+mon||mn|Mongolian|mongol
+mos|||Mossi|moré
+mul|||Multiple languages|multilingue
+mun|||Munda languages|mounda, langues
+mus|||Creek|muskogee
+mwl|||Mirandese|mirandais
+mwr|||Marwari|marvari
+myn|||Mayan languages|maya, langues
+myv|||Erzya|erza
+nah|||Nahuatl languages|nahuatl, langues
+nai|||North American Indian languages|nord-amérindiennes, langues
+nap|||Neapolitan|napolitain
+nau||na|Nauru|nauruan
+nav||nv|Navajo; Navaho|navaho
+nbl||nr|Ndebele, South; South Ndebele|ndébélé du Sud
+nde||nd|Ndebele, North; North Ndebele|ndébélé du Nord
+ndo||ng|Ndonga|ndonga
+nds|||Low German; Low Saxon; German, Low; Saxon, Low|bas allemand; bas saxon; allemand, bas; saxon, bas
+nep||ne|Nepali|népalais
+new|||Nepal Bhasa; Newari|nepal bhasa; newari
+nia|||Nias|nias
+nic|||Niger-Kordofanian languages|nigéro-kordofaniennes, langues
+niu|||Niuean|niué
+nno||nn|Norwegian Nynorsk; Nynorsk, Norwegian|norvégien nynorsk; nynorsk, norvégien
+nob||nb|Bokmål, Norwegian; Norwegian Bokmål|norvégien bokmål
+nog|||Nogai|nogaï; nogay
+non|||Norse, Old|norrois, vieux
+nor||no|Norwegian|norvégien
+nqo|||N'Ko|n'ko
+nso|||Pedi; Sepedi; Northern Sotho|pedi; sepedi; sotho du Nord
+nub|||Nubian languages|nubiennes, langues
+nwc|||Classical Newari; Old Newari; Classical Nepal Bhasa|newari classique
+nya||ny|Chichewa; Chewa; Nyanja|chichewa; chewa; nyanja
+nym|||Nyamwezi|nyamwezi
+nyn|||Nyankole|nyankolé
+nyo|||Nyoro|nyoro
+nzi|||Nzima|nzema
+oci||oc|Occitan (post 1500); Provençal|occitan (après 1500); provençal
+oji||oj|Ojibwa|ojibwa
+ori||or|Oriya|oriya
+orm||om|Oromo|galla
+osa|||Osage|osage
+oss||os|Ossetian; Ossetic|ossète
+ota|||Turkish, Ottoman (1500-1928)|turc ottoman (1500-1928)
+oto|||Otomian languages|otomi, langues
+paa|||Papuan languages|papoues, langues
+pag|||Pangasinan|pangasinan
+pal|||Pahlavi|pahlavi
+pam|||Pampanga; Kapampangan|pampangan
+pan||pa|Panjabi; Punjabi|pendjabi
+pap|||Papiamento|papiamento
+pau|||Palauan|palau
+peo|||Persian, Old (ca.600-400 B.C.)|perse, vieux (ca. 600-400 av. J.-C.)
+per|fas|fa|Persian|persan
+phi|||Philippine languages|philippines, langues
+phn|||Phoenician|phénicien
+pli||pi|Pali|pali
+pol||pl|Polish|polonais
+pon|||Pohnpeian|pohnpei
+por||pt|Portuguese|portugais
+pob||pt-br|Portuguese (Brazil)|portugais
+pra|||Prakrit languages|prâkrit, langues
+pro|||Provençal, Old (to 1500)|provençal ancien (jusqu'à 1500)
+pus||ps|Pushto; Pashto|pachto
+qaa-qtz|||Reserved for local use|réservée à l'usage local
+que||qu|Quechua|quechua
+raj|||Rajasthani|rajasthani
+rap|||Rapanui|rapanui
+rar|||Rarotongan; Cook Islands Maori|rarotonga; maori des îles Cook
+roa|||Romance languages|romanes, langues
+roh||rm|Romansh|romanche
+rom|||Romany|tsigane
+rum|ron|ro|Romanian; Moldavian; Moldovan|roumain; moldave
+run||rn|Rundi|rundi
+rup|||Aromanian; Arumanian; Macedo-Romanian|aroumain; macédo-roumain
+rus||ru|Russian|russe
+sad|||Sandawe|sandawe
+sag||sg|Sango|sango
+sah|||Yakut|iakoute
+sai|||South American Indian (Other)|indiennes d'Amérique du Sud, autres langues
+sal|||Salishan languages|salishennes, langues
+sam|||Samaritan Aramaic|samaritain
+san||sa|Sanskrit|sanskrit
+sas|||Sasak|sasak
+sat|||Santali|santal
+scn|||Sicilian|sicilien
+sco|||Scots|écossais
+sel|||Selkup|selkoupe
+sem|||Semitic languages|sémitiques, langues
+sga|||Irish, Old (to 900)|irlandais ancien (jusqu'à 900)
+sgn|||Sign Languages|langues des signes
+shn|||Shan|chan
+sid|||Sidamo|sidamo
+sin||si|Sinhala; Sinhalese|singhalais
+sio|||Siouan languages|sioux, langues
+sit|||Sino-Tibetan languages|sino-tibétaines, langues
+sla|||Slavic languages|slaves, langues
+slo|slk|sk|Slovak|slovaque
+slv||sl|Slovenian|slovène
+sma|||Southern Sami|sami du Sud
+sme||se|Northern Sami|sami du Nord
+smi|||Sami languages|sames, langues
+smj|||Lule Sami|sami de Lule
+smn|||Inari Sami|sami d'Inari
+smo||sm|Samoan|samoan
+sms|||Skolt Sami|sami skolt
+sna||sn|Shona|shona
+snd||sd|Sindhi|sindhi
+snk|||Soninke|soninké
+sog|||Sogdian|sogdien
+som||so|Somali|somali
+son|||Songhai languages|songhai, langues
+sot||st|Sotho, Southern|sotho du Sud
+spa||es|Spanish; Castilian|espagnol; castillan
+srd||sc|Sardinian|sarde
+srn|||Sranan Tongo|sranan tongo
+srp||sr|Serbian|serbe
+srr|||Serer|sérère
+ssa|||Nilo-Saharan languages|nilo-sahariennes, langues
+ssw||ss|Swati|swati
+suk|||Sukuma|sukuma
+sun||su|Sundanese|soundanais
+sus|||Susu|soussou
+sux|||Sumerian|sumérien
+swa||sw|Swahili|swahili
+swe||sv|Swedish|suédois
+syc|||Classical Syriac|syriaque classique
+syr|||Syriac|syriaque
+tah||ty|Tahitian|tahitien
+tai|||Tai languages|tai, langues
+tam||ta|Tamil|tamoul
+tat||tt|Tatar|tatar
+tel||te|Telugu|télougou
+tem|||Timne|temne
+ter|||Tereno|tereno
+tet|||Tetum|tetum
+tgk||tg|Tajik|tadjik
+tgl||tl|Tagalog|tagalog
+tha||th|Thai|thaï
+tib|bod|bo|Tibetan|tibétain
+tig|||Tigre|tigré
+tir||ti|Tigrinya|tigrigna
+tiv|||Tiv|tiv
+tkl|||Tokelau|tokelau
+tlh|||Klingon; tlhIngan-Hol|klingon
+tli|||Tlingit|tlingit
+tmh|||Tamashek|tamacheq
+tog|||Tonga (Nyasa)|tonga (Nyasa)
+ton||to|Tonga (Tonga Islands)|tongan (Îles Tonga)
+tpi|||Tok Pisin|tok pisin
+tsi|||Tsimshian|tsimshian
+tsn||tn|Tswana|tswana
+tso||ts|Tsonga|tsonga
+tuk||tk|Turkmen|turkmène
+tum|||Tumbuka|tumbuka
+tup|||Tupi languages|tupi, langues
+tur||tr|Turkish|turc
+tut|||Altaic languages|altaïques, langues
+tvl|||Tuvalu|tuvalu
+twi||tw|Twi|twi
+tyv|||Tuvinian|touva
+udm|||Udmurt|oudmourte
+uga|||Ugaritic|ougaritique
+uig||ug|Uighur; Uyghur|ouïgour
+ukr||uk|Ukrainian|ukrainien
+umb|||Umbundu|umbundu
+und|||Undetermined|indéterminée
+urd||ur|Urdu|ourdou
+uzb||uz|Uzbek|ouszbek
+vai|||Vai|vaï
+ven||ve|Venda|venda
+vie||vi|Vietnamese|vietnamien
+vol||vo|Volapük|volapük
+vot|||Votic|vote
+wak|||Wakashan languages|wakashanes, langues
+wal|||Walamo|walamo
+war|||Waray|waray
+was|||Washo|washo
+wel|cym|cy|Welsh|gallois
+wen|||Sorbian languages|sorabes, langues
+wln||wa|Walloon|wallon
+wol||wo|Wolof|wolof
+xal|||Kalmyk; Oirat|kalmouk; oïrat
+xho||xh|Xhosa|xhosa
+yao|||Yao|yao
+yap|||Yapese|yapois
+yid||yi|Yiddish|yiddish
+yor||yo|Yoruba|yoruba
+ypk|||Yupik languages|yupik, langues
+zap|||Zapotec|zapotèque
+zbl|||Blissymbols; Blissymbolics; Bliss|symboles Bliss; Bliss
+zen|||Zenaga|zenaga
+zgh|||Standard Moroccan Tamazight|amazighe standard marocain
+zha||za|Zhuang; Chuang|zhuang; chuang
+znd|||Zande languages|zandé, langues
+zul||zu|Zulu|zoulou
+zun|||Zuni|zuni
+zxx|||No linguistic content; Not applicable|pas de contenu linguistique; non applicable
+zza|||Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki|zaza; dimili; dimli; kirdki; kirmanjki; zazaki
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs b/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs
deleted file mode 100644
index 36a257f63..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using ServiceStack;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    /// <summary>
-    /// Class GetDashboardResource
-    /// </summary>
-    [Route("/swagger-ui/{ResourceName*}", "GET")]
-    public class GetSwaggerResource
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string ResourceName { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index f00c81766..805cb0353 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -18,6 +18,7 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.HttpServer;
+using Emby.Server.Implementations.HttpServer.SocketSharp;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Controller;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs
deleted file mode 100644
index 49d6bceb4..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/HttpUtility.cs
+++ /dev/null
@@ -1,942 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Text;
-using MediaBrowser.Model.Services;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
-{
-    public static class MyHttpUtility
-    {
-        sealed class HttpQSCollection : NameValueCollection
-        {
-            public override string ToString()
-            {
-                int count = Count;
-                if (count == 0)
-                    return "";
-                StringBuilder sb = new StringBuilder();
-                string[] keys = AllKeys;
-                for (int i = 0; i < count; i++)
-                {
-                    sb.AppendFormat("{0}={1}&", keys[i], this[keys[i]]);
-                }
-                if (sb.Length > 0)
-                    sb.Length--;
-                return sb.ToString();
-            }
-        }
-
-        // Must be sorted
-        static readonly long[] entities = new long[] {
-			(long)'A' << 56 | (long)'E' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
-			(long)'A' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'A' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'A' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'A' << 56 | (long)'l' << 48 | (long)'p' << 40 | (long)'h' << 32 | (long)'a' << 24, 
-			(long)'A' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'g' << 24, 
-			(long)'A' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
-			(long)'A' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'B' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
-			(long)'C' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'d' << 32 | (long)'i' << 24 | (long)'l' << 16, 
-			(long)'C' << 56 | (long)'h' << 48 | (long)'i' << 40, 
-			(long)'D' << 56 | (long)'a' << 48 | (long)'g' << 40 | (long)'g' << 32 | (long)'e' << 24 | (long)'r' << 16, 
-			(long)'D' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'t' << 32 | (long)'a' << 24, 
-			(long)'E' << 56 | (long)'T' << 48 | (long)'H' << 40, 
-			(long)'E' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'E' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'E' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'E' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
-			(long)'E' << 56 | (long)'t' << 48 | (long)'a' << 40, 
-			(long)'E' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'G' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'m' << 32 | (long)'a' << 24, 
-			(long)'I' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'I' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'I' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'I' << 56 | (long)'o' << 48 | (long)'t' << 40 | (long)'a' << 32, 
-			(long)'I' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'K' << 56 | (long)'a' << 48 | (long)'p' << 40 | (long)'p' << 32 | (long)'a' << 24, 
-			(long)'L' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'b' << 32 | (long)'d' << 24 | (long)'a' << 16, 
-			(long)'M' << 56 | (long)'u' << 48, 
-			(long)'N' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
-			(long)'N' << 56 | (long)'u' << 48, 
-			(long)'O' << 56 | (long)'E' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
-			(long)'O' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'O' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'O' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'O' << 56 | (long)'m' << 48 | (long)'e' << 40 | (long)'g' << 32 | (long)'a' << 24, 
-			(long)'O' << 56 | (long)'m' << 48 | (long)'i' << 40 | (long)'c' << 32 | (long)'r' << 24 | (long)'o' << 16 | (long)'n' << 8, 
-			(long)'O' << 56 | (long)'s' << 48 | (long)'l' << 40 | (long)'a' << 32 | (long)'s' << 24 | (long)'h' << 16, 
-			(long)'O' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
-			(long)'O' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'P' << 56 | (long)'h' << 48 | (long)'i' << 40, 
-			(long)'P' << 56 | (long)'i' << 48, 
-			(long)'P' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'m' << 32 | (long)'e' << 24, 
-			(long)'P' << 56 | (long)'s' << 48 | (long)'i' << 40, 
-			(long)'R' << 56 | (long)'h' << 48 | (long)'o' << 40, 
-			(long)'S' << 56 | (long)'c' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'o' << 24 | (long)'n' << 16, 
-			(long)'S' << 56 | (long)'i' << 48 | (long)'g' << 40 | (long)'m' << 32 | (long)'a' << 24, 
-			(long)'T' << 56 | (long)'H' << 48 | (long)'O' << 40 | (long)'R' << 32 | (long)'N' << 24, 
-			(long)'T' << 56 | (long)'a' << 48 | (long)'u' << 40, 
-			(long)'T' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'t' << 32 | (long)'a' << 24, 
-			(long)'U' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'U' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'U' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'U' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
-			(long)'U' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'X' << 56 | (long)'i' << 48, 
-			(long)'Y' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'Y' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'Z' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
-			(long)'a' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'a' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'a' << 56 | (long)'c' << 48 | (long)'u' << 40 | (long)'t' << 32 | (long)'e' << 24, 
-			(long)'a' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
-			(long)'a' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'a' << 56 | (long)'l' << 48 | (long)'e' << 40 | (long)'f' << 32 | (long)'s' << 24 | (long)'y' << 16 | (long)'m' << 8, 
-			(long)'a' << 56 | (long)'l' << 48 | (long)'p' << 40 | (long)'h' << 32 | (long)'a' << 24, 
-			(long)'a' << 56 | (long)'m' << 48 | (long)'p' << 40, 
-			(long)'a' << 56 | (long)'n' << 48 | (long)'d' << 40, 
-			(long)'a' << 56 | (long)'n' << 48 | (long)'g' << 40, 
-			(long)'a' << 56 | (long)'p' << 48 | (long)'o' << 40 | (long)'s' << 32,
-			(long)'a' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'g' << 24, 
-			(long)'a' << 56 | (long)'s' << 48 | (long)'y' << 40 | (long)'m' << 32 | (long)'p' << 24, 
-			(long)'a' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
-			(long)'a' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'b' << 56 | (long)'d' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'b' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
-			(long)'b' << 56 | (long)'r' << 48 | (long)'v' << 40 | (long)'b' << 32 | (long)'a' << 24 | (long)'r' << 16, 
-			(long)'b' << 56 | (long)'u' << 48 | (long)'l' << 40 | (long)'l' << 32, 
-			(long)'c' << 56 | (long)'a' << 48 | (long)'p' << 40, 
-			(long)'c' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'d' << 32 | (long)'i' << 24 | (long)'l' << 16, 
-			(long)'c' << 56 | (long)'e' << 48 | (long)'d' << 40 | (long)'i' << 32 | (long)'l' << 24, 
-			(long)'c' << 56 | (long)'e' << 48 | (long)'n' << 40 | (long)'t' << 32, 
-			(long)'c' << 56 | (long)'h' << 48 | (long)'i' << 40, 
-			(long)'c' << 56 | (long)'i' << 48 | (long)'r' << 40 | (long)'c' << 32, 
-			(long)'c' << 56 | (long)'l' << 48 | (long)'u' << 40 | (long)'b' << 32 | (long)'s' << 24, 
-			(long)'c' << 56 | (long)'o' << 48 | (long)'n' << 40 | (long)'g' << 32, 
-			(long)'c' << 56 | (long)'o' << 48 | (long)'p' << 40 | (long)'y' << 32, 
-			(long)'c' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'r' << 24, 
-			(long)'c' << 56 | (long)'u' << 48 | (long)'p' << 40, 
-			(long)'c' << 56 | (long)'u' << 48 | (long)'r' << 40 | (long)'r' << 32 | (long)'e' << 24 | (long)'n' << 16, 
-			(long)'d' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'d' << 56 | (long)'a' << 48 | (long)'g' << 40 | (long)'g' << 32 | (long)'e' << 24 | (long)'r' << 16, 
-			(long)'d' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'d' << 56 | (long)'e' << 48 | (long)'g' << 40, 
-			(long)'d' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'t' << 32 | (long)'a' << 24, 
-			(long)'d' << 56 | (long)'i' << 48 | (long)'a' << 40 | (long)'m' << 32 | (long)'s' << 24, 
-			(long)'d' << 56 | (long)'i' << 48 | (long)'v' << 40 | (long)'i' << 32 | (long)'d' << 24 | (long)'e' << 16, 
-			(long)'e' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'e' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'e' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'e' << 56 | (long)'m' << 48 | (long)'p' << 40 | (long)'t' << 32 | (long)'y' << 24, 
-			(long)'e' << 56 | (long)'m' << 48 | (long)'s' << 40 | (long)'p' << 32, 
-			(long)'e' << 56 | (long)'n' << 48 | (long)'s' << 40 | (long)'p' << 32, 
-			(long)'e' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
-			(long)'e' << 56 | (long)'q' << 48 | (long)'u' << 40 | (long)'i' << 32 | (long)'v' << 24, 
-			(long)'e' << 56 | (long)'t' << 48 | (long)'a' << 40, 
-			(long)'e' << 56 | (long)'t' << 48 | (long)'h' << 40, 
-			(long)'e' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'e' << 56 | (long)'u' << 48 | (long)'r' << 40 | (long)'o' << 32, 
-			(long)'e' << 56 | (long)'x' << 48 | (long)'i' << 40 | (long)'s' << 32 | (long)'t' << 24, 
-			(long)'f' << 56 | (long)'n' << 48 | (long)'o' << 40 | (long)'f' << 32, 
-			(long)'f' << 56 | (long)'o' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'l' << 24 | (long)'l' << 16, 
-			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'c' << 32 | (long)'1' << 24 | (long)'2' << 16, 
-			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'c' << 32 | (long)'1' << 24 | (long)'4' << 16, 
-			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'c' << 32 | (long)'3' << 24 | (long)'4' << 16, 
-			(long)'f' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'s' << 32 | (long)'l' << 24, 
-			(long)'g' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'m' << 32 | (long)'a' << 24, 
-			(long)'g' << 56 | (long)'e' << 48, 
-			(long)'g' << 56 | (long)'t' << 48, 
-			(long)'h' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'h' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'h' << 56 | (long)'e' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'t' << 24 | (long)'s' << 16, 
-			(long)'h' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'l' << 32 | (long)'i' << 24 | (long)'p' << 16, 
-			(long)'i' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'i' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'i' << 56 | (long)'e' << 48 | (long)'x' << 40 | (long)'c' << 32 | (long)'l' << 24, 
-			(long)'i' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'i' << 56 | (long)'m' << 48 | (long)'a' << 40 | (long)'g' << 32 | (long)'e' << 24, 
-			(long)'i' << 56 | (long)'n' << 48 | (long)'f' << 40 | (long)'i' << 32 | (long)'n' << 24, 
-			(long)'i' << 56 | (long)'n' << 48 | (long)'t' << 40, 
-			(long)'i' << 56 | (long)'o' << 48 | (long)'t' << 40 | (long)'a' << 32, 
-			(long)'i' << 56 | (long)'q' << 48 | (long)'u' << 40 | (long)'e' << 32 | (long)'s' << 24 | (long)'t' << 16, 
-			(long)'i' << 56 | (long)'s' << 48 | (long)'i' << 40 | (long)'n' << 32, 
-			(long)'i' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'k' << 56 | (long)'a' << 48 | (long)'p' << 40 | (long)'p' << 32 | (long)'a' << 24, 
-			(long)'l' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'l' << 56 | (long)'a' << 48 | (long)'m' << 40 | (long)'b' << 32 | (long)'d' << 24 | (long)'a' << 16, 
-			(long)'l' << 56 | (long)'a' << 48 | (long)'n' << 40 | (long)'g' << 32, 
-			(long)'l' << 56 | (long)'a' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'l' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'l' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'i' << 32 | (long)'l' << 24, 
-			(long)'l' << 56 | (long)'d' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'l' << 56 | (long)'e' << 48, 
-			(long)'l' << 56 | (long)'f' << 48 | (long)'l' << 40 | (long)'o' << 32 | (long)'o' << 24 | (long)'r' << 16, 
-			(long)'l' << 56 | (long)'o' << 48 | (long)'w' << 40 | (long)'a' << 32 | (long)'s' << 24 | (long)'t' << 16, 
-			(long)'l' << 56 | (long)'o' << 48 | (long)'z' << 40, 
-			(long)'l' << 56 | (long)'r' << 48 | (long)'m' << 40, 
-			(long)'l' << 56 | (long)'s' << 48 | (long)'a' << 40 | (long)'q' << 32 | (long)'u' << 24 | (long)'o' << 16, 
-			(long)'l' << 56 | (long)'s' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'l' << 56 | (long)'t' << 48, 
-			(long)'m' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'r' << 32, 
-			(long)'m' << 56 | (long)'d' << 48 | (long)'a' << 40 | (long)'s' << 32 | (long)'h' << 24, 
-			(long)'m' << 56 | (long)'i' << 48 | (long)'c' << 40 | (long)'r' << 32 | (long)'o' << 24, 
-			(long)'m' << 56 | (long)'i' << 48 | (long)'d' << 40 | (long)'d' << 32 | (long)'o' << 24 | (long)'t' << 16, 
-			(long)'m' << 56 | (long)'i' << 48 | (long)'n' << 40 | (long)'u' << 32 | (long)'s' << 24, 
-			(long)'m' << 56 | (long)'u' << 48, 
-			(long)'n' << 56 | (long)'a' << 48 | (long)'b' << 40 | (long)'l' << 32 | (long)'a' << 24, 
-			(long)'n' << 56 | (long)'b' << 48 | (long)'s' << 40 | (long)'p' << 32, 
-			(long)'n' << 56 | (long)'d' << 48 | (long)'a' << 40 | (long)'s' << 32 | (long)'h' << 24, 
-			(long)'n' << 56 | (long)'e' << 48, 
-			(long)'n' << 56 | (long)'i' << 48, 
-			(long)'n' << 56 | (long)'o' << 48 | (long)'t' << 40, 
-			(long)'n' << 56 | (long)'o' << 48 | (long)'t' << 40 | (long)'i' << 32 | (long)'n' << 24, 
-			(long)'n' << 56 | (long)'s' << 48 | (long)'u' << 40 | (long)'b' << 32, 
-			(long)'n' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
-			(long)'n' << 56 | (long)'u' << 48, 
-			(long)'o' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'o' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'o' << 56 | (long)'e' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
-			(long)'o' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'o' << 56 | (long)'l' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'e' << 24, 
-			(long)'o' << 56 | (long)'m' << 48 | (long)'e' << 40 | (long)'g' << 32 | (long)'a' << 24, 
-			(long)'o' << 56 | (long)'m' << 48 | (long)'i' << 40 | (long)'c' << 32 | (long)'r' << 24 | (long)'o' << 16 | (long)'n' << 8, 
-			(long)'o' << 56 | (long)'p' << 48 | (long)'l' << 40 | (long)'u' << 32 | (long)'s' << 24, 
-			(long)'o' << 56 | (long)'r' << 48, 
-			(long)'o' << 56 | (long)'r' << 48 | (long)'d' << 40 | (long)'f' << 32, 
-			(long)'o' << 56 | (long)'r' << 48 | (long)'d' << 40 | (long)'m' << 32, 
-			(long)'o' << 56 | (long)'s' << 48 | (long)'l' << 40 | (long)'a' << 32 | (long)'s' << 24 | (long)'h' << 16, 
-			(long)'o' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'l' << 32 | (long)'d' << 24 | (long)'e' << 16, 
-			(long)'o' << 56 | (long)'t' << 48 | (long)'i' << 40 | (long)'m' << 32 | (long)'e' << 24 | (long)'s' << 16, 
-			(long)'o' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'p' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'a' << 32, 
-			(long)'p' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'t' << 32, 
-			(long)'p' << 56 | (long)'e' << 48 | (long)'r' << 40 | (long)'m' << 32 | (long)'i' << 24 | (long)'l' << 16, 
-			(long)'p' << 56 | (long)'e' << 48 | (long)'r' << 40 | (long)'p' << 32, 
-			(long)'p' << 56 | (long)'h' << 48 | (long)'i' << 40, 
-			(long)'p' << 56 | (long)'i' << 48, 
-			(long)'p' << 56 | (long)'i' << 48 | (long)'v' << 40, 
-			(long)'p' << 56 | (long)'l' << 48 | (long)'u' << 40 | (long)'s' << 32 | (long)'m' << 24 | (long)'n' << 16, 
-			(long)'p' << 56 | (long)'o' << 48 | (long)'u' << 40 | (long)'n' << 32 | (long)'d' << 24, 
-			(long)'p' << 56 | (long)'r' << 48 | (long)'i' << 40 | (long)'m' << 32 | (long)'e' << 24, 
-			(long)'p' << 56 | (long)'r' << 48 | (long)'o' << 40 | (long)'d' << 32, 
-			(long)'p' << 56 | (long)'r' << 48 | (long)'o' << 40 | (long)'p' << 32, 
-			(long)'p' << 56 | (long)'s' << 48 | (long)'i' << 40, 
-			(long)'q' << 56 | (long)'u' << 48 | (long)'o' << 40 | (long)'t' << 32, 
-			(long)'r' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'r' << 56 | (long)'a' << 48 | (long)'d' << 40 | (long)'i' << 32 | (long)'c' << 24, 
-			(long)'r' << 56 | (long)'a' << 48 | (long)'n' << 40 | (long)'g' << 32, 
-			(long)'r' << 56 | (long)'a' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'r' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'r' << 56 | (long)'c' << 48 | (long)'e' << 40 | (long)'i' << 32 | (long)'l' << 24, 
-			(long)'r' << 56 | (long)'d' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'r' << 56 | (long)'e' << 48 | (long)'a' << 40 | (long)'l' << 32, 
-			(long)'r' << 56 | (long)'e' << 48 | (long)'g' << 40, 
-			(long)'r' << 56 | (long)'f' << 48 | (long)'l' << 40 | (long)'o' << 32 | (long)'o' << 24 | (long)'r' << 16, 
-			(long)'r' << 56 | (long)'h' << 48 | (long)'o' << 40, 
-			(long)'r' << 56 | (long)'l' << 48 | (long)'m' << 40, 
-			(long)'r' << 56 | (long)'s' << 48 | (long)'a' << 40 | (long)'q' << 32 | (long)'u' << 24 | (long)'o' << 16, 
-			(long)'r' << 56 | (long)'s' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'s' << 56 | (long)'b' << 48 | (long)'q' << 40 | (long)'u' << 32 | (long)'o' << 24, 
-			(long)'s' << 56 | (long)'c' << 48 | (long)'a' << 40 | (long)'r' << 32 | (long)'o' << 24 | (long)'n' << 16, 
-			(long)'s' << 56 | (long)'d' << 48 | (long)'o' << 40 | (long)'t' << 32, 
-			(long)'s' << 56 | (long)'e' << 48 | (long)'c' << 40 | (long)'t' << 32, 
-			(long)'s' << 56 | (long)'h' << 48 | (long)'y' << 40, 
-			(long)'s' << 56 | (long)'i' << 48 | (long)'g' << 40 | (long)'m' << 32 | (long)'a' << 24, 
-			(long)'s' << 56 | (long)'i' << 48 | (long)'g' << 40 | (long)'m' << 32 | (long)'a' << 24 | (long)'f' << 16, 
-			(long)'s' << 56 | (long)'i' << 48 | (long)'m' << 40, 
-			(long)'s' << 56 | (long)'p' << 48 | (long)'a' << 40 | (long)'d' << 32 | (long)'e' << 24 | (long)'s' << 16, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'b' << 40, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'b' << 40 | (long)'e' << 32, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'m' << 40, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'1' << 32, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'2' << 32, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'3' << 32, 
-			(long)'s' << 56 | (long)'u' << 48 | (long)'p' << 40 | (long)'e' << 32, 
-			(long)'s' << 56 | (long)'z' << 48 | (long)'l' << 40 | (long)'i' << 32 | (long)'g' << 24, 
-			(long)'t' << 56 | (long)'a' << 48 | (long)'u' << 40, 
-			(long)'t' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'r' << 32 | (long)'e' << 24 | (long)'4' << 16, 
-			(long)'t' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'t' << 32 | (long)'a' << 24, 
-			(long)'t' << 56 | (long)'h' << 48 | (long)'e' << 40 | (long)'t' << 32 | (long)'a' << 24 | (long)'s' << 16 | (long)'y' << 8 | (long)'m' << 0, 
-			(long)'t' << 56 | (long)'h' << 48 | (long)'i' << 40 | (long)'n' << 32 | (long)'s' << 24 | (long)'p' << 16, 
-			(long)'t' << 56 | (long)'h' << 48 | (long)'o' << 40 | (long)'r' << 32 | (long)'n' << 24, 
-			(long)'t' << 56 | (long)'i' << 48 | (long)'l' << 40 | (long)'d' << 32 | (long)'e' << 24, 
-			(long)'t' << 56 | (long)'i' << 48 | (long)'m' << 40 | (long)'e' << 32 | (long)'s' << 24, 
-			(long)'t' << 56 | (long)'r' << 48 | (long)'a' << 40 | (long)'d' << 32 | (long)'e' << 24, 
-			(long)'u' << 56 | (long)'A' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'u' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'u' << 56 | (long)'a' << 48 | (long)'r' << 40 | (long)'r' << 32, 
-			(long)'u' << 56 | (long)'c' << 48 | (long)'i' << 40 | (long)'r' << 32 | (long)'c' << 24, 
-			(long)'u' << 56 | (long)'g' << 48 | (long)'r' << 40 | (long)'a' << 32 | (long)'v' << 24 | (long)'e' << 16, 
-			(long)'u' << 56 | (long)'m' << 48 | (long)'l' << 40, 
-			(long)'u' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'h' << 24, 
-			(long)'u' << 56 | (long)'p' << 48 | (long)'s' << 40 | (long)'i' << 32 | (long)'l' << 24 | (long)'o' << 16 | (long)'n' << 8, 
-			(long)'u' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'w' << 56 | (long)'e' << 48 | (long)'i' << 40 | (long)'e' << 32 | (long)'r' << 24 | (long)'p' << 16, 
-			(long)'x' << 56 | (long)'i' << 48, 
-			(long)'y' << 56 | (long)'a' << 48 | (long)'c' << 40 | (long)'u' << 32 | (long)'t' << 24 | (long)'e' << 16, 
-			(long)'y' << 56 | (long)'e' << 48 | (long)'n' << 40, 
-			(long)'y' << 56 | (long)'u' << 48 | (long)'m' << 40 | (long)'l' << 32, 
-			(long)'z' << 56 | (long)'e' << 48 | (long)'t' << 40 | (long)'a' << 32, 
-			(long)'z' << 56 | (long)'w' << 48 | (long)'j' << 40, 
-			(long)'z' << 56 | (long)'w' << 48 | (long)'n' << 40 | (long)'j' << 32
-		};
-
-        static readonly char[] entities_values = new char[] {
-			'\u00C6',
-			'\u00C1',
-			'\u00C2',
-			'\u00C0',
-			'\u0391',
-			'\u00C5',
-			'\u00C3',
-			'\u00C4',
-			'\u0392',
-			'\u00C7',
-			'\u03A7',
-			'\u2021',
-			'\u0394',
-			'\u00D0',
-			'\u00C9',
-			'\u00CA',
-			'\u00C8',
-			'\u0395',
-			'\u0397',
-			'\u00CB',
-			'\u0393',
-			'\u00CD',
-			'\u00CE',
-			'\u00CC',
-			'\u0399',
-			'\u00CF',
-			'\u039A',
-			'\u039B',
-			'\u039C',
-			'\u00D1',
-			'\u039D',
-			'\u0152',
-			'\u00D3',
-			'\u00D4',
-			'\u00D2',
-			'\u03A9',
-			'\u039F',
-			'\u00D8',
-			'\u00D5',
-			'\u00D6',
-			'\u03A6',
-			'\u03A0',
-			'\u2033',
-			'\u03A8',
-			'\u03A1',
-			'\u0160',
-			'\u03A3',
-			'\u00DE',
-			'\u03A4',
-			'\u0398',
-			'\u00DA',
-			'\u00DB',
-			'\u00D9',
-			'\u03A5',
-			'\u00DC',
-			'\u039E',
-			'\u00DD',
-			'\u0178',
-			'\u0396',
-			'\u00E1',
-			'\u00E2',
-			'\u00B4',
-			'\u00E6',
-			'\u00E0',
-			'\u2135',
-			'\u03B1',
-			'\u0026',
-			'\u2227',
-			'\u2220',
-			'\u0027',
-			'\u00E5',
-			'\u2248',
-			'\u00E3',
-			'\u00E4',
-			'\u201E',
-			'\u03B2',
-			'\u00A6',
-			'\u2022',
-			'\u2229',
-			'\u00E7',
-			'\u00B8',
-			'\u00A2',
-			'\u03C7',
-			'\u02C6',
-			'\u2663',
-			'\u2245',
-			'\u00A9',
-			'\u21B5',
-			'\u222A',
-			'\u00A4',
-			'\u21D3',
-			'\u2020',
-			'\u2193',
-			'\u00B0',
-			'\u03B4',
-			'\u2666',
-			'\u00F7',
-			'\u00E9',
-			'\u00EA',
-			'\u00E8',
-			'\u2205',
-			'\u2003',
-			'\u2002',
-			'\u03B5',
-			'\u2261',
-			'\u03B7',
-			'\u00F0',
-			'\u00EB',
-			'\u20AC',
-			'\u2203',
-			'\u0192',
-			'\u2200',
-			'\u00BD',
-			'\u00BC',
-			'\u00BE',
-			'\u2044',
-			'\u03B3',
-			'\u2265',
-			'\u003E',
-			'\u21D4',
-			'\u2194',
-			'\u2665',
-			'\u2026',
-			'\u00ED',
-			'\u00EE',
-			'\u00A1',
-			'\u00EC',
-			'\u2111',
-			'\u221E',
-			'\u222B',
-			'\u03B9',
-			'\u00BF',
-			'\u2208',
-			'\u00EF',
-			'\u03BA',
-			'\u21D0',
-			'\u03BB',
-			'\u2329',
-			'\u00AB',
-			'\u2190',
-			'\u2308',
-			'\u201C',
-			'\u2264',
-			'\u230A',
-			'\u2217',
-			'\u25CA',
-			'\u200E',
-			'\u2039',
-			'\u2018',
-			'\u003C',
-			'\u00AF',
-			'\u2014',
-			'\u00B5',
-			'\u00B7',
-			'\u2212',
-			'\u03BC',
-			'\u2207',
-			'\u00A0',
-			'\u2013',
-			'\u2260',
-			'\u220B',
-			'\u00AC',
-			'\u2209',
-			'\u2284',
-			'\u00F1',
-			'\u03BD',
-			'\u00F3',
-			'\u00F4',
-			'\u0153',
-			'\u00F2',
-			'\u203E',
-			'\u03C9',
-			'\u03BF',
-			'\u2295',
-			'\u2228',
-			'\u00AA',
-			'\u00BA',
-			'\u00F8',
-			'\u00F5',
-			'\u2297',
-			'\u00F6',
-			'\u00B6',
-			'\u2202',
-			'\u2030',
-			'\u22A5',
-			'\u03C6',
-			'\u03C0',
-			'\u03D6',
-			'\u00B1',
-			'\u00A3',
-			'\u2032',
-			'\u220F',
-			'\u221D',
-			'\u03C8',
-			'\u0022',
-			'\u21D2',
-			'\u221A',
-			'\u232A',
-			'\u00BB',
-			'\u2192',
-			'\u2309',
-			'\u201D',
-			'\u211C',
-			'\u00AE',
-			'\u230B',
-			'\u03C1',
-			'\u200F',
-			'\u203A',
-			'\u2019',
-			'\u201A',
-			'\u0161',
-			'\u22C5',
-			'\u00A7',
-			'\u00AD',
-			'\u03C3',
-			'\u03C2',
-			'\u223C',
-			'\u2660',
-			'\u2282',
-			'\u2286',
-			'\u2211',
-			'\u2283',
-			'\u00B9',
-			'\u00B2',
-			'\u00B3',
-			'\u2287',
-			'\u00DF',
-			'\u03C4',
-			'\u2234',
-			'\u03B8',
-			'\u03D1',
-			'\u2009',
-			'\u00FE',
-			'\u02DC',
-			'\u00D7',
-			'\u2122',
-			'\u21D1',
-			'\u00FA',
-			'\u2191',
-			'\u00FB',
-			'\u00F9',
-			'\u00A8',
-			'\u03D2',
-			'\u03C5',
-			'\u00FC',
-			'\u2118',
-			'\u03BE',
-			'\u00FD',
-			'\u00A5',
-			'\u00FF',
-			'\u03B6',
-			'\u200D',
-			'\u200C'
-		};
-
-        #region Methods
-
-        static void WriteCharBytes(IList buf, char ch, Encoding e)
-        {
-            if (ch > 255)
-            {
-                foreach (byte b in e.GetBytes(new char[] { ch }))
-                    buf.Add(b);
-            }
-            else
-                buf.Add((byte)ch);
-        }
-
-        public static string UrlDecode(string s, Encoding e)
-        {
-            if (null == s)
-                return null;
-
-            if (s.IndexOf('%') == -1 && s.IndexOf('+') == -1)
-                return s;
-
-            if (e == null)
-                e = Encoding.UTF8;
-
-            long len = s.Length;
-            var bytes = new List<byte>();
-            int xchar;
-            char ch;
-
-            for (int i = 0; i < len; i++)
-            {
-                ch = s[i];
-                if (ch == '%' && i + 2 < len && s[i + 1] != '%')
-                {
-                    if (s[i + 1] == 'u' && i + 5 < len)
-                    {
-                        // unicode hex sequence
-                        xchar = GetChar(s, i + 2, 4);
-                        if (xchar != -1)
-                        {
-                            WriteCharBytes(bytes, (char)xchar, e);
-                            i += 5;
-                        }
-                        else
-                            WriteCharBytes(bytes, '%', e);
-                    }
-                    else if ((xchar = GetChar(s, i + 1, 2)) != -1)
-                    {
-                        WriteCharBytes(bytes, (char)xchar, e);
-                        i += 2;
-                    }
-                    else
-                    {
-                        WriteCharBytes(bytes, '%', e);
-                    }
-                    continue;
-                }
-
-                if (ch == '+')
-                    WriteCharBytes(bytes, ' ', e);
-                else
-                    WriteCharBytes(bytes, ch, e);
-            }
-
-            byte[] buf = bytes.ToArray();
-            bytes = null;
-            return e.GetString(buf);
-
-        }
-
-        static int GetInt(byte b)
-        {
-            char c = (char)b;
-            if (c >= '0' && c <= '9')
-                return c - '0';
-
-            if (c >= 'a' && c <= 'f')
-                return c - 'a' + 10;
-
-            if (c >= 'A' && c <= 'F')
-                return c - 'A' + 10;
-
-            return -1;
-        }
-
-        static int GetChar(string str, int offset, int length)
-        {
-            int val = 0;
-            int end = length + offset;
-            for (int i = offset; i < end; i++)
-            {
-                char c = str[i];
-                if (c > 127)
-                    return -1;
-
-                int current = GetInt((byte)c);
-                if (current == -1)
-                    return -1;
-                val = (val << 4) + current;
-            }
-
-            return val;
-        }
-
-        static bool TryConvertKeyToEntity(string key, out char value)
-        {
-            var token = CalculateKeyValue(key);
-            if (token == 0)
-            {
-                value = '\0';
-                return false;
-            }
-
-            var idx = Array.BinarySearch(entities, token);
-            if (idx < 0)
-            {
-                value = '\0';
-                return false;
-            }
-
-            value = entities_values[idx];
-            return true;
-        }
-
-        static long CalculateKeyValue(string s)
-        {
-            if (s.Length > 8)
-                return 0;
-
-            long key = 0;
-            for (int i = 0; i < s.Length; ++i)
-            {
-                long ch = s[i];
-                if (ch > 'z' || ch < '0')
-                    return 0;
-
-                key |= ch << ((7 - i) * 8);
-            }
-
-            return key;
-        }
-
-        /// <summary>
-        /// Decodes an HTML-encoded string and returns the decoded string.
-        /// </summary>
-        /// <param name="s">The HTML string to decode. </param>
-        /// <returns>The decoded text.</returns>
-        public static string HtmlDecode(string s)
-        {
-            if (s == null)
-                throw new ArgumentNullException("s");
-
-            if (s.IndexOf('&') == -1)
-                return s;
-
-            StringBuilder entity = new StringBuilder();
-            StringBuilder output = new StringBuilder();
-            int len = s.Length;
-            // 0 -> nothing,
-            // 1 -> right after '&'
-            // 2 -> between '&' and ';' but no '#'
-            // 3 -> '#' found after '&' and getting numbers
-            int state = 0;
-            int number = 0;
-            int digit_start = 0;
-            bool hex_number = false;
-
-            for (int i = 0; i < len; i++)
-            {
-                char c = s[i];
-                if (state == 0)
-                {
-                    if (c == '&')
-                    {
-                        entity.Append(c);
-                        state = 1;
-                    }
-                    else
-                    {
-                        output.Append(c);
-                    }
-                    continue;
-                }
-
-                if (c == '&')
-                {
-                    state = 1;
-                    if (digit_start > 0)
-                    {
-                        entity.Append(s, digit_start, i - digit_start);
-                        digit_start = 0;
-                    }
-
-                    output.Append(entity.ToString());
-                    entity.Length = 0;
-                    entity.Append('&');
-                    continue;
-                }
-
-                switch (state)
-                {
-                    case 1:
-                        if (c == ';')
-                        {
-                            state = 0;
-                            output.Append(entity.ToString());
-                            output.Append(c);
-                            entity.Length = 0;
-                            break;
-                        }
-
-                        number = 0;
-                        hex_number = false;
-                        if (c != '#')
-                        {
-                            state = 2;
-                        }
-                        else
-                        {
-                            state = 3;
-                        }
-                        entity.Append(c);
-
-                        break;
-                    case 2:
-                        entity.Append(c);
-                        if (c == ';')
-                        {
-                            string key = entity.ToString();
-                            state = 0;
-                            entity.Length = 0;
-
-                            if (key.Length > 1)
-                            {
-                                var skey = key.Substring(1, key.Length - 2);
-                                if (TryConvertKeyToEntity(skey, out c))
-                                {
-                                    output.Append(c);
-                                    break;
-                                }
-                            }
-
-                            output.Append(key);
-                        }
-
-                        break;
-                    case 3:
-                        if (c == ';')
-                        {
-                            if (number < 0x10000)
-                            {
-                                output.Append((char)number);
-                            }
-                            else
-                            {
-                                output.Append((char)(0xd800 + ((number - 0x10000) >> 10)));
-                                output.Append((char)(0xdc00 + ((number - 0x10000) & 0x3ff)));
-                            }
-                            state = 0;
-                            entity.Length = 0;
-                            digit_start = 0;
-                            break;
-                        }
-
-                        if (c == 'x' || c == 'X' && !hex_number)
-                        {
-                            digit_start = i;
-                            hex_number = true;
-                            break;
-                        }
-
-                        if (Char.IsDigit(c))
-                        {
-                            if (digit_start == 0)
-                                digit_start = i;
-
-                            number = number * (hex_number ? 16 : 10) + ((int)c - '0');
-                            break;
-                        }
-
-                        if (hex_number)
-                        {
-                            if (c >= 'a' && c <= 'f')
-                            {
-                                number = number * 16 + 10 + ((int)c - 'a');
-                                break;
-                            }
-                            if (c >= 'A' && c <= 'F')
-                            {
-                                number = number * 16 + 10 + ((int)c - 'A');
-                                break;
-                            }
-                        }
-
-                        state = 2;
-                        if (digit_start > 0)
-                        {
-                            entity.Append(s, digit_start, i - digit_start);
-                            digit_start = 0;
-                        }
-
-                        entity.Append(c);
-                        break;
-                }
-            }
-
-            if (entity.Length > 0)
-            {
-                output.Append(entity);
-            }
-            else if (digit_start > 0)
-            {
-                output.Append(s, digit_start, s.Length - digit_start);
-            }
-            return output.ToString();
-        }
-
-        public static QueryParamCollection ParseQueryString(string query)
-        {
-            return ParseQueryString(query, Encoding.UTF8);
-        }
-
-        public static QueryParamCollection ParseQueryString(string query, Encoding encoding)
-        {
-            if (query == null)
-                throw new ArgumentNullException("query");
-            if (encoding == null)
-                throw new ArgumentNullException("encoding");
-            if (query.Length == 0 || (query.Length == 1 && query[0] == '?'))
-                return new QueryParamCollection();
-            if (query[0] == '?')
-                query = query.Substring(1);
-
-            QueryParamCollection result = new QueryParamCollection();
-            ParseQueryString(query, encoding, result);
-            return result;
-        }
-
-        internal static void ParseQueryString(string query, Encoding encoding, QueryParamCollection result)
-        {
-            if (query.Length == 0)
-                return;
-
-            string decoded = HtmlDecode(query);
-            int decodedLength = decoded.Length;
-            int namePos = 0;
-            bool first = true;
-            while (namePos <= decodedLength)
-            {
-                int valuePos = -1, valueEnd = -1;
-                for (int q = namePos; q < decodedLength; q++)
-                {
-                    if (valuePos == -1 && decoded[q] == '=')
-                    {
-                        valuePos = q + 1;
-                    }
-                    else if (decoded[q] == '&')
-                    {
-                        valueEnd = q;
-                        break;
-                    }
-                }
-
-                if (first)
-                {
-                    first = false;
-                    if (decoded[namePos] == '?')
-                        namePos++;
-                }
-
-                string name, value;
-                if (valuePos == -1)
-                {
-                    name = null;
-                    valuePos = namePos;
-                }
-                else
-                {
-                    name = UrlDecode(decoded.Substring(namePos, valuePos - namePos - 1), encoding);
-                }
-                if (valueEnd < 0)
-                {
-                    namePos = -1;
-                    valueEnd = decoded.Length;
-                }
-                else
-                {
-                    namePos = valueEnd + 1;
-                }
-                value = UrlDecode(decoded.Substring(valuePos, valueEnd - valuePos), encoding);
-
-                result.Add(name, value);
-                if (namePos == -1)
-                    break;
-            }
-        }
-        #endregion // Methods
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
index 2546519f4..c56f62bec 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
 using System.Text;
+using Emby.Server.Implementations.HttpServer.SocketSharp;
 using Funq;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
deleted file mode 100644
index 54ee5fbb2..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Net;
-using System.IO;
-using MediaBrowser.Model.Services;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    public class SwaggerService : IHasResultFactory, IService
-    {
-        private readonly IServerApplicationPaths _appPaths;
-
-        public SwaggerService(IServerApplicationPaths appPaths)
-        {
-            _appPaths = appPaths;
-        }
-
-        /// <summary>
-        /// Gets the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>System.Object.</returns>
-        public object Get(GetSwaggerResource request)
-        {
-            var swaggerDirectory = Path.Combine(_appPaths.ApplicationResourcesPath, "swagger-ui");
-
-            var requestedFile = Path.Combine(swaggerDirectory, request.ResourceName.Replace('/', Path.DirectorySeparatorChar));
-
-            return ResultFactory.GetStaticFileResult(Request, requestedFile).Result;
-        }
-
-        /// <summary>
-        /// Gets or sets the result factory.
-        /// </summary>
-        /// <value>The result factory.</value>
-        public IHttpResultFactory ResultFactory { get; set; }
-
-        /// <summary>
-        /// Gets or sets the request context.
-        /// </summary>
-        /// <value>The request context.</value>
-        public IRequest Request { get; set; }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/ar.json b/MediaBrowser.Server.Implementations/Localization/Core/ar.json
deleted file mode 100644
index 28977c4f9..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/ar.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "\u062e\u0631\u0648\u062c",
-    "LabelVisitCommunity": "\u0632\u064a\u0627\u0631\u0629 \u0627\u0644\u0645\u062c\u062a\u0645\u0639",
-    "LabelGithub": "\u062c\u064a\u062a \u0647\u0628",
-    "LabelApiDocumentation": "\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0645\u062f\u062e\u0644 \u0628\u0631\u0645\u062c\u0629 \u0627\u0644\u062a\u0637\u0628\u064a\u0642",
-    "LabelDeveloperResources": "\u0645\u0643\u062a\u0628\u0629 \u0627\u0644\u0645\u0628\u0631\u0645\u062c",
-    "LabelBrowseLibrary": "\u062a\u0635\u0641\u062d \u0627\u0644\u0645\u0643\u062a\u0628\u0629",
-    "LabelConfigureServer": "\u0625\u0639\u062f\u0627\u062f \u0625\u0645\u0628\u064a",
-    "LabelRestartServer": "\u0627\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u062e\u0627\u062f\u0645",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/bg-BG.json b/MediaBrowser.Server.Implementations/Localization/Core/bg-BG.json
deleted file mode 100644
index 22b99408d..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/bg-BG.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "\u0421\u043c\u0435\u0441\u0435\u043d\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-    "FolderTypeMovies": "\u0424\u0438\u043b\u043c\u0438",
-    "FolderTypeMusic": "\u041c\u0443\u0437\u0438\u043a\u0430",
-    "FolderTypeAdultVideos": "\u041a\u043b\u0438\u043f\u043e\u0432\u0435 \u0437\u0430 \u0432\u044a\u0437\u0440\u0430\u0441\u0442\u043d\u0438",
-    "FolderTypePhotos": "\u0421\u043d\u0438\u043c\u043a\u0438",
-    "FolderTypeMusicVideos": "\u041c\u0443\u0437\u0438\u043a\u0430\u043b\u043d\u0438 \u043a\u043b\u0438\u043f\u043e\u0432\u0435",
-    "FolderTypeHomeVideos": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438 \u043a\u043b\u0438\u043f\u043e\u0432\u0435",
-    "FolderTypeGames": "\u0418\u0433\u0440\u0438",
-    "FolderTypeBooks": "\u041a\u043d\u0438\u0433\u0438",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "\u041d\u0430\u0441\u043b\u0435\u0434\u0438",
-    "HeaderCastCrew": "\u0415\u043a\u0438\u043f",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "\u0418\u0437\u0445\u043e\u0434",
-    "LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0442\u0438 \u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e\u0442\u043e",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "API \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
-    "LabelDeveloperResources": "\u0420\u0435\u0441\u0443\u0440\u0441\u0438 \u0437\u0430 \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u0446\u0438",
-    "LabelBrowseLibrary": "\u0420\u0430\u0437\u0433\u043b\u0435\u0434\u0430\u0439 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u0442\u0430",
-    "LabelConfigureServer": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u0439 Emby",
-    "LabelRestartServer": "\u0420\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0441\u044a\u0440\u0432\u044a\u0440\u0430",
-    "CategorySync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437.",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "\u0412\u0435\u0440\u0441\u0438\u044f {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby \u0441\u044a\u0440\u0432\u044a\u0440\u044a\u0442 \u0431\u0435 \u043e\u0431\u043d\u043e\u0432\u0435\u043d.",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "\u0410\u0443\u0434\u0438\u043e",
-    "HeaderVideo": "\u0412\u0438\u0434\u0435\u043e",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "\u0421\u044a\u0441\u0442\u043e\u044f\u043d\u0438\u0435:",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/ca.json b/MediaBrowser.Server.Implementations/Localization/Core/ca.json
deleted file mode 100644
index 7ca8e1553..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/ca.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Si et plau espera mentre la teva base de dades del Servidor Emby \u00e9s actualitzada. {0}% completat.",
-    "AppDeviceValues": "App: {0}, Dispositiu: {1}",
-    "UserDownloadingItemWithValues": "{0} est\u00e0 descarregant {1}",
-    "FolderTypeMixed": "Contingut barrejat",
-    "FolderTypeMovies": "Pel\u00b7l\u00edcules",
-    "FolderTypeMusic": "M\u00fasica",
-    "FolderTypeAdultVideos": "V\u00eddeos per adults",
-    "FolderTypePhotos": "Fotos",
-    "FolderTypeMusicVideos": "V\u00eddeos musicals",
-    "FolderTypeHomeVideos": "V\u00eddeos dom\u00e8stics",
-    "FolderTypeGames": "Jocs",
-    "FolderTypeBooks": "Llibres",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Heretat",
-    "HeaderCastCrew": "Repartiment i Equip",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Cap\u00edtol {0}",
-    "NameSeasonNumber": "Temporada {0}",
-    "LabelExit": "Sortir",
-    "LabelVisitCommunity": "Visita la Comunitat",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentaci\u00f3 de l'API",
-    "LabelDeveloperResources": "Recursos per a Desenvolupadors",
-    "LabelBrowseLibrary": "Examina la Biblioteca",
-    "LabelConfigureServer": "Configura Emby",
-    "LabelRestartServer": "Reiniciar Servidor",
-    "CategorySync": "Sync",
-    "CategoryUser": "Usuari",
-    "CategorySystem": "Sistema",
-    "CategoryApplication": "Aplicaci\u00f3",
-    "CategoryPlugin": "Complement",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Actualitzaci\u00f3 d'aplicaci\u00f3 disponible",
-    "NotificationOptionApplicationUpdateInstalled": "Actualitzaci\u00f3 d'aplicaci\u00f3 instal\u00b7lada",
-    "NotificationOptionPluginUpdateInstalled": "Actualitzaci\u00f3 de complement instal\u00b7lada",
-    "NotificationOptionPluginInstalled": "Complement instal\u00b7lat",
-    "NotificationOptionPluginUninstalled": "Complement desinstal\u00b7lat",
-    "NotificationOptionVideoPlayback": "Reproducci\u00f3 de v\u00eddeo iniciada",
-    "NotificationOptionAudioPlayback": "Reproducci\u00f3 d'\u00e0udio iniciada",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Reproducci\u00f3 de v\u00eddeo aturada",
-    "NotificationOptionAudioPlaybackStopped": "Reproducci\u00f3 d'\u00e0udio aturada",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Tasca programada fallida",
-    "NotificationOptionInstallationFailed": "Instal\u00b7laci\u00f3 fallida",
-    "NotificationOptionNewLibraryContent": "Nou contingut afegit",
-    "NotificationOptionNewLibraryContentMultiple": "Nous continguts afegits",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "Usuari blocat",
-    "NotificationOptionServerRestartRequired": "Cal reiniciar el servidor",
-    "ViewTypePlaylists": "Llistes de reproducci\u00f3",
-    "ViewTypeMovies": "Pel\u00b7l\u00edcules",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Jocs",
-    "ViewTypeMusic": "M\u00fasica",
-    "ViewTypeMusicGenres": "G\u00e8neres",
-    "ViewTypeMusicArtists": "Artistes",
-    "ViewTypeBoxSets": "Col\u00b7leccions",
-    "ViewTypeChannels": "Canals",
-    "ViewTypeLiveTV": "TV en Directe",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Darrers Jocs",
-    "ViewTypeRecentlyPlayedGames": "Reprodu\u00eft Recentment",
-    "ViewTypeGameFavorites": "Preferits",
-    "ViewTypeGameSystems": "Sistemes de Jocs",
-    "ViewTypeGameGenres": "G\u00e8neres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "A Continuaci\u00f3",
-    "ViewTypeTvLatest": "Darrers",
-    "ViewTypeTvShowSeries": "S\u00e8ries:",
-    "ViewTypeTvGenres": "G\u00e8neres",
-    "ViewTypeTvFavoriteSeries": "S\u00e8ries Preferides",
-    "ViewTypeTvFavoriteEpisodes": "Episodis Preferits",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Darrers",
-    "ViewTypeMovieMovies": "Pel\u00b7l\u00edcules",
-    "ViewTypeMovieCollections": "Col\u00b7leccions",
-    "ViewTypeMovieFavorites": "Preferides",
-    "ViewTypeMovieGenres": "G\u00e8neres",
-    "ViewTypeMusicLatest": "Novetats",
-    "ViewTypeMusicPlaylists": "Llistes de reproducci\u00f3",
-    "ViewTypeMusicAlbums": "\u00c0lbums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Prefer\u00e8ncies de Visualitzaci\u00f3",
-    "ViewTypeMusicSongs": "Can\u00e7ons",
-    "ViewTypeMusicFavorites": "Preferides",
-    "ViewTypeMusicFavoriteAlbums": "\u00c0lbums Preferits",
-    "ViewTypeMusicFavoriteArtists": "Artistes Preferits",
-    "ViewTypeMusicFavoriteSongs": "Can\u00e7ons Preferides",
-    "ViewTypeFolders": "Directoris",
-    "ViewTypeLiveTvRecordingGroups": "Enregistraments",
-    "ViewTypeLiveTvChannels": "Canals",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Versi\u00f3 {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} afegit a la biblioteca",
-    "ItemRemovedWithName": "{0} eliminat de la biblioteca",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Prove\u00efdor: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "L'usuari {0} ha estat eliminat",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} autenticat correctament",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "L'usuari {0} ha estat blocat",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} ha comen\u00e7at a reproduir {1}",
-    "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "Usuari",
-    "HeaderName": "Nom",
-    "HeaderDate": "Data",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Data afegida",
-    "HeaderReleaseDate": "Data de publicaci\u00f3",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Temporada",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "S\u00e8ries:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Any:",
-    "HeaderYears": "Anys:",
-    "HeaderParentalRating": "Valoraci\u00f3 Parental",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Tr\u00e0ilers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Sistemes de Jocs",
-    "HeaderPlayers": "Jugadors:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "\u00c0udio",
-    "HeaderVideo": "V\u00eddeo",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subt\u00edtols",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Estat",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "M\u00fasic",
-    "HeaderLocked": "Blocat",
-    "HeaderStudios": "Estudis",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Compositors",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Artista convidat",
-    "HeaderProducer": "Productors",
-    "HeaderWriter": "Escriptors",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Qualificacions de la comunitat",
-    "StartupEmbyServerIsLoading": "El servidor d'Emby s'est&agrave; carregant. Si et plau, tornau-ho a provar de nou en breu."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/core.json b/MediaBrowser.Server.Implementations/Localization/Core/core.json
deleted file mode 100644
index 976faa8cb..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/core.json
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Exit",
-    "LabelVisitCommunity": "Visit Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Browse Library",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "Restart Server",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly.",
-    "DbUpgradeMessage":  "Please wait while your Emby Server database is upgraded. {0}% complete."
-}
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/cs.json b/MediaBrowser.Server.Implementations/Localization/Core/cs.json
deleted file mode 100644
index e3055f5ba..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/cs.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Po\u010dkejte pros\u00edm, datab\u00e1ze Emby Serveru je aktualizov\u00e1na na novou verzi. Hotovo {0}%.",
-    "AppDeviceValues": "Aplikace: {0}, Za\u0159\u00edzen\u00ed: {1}",
-    "UserDownloadingItemWithValues": "{0} pr\u00e1v\u011b stahuje {1}",
-    "FolderTypeMixed": "Sm\u00ed\u0161en\u00fd obsah",
-    "FolderTypeMovies": "Filmy",
-    "FolderTypeMusic": "Hudba",
-    "FolderTypeAdultVideos": "Filmy pro dosp\u011bl\u00e9",
-    "FolderTypePhotos": "Fotky",
-    "FolderTypeMusicVideos": "Hudebn\u00ed klipy",
-    "FolderTypeHomeVideos": "Dom\u00e1c\u00ed video",
-    "FolderTypeGames": "Hry",
-    "FolderTypeBooks": "Knihy",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Zd\u011bdit",
-    "HeaderCastCrew": "Herci a obsazen\u00ed",
-    "HeaderPeople": "Lid\u00e9",
-    "ValueSpecialEpisodeName": "Speci\u00e1l - {0}",
-    "LabelChapterName": "Kapitola {0}",
-    "NameSeasonNumber": "Sez\u00f3na {0}",
-    "LabelExit": "Zav\u0159\u00edt",
-    "LabelVisitCommunity": "Nav\u0161t\u00edvit komunitu",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Dokumentace API",
-    "LabelDeveloperResources": "Zdroje v\u00fdvoj\u00e1\u0159\u016f",
-    "LabelBrowseLibrary": "Proch\u00e1zet knihovnu",
-    "LabelConfigureServer": "Konfigurovat Emby",
-    "LabelRestartServer": "Restartovat server",
-    "CategorySync": "Synchronizace",
-    "CategoryUser": "U\u017eivatel:",
-    "CategorySystem": "Syst\u00e9m",
-    "CategoryApplication": "Aplikace",
-    "CategoryPlugin": "Z\u00e1suvn\u00fd modul",
-    "NotificationOptionPluginError": "Chyba z\u00e1suvn\u00e9ho modulu",
-    "NotificationOptionApplicationUpdateAvailable": "Dostupnost aktualizace aplikace",
-    "NotificationOptionApplicationUpdateInstalled": "Instalace aktualizace aplikace",
-    "NotificationOptionPluginUpdateInstalled": "Aktualizace z\u00e1suvn\u00e9ho modulu instalov\u00e1na",
-    "NotificationOptionPluginInstalled": "Z\u00e1suvn\u00fd modul instalov\u00e1n",
-    "NotificationOptionPluginUninstalled": "Z\u00e1suvn\u00fd modul odstran\u011bn",
-    "NotificationOptionVideoPlayback": "P\u0159ehr\u00e1v\u00e1n\u00ed videa zah\u00e1jeno",
-    "NotificationOptionAudioPlayback": "P\u0159ehr\u00e1v\u00e1n\u00ed audia zah\u00e1jeno",
-    "NotificationOptionGamePlayback": "Spu\u0161t\u011bn\u00ed hry zah\u00e1jeno",
-    "NotificationOptionVideoPlaybackStopped": "P\u0159ehr\u00e1v\u00e1n\u00ed videa ukon\u010deno",
-    "NotificationOptionAudioPlaybackStopped": "P\u0159ehr\u00e1v\u00e1n\u00ed audia ukon\u010deno",
-    "NotificationOptionGamePlaybackStopped": "Hra ukon\u010dena",
-    "NotificationOptionTaskFailed": "Chyba napl\u00e1novan\u00e9 \u00falohy",
-    "NotificationOptionInstallationFailed": "Chyba instalace",
-    "NotificationOptionNewLibraryContent": "P\u0159id\u00e1n nov\u00fd obsah",
-    "NotificationOptionNewLibraryContentMultiple": "P\u0159id\u00e1n nov\u00fd obsah (v\u00edcen\u00e1sobn\u00fd)",
-    "NotificationOptionCameraImageUploaded": "Kamerov\u00fd z\u00e1znam nahr\u00e1n",
-    "NotificationOptionUserLockedOut": "U\u017eivatel uzam\u010den",
-    "NotificationOptionServerRestartRequired": "Je vy\u017eadov\u00e1n restart serveru",
-    "ViewTypePlaylists": "Playlisty",
-    "ViewTypeMovies": "Filmy",
-    "ViewTypeTvShows": "Televize",
-    "ViewTypeGames": "Hry",
-    "ViewTypeMusic": "Hudba",
-    "ViewTypeMusicGenres": "\u017d\u00e1nry",
-    "ViewTypeMusicArtists": "\u00dam\u011blci",
-    "ViewTypeBoxSets": "Kolekce",
-    "ViewTypeChannels": "Kan\u00e1ly",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Vys\u00edl\u00e1no nyn\u00ed",
-    "ViewTypeLatestGames": "Nejnov\u011bj\u0161\u00ed hry",
-    "ViewTypeRecentlyPlayedGames": "Ned\u00e1vno p\u0159ehr\u00e1no",
-    "ViewTypeGameFavorites": "Obl\u00edben\u00e9",
-    "ViewTypeGameSystems": "Syst\u00e9my hry",
-    "ViewTypeGameGenres": "\u017d\u00e1nry",
-    "ViewTypeTvResume": "Obnovit",
-    "ViewTypeTvNextUp": "O\u010dek\u00e1van\u00e9",
-    "ViewTypeTvLatest": "Nejnov\u011bj\u0161\u00ed",
-    "ViewTypeTvShowSeries": "Seri\u00e1l",
-    "ViewTypeTvGenres": "\u017d\u00e1nry",
-    "ViewTypeTvFavoriteSeries": "Obl\u00edben\u00e9 seri\u00e1ly",
-    "ViewTypeTvFavoriteEpisodes": "Obl\u00edben\u00e9 epizody",
-    "ViewTypeMovieResume": "Obnovit",
-    "ViewTypeMovieLatest": "Nejnov\u011bj\u0161\u00ed",
-    "ViewTypeMovieMovies": "Filmy",
-    "ViewTypeMovieCollections": "Kolekce",
-    "ViewTypeMovieFavorites": "Obl\u00edben\u00e9",
-    "ViewTypeMovieGenres": "\u017d\u00e1nry",
-    "ViewTypeMusicLatest": "Nejnov\u011bj\u0161\u00ed",
-    "ViewTypeMusicPlaylists": "Playlisty",
-    "ViewTypeMusicAlbums": "Alba",
-    "ViewTypeMusicAlbumArtists": "Alba \u00fam\u011blc\u016f",
-    "HeaderOtherDisplaySettings": "Nastaven\u00ed zobrazen\u00ed",
-    "ViewTypeMusicSongs": "Songy",
-    "ViewTypeMusicFavorites": "Obl\u00edben\u00e9",
-    "ViewTypeMusicFavoriteAlbums": "Obl\u00edben\u00e1 alba",
-    "ViewTypeMusicFavoriteArtists": "Obl\u00edben\u00ed \u00fam\u011blci",
-    "ViewTypeMusicFavoriteSongs": "Obl\u00edben\u00e9 songy",
-    "ViewTypeFolders": "Slo\u017eky",
-    "ViewTypeLiveTvRecordingGroups": "Nahr\u00e1vky",
-    "ViewTypeLiveTvChannels": "Kan\u00e1ly",
-    "ScheduledTaskFailedWithName": "{0} selhalo",
-    "LabelRunningTimeValue": "D\u00e9lka m\u00e9dia: {0}",
-    "ScheduledTaskStartedWithName": "{0} zah\u00e1jeno",
-    "VersionNumber": "Verze {0}",
-    "PluginInstalledWithName": "{0} byl nainstalov\u00e1n",
-    "PluginUpdatedWithName": "{0} byl aktualizov\u00e1n",
-    "PluginUninstalledWithName": "{0} byl odinstalov\u00e1n",
-    "ItemAddedWithName": "{0} byl p\u0159id\u00e1n do knihovny",
-    "ItemRemovedWithName": "{0} byl odstran\u011bn z knihovny",
-    "LabelIpAddressValue": "IP adresa: {0}",
-    "DeviceOnlineWithName": "{0} je p\u0159ipojen",
-    "UserOnlineFromDevice": "{0} se p\u0159ipojil z {1}",
-    "ProviderValue": "Poskytl: {0}",
-    "SubtitlesDownloadedForItem": "Sta\u017eeny titulky pro {0}",
-    "UserConfigurationUpdatedWithName": "Konfigurace u\u017eivatele byla aktualizov\u00e1na pro {0}",
-    "UserCreatedWithName": "U\u017eivatel {0} byl vytvo\u0159en",
-    "UserPasswordChangedWithName": "Pro u\u017eivatele {0} byla provedena zm\u011bna hesla",
-    "UserDeletedWithName": "U\u017eivatel {0} byl smaz\u00e1n",
-    "MessageServerConfigurationUpdated": "Konfigurace serveru byla aktualizov\u00e1na",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Konfigurace sekce {0} na serveru byla aktualizov\u00e1na",
-    "MessageApplicationUpdated": "Emby Server byl aktualizov\u00e1n",
-    "FailedLoginAttemptWithUserName": "Ne\u00fasp\u011b\u0161n\u00fd pokus o p\u0159ihl\u00e1\u0161en\u00ed z {0}",
-    "AuthenticationSucceededWithUserName": "{0} \u00fasp\u011b\u0161n\u011b ov\u011b\u0159en",
-    "DeviceOfflineWithName": "{0} se odpojil",
-    "UserLockedOutWithName": "U\u017eivatel {0} byl odem\u010den",
-    "UserOfflineFromDevice": "{0} se odpojil od {1}",
-    "UserStartedPlayingItemWithValues": "{0} spustil p\u0159ehr\u00e1v\u00e1n\u00ed {1}",
-    "UserStoppedPlayingItemWithValues": "{0} zastavil p\u0159ehr\u00e1v\u00e1n\u00ed {1}",
-    "SubtitleDownloadFailureForItem": "Stahov\u00e1n\u00ed titulk\u016f selhalo pro {0}",
-    "HeaderUnidentified": "Neidentifikov\u00e1n",
-    "HeaderImagePrimary": "Prim\u00e1rn\u00ed",
-    "HeaderImageBackdrop": "Pozad\u00ed",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Avatar u\u017eivatele",
-    "HeaderOverview": "P\u0159ehled",
-    "HeaderShortOverview": "Stru\u010dn\u00fd p\u0159ehled",
-    "HeaderType": "Typ",
-    "HeaderSeverity": "Z\u00e1va\u017enost",
-    "HeaderUser": "U\u017eivatel",
-    "HeaderName": "N\u00e1zev",
-    "HeaderDate": "Datum",
-    "HeaderPremiereDate": "Premi\u00e9ra",
-    "HeaderDateAdded": "P\u0159id\u00e1no",
-    "HeaderReleaseDate": "Datum vyd\u00e1n\u00ed",
-    "HeaderRuntime": "D\u00e9lka",
-    "HeaderPlayCount": "P\u0159ehr\u00e1no (po\u010det)",
-    "HeaderSeason": "Sez\u00f3na",
-    "HeaderSeasonNumber": "\u010c\u00edslo sez\u00f3ny",
-    "HeaderSeries": "Seri\u00e1l:",
-    "HeaderNetwork": "S\u00ed\u0165",
-    "HeaderYear": "Rok:",
-    "HeaderYears": "V letech:",
-    "HeaderParentalRating": "Rodi\u010dovsk\u00e9 hodnocen\u00ed",
-    "HeaderCommunityRating": "Hodnocen\u00ed komunity",
-    "HeaderTrailers": "Trailery",
-    "HeaderSpecials": "Speci\u00e1ly",
-    "HeaderGameSystems": "Syst\u00e9m hry",
-    "HeaderPlayers": "Hr\u00e1\u010di:",
-    "HeaderAlbumArtists": "\u00dam\u011blci alba",
-    "HeaderAlbums": "Alba",
-    "HeaderDisc": "Disk",
-    "HeaderTrack": "Stopa",
-    "HeaderAudio": "Zvuk",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Vlo\u017een\u00fd obr\u00e1zek",
-    "HeaderResolution": "Rozli\u0161en\u00ed",
-    "HeaderSubtitles": "Titulky",
-    "HeaderGenres": "\u017d\u00e1nry",
-    "HeaderCountries": "Zem\u011b",
-    "HeaderStatus": "Stav",
-    "HeaderTracks": "Stopy",
-    "HeaderMusicArtist": "Hudebn\u00ed \u00fam\u011blec",
-    "HeaderLocked": "Uzam\u010deno",
-    "HeaderStudios": "Studia",
-    "HeaderActor": "Herci",
-    "HeaderComposer": "Skladatel\u00e9",
-    "HeaderDirector": "Re\u017eis\u00e9\u0159i",
-    "HeaderGuestStar": "Hostuj\u00edc\u00ed hv\u011bzda",
-    "HeaderProducer": "Producenti",
-    "HeaderWriter": "Spisovatel\u00e9",
-    "HeaderParentalRatings": "Rodi\u010dovsk\u00e1 hodnocen\u00ed",
-    "HeaderCommunityRatings": "Hodnocen\u00ed komunity",
-    "StartupEmbyServerIsLoading": "Emby Server je na\u010d\u00edt\u00e1n. Zkuste to pros\u00edm znovu v brzk\u00e9 dob\u011b."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/da.json b/MediaBrowser.Server.Implementations/Localization/Core/da.json
deleted file mode 100644
index d2a628a80..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/da.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Enhed: {1}",
-    "UserDownloadingItemWithValues": "{0} henter {1}",
-    "FolderTypeMixed": "Blandet indhold",
-    "FolderTypeMovies": "FIlm",
-    "FolderTypeMusic": "Musik",
-    "FolderTypeAdultVideos": "Voksenfilm",
-    "FolderTypePhotos": "Fotos",
-    "FolderTypeMusicVideos": "Musikvideoer",
-    "FolderTypeHomeVideos": "Hjemmevideoer",
-    "FolderTypeGames": "Spil",
-    "FolderTypeBooks": "B\u00f8ger",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Nedarv",
-    "HeaderCastCrew": "Medvirkende",
-    "HeaderPeople": "Mennesker",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Kapitel {0}",
-    "NameSeasonNumber": "S\u00e6son {0}",
-    "LabelExit": "Afslut",
-    "LabelVisitCommunity": "Bes\u00f8g F\u00e6lleskab",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api dokumentation",
-    "LabelDeveloperResources": "Udviklerressourcer",
-    "LabelBrowseLibrary": "Gennemse bibliotek",
-    "LabelConfigureServer": "Konfigurer Emby",
-    "LabelRestartServer": "Genstart Server",
-    "CategorySync": "Sync",
-    "CategoryUser": "Bruger",
-    "CategorySystem": "System",
-    "CategoryApplication": "Program",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin fejl",
-    "NotificationOptionApplicationUpdateAvailable": "Programopdatering tilg\u00e6ngelig",
-    "NotificationOptionApplicationUpdateInstalled": "Programopdatering installeret",
-    "NotificationOptionPluginUpdateInstalled": "Opdatering til plugin installeret",
-    "NotificationOptionPluginInstalled": "Plugin installeret",
-    "NotificationOptionPluginUninstalled": "Plugin afinstalleret",
-    "NotificationOptionVideoPlayback": "Videoafspilning startet",
-    "NotificationOptionAudioPlayback": "Lydafspilning startet",
-    "NotificationOptionGamePlayback": "Spilafspilning startet",
-    "NotificationOptionVideoPlaybackStopped": "Videoafspilning stoppet",
-    "NotificationOptionAudioPlaybackStopped": "Lydafspilning stoppet",
-    "NotificationOptionGamePlaybackStopped": "Spilafspilning stoppet",
-    "NotificationOptionTaskFailed": "Fejl i planlagt opgave",
-    "NotificationOptionInstallationFailed": "Fejl ved installation",
-    "NotificationOptionNewLibraryContent": "Nyt indhold tilf\u00f8jet",
-    "NotificationOptionNewLibraryContentMultiple": "Nyt indhold tilf\u00f8jet (flere)",
-    "NotificationOptionCameraImageUploaded": "Kamerabillede tilf\u00f8jet",
-    "NotificationOptionUserLockedOut": "Bruger l\u00e5st",
-    "NotificationOptionServerRestartRequired": "Genstart af serveren p\u00e5kr\u00e6vet",
-    "ViewTypePlaylists": "Afspilningslister",
-    "ViewTypeMovies": "Film",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Spil",
-    "ViewTypeMusic": "Musik",
-    "ViewTypeMusicGenres": "Genrer",
-    "ViewTypeMusicArtists": "Artister",
-    "ViewTypeBoxSets": "Samlinger",
-    "ViewTypeChannels": "Kanaler",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Vises nu",
-    "ViewTypeLatestGames": "Seneste spil",
-    "ViewTypeRecentlyPlayedGames": "Afspillet for nylig",
-    "ViewTypeGameFavorites": "Favoritter",
-    "ViewTypeGameSystems": "Spilsystemer",
-    "ViewTypeGameGenres": "Genrer",
-    "ViewTypeTvResume": "Forts\u00e6t",
-    "ViewTypeTvNextUp": "N\u00e6ste",
-    "ViewTypeTvLatest": "Seneste",
-    "ViewTypeTvShowSeries": "Serier",
-    "ViewTypeTvGenres": "Genrer",
-    "ViewTypeTvFavoriteSeries": "Favoritserier",
-    "ViewTypeTvFavoriteEpisodes": "Favoritepisoder",
-    "ViewTypeMovieResume": "Forts\u00e6t",
-    "ViewTypeMovieLatest": "Seneste",
-    "ViewTypeMovieMovies": "Film",
-    "ViewTypeMovieCollections": "Samlinger",
-    "ViewTypeMovieFavorites": "Favoritter",
-    "ViewTypeMovieGenres": "Genrer",
-    "ViewTypeMusicLatest": "Seneste",
-    "ViewTypeMusicPlaylists": "Afspilningslister",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Albumartister",
-    "HeaderOtherDisplaySettings": "Indstillinger for visning",
-    "ViewTypeMusicSongs": "Sange",
-    "ViewTypeMusicFavorites": "Favoritter",
-    "ViewTypeMusicFavoriteAlbums": "Favoritalbums",
-    "ViewTypeMusicFavoriteArtists": "Favoritartister",
-    "ViewTypeMusicFavoriteSongs": "Favoritsange",
-    "ViewTypeFolders": "Mapper",
-    "ViewTypeLiveTvRecordingGroups": "Optagelser",
-    "ViewTypeLiveTvChannels": "Kanaler",
-    "ScheduledTaskFailedWithName": "{0} fejlede",
-    "LabelRunningTimeValue": "K\u00f8rselstid: {0}",
-    "ScheduledTaskStartedWithName": "{0} startet",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} blev installeret",
-    "PluginUpdatedWithName": "{0} blev opdateret",
-    "PluginUninstalledWithName": "{0} blev afinstalleret",
-    "ItemAddedWithName": "{0} blev tilf\u00f8jet til biblioteket",
-    "ItemRemovedWithName": "{0} blev fjernet fra biblioteket",
-    "LabelIpAddressValue": "IP-adresse: {0}",
-    "DeviceOnlineWithName": "{0} er forbundet",
-    "UserOnlineFromDevice": "{0} er online fra {1}",
-    "ProviderValue": "Udbyder: {0}",
-    "SubtitlesDownloadedForItem": "Undertekster hentet til {0}",
-    "UserConfigurationUpdatedWithName": "Brugerkonfigurationen for {0} er blevet opdateret",
-    "UserCreatedWithName": "Bruger {0} er skabt",
-    "UserPasswordChangedWithName": "Adgangskoden for {0} er blevet \u00e6ndret",
-    "UserDeletedWithName": "Bruger {0} er slettet",
-    "MessageServerConfigurationUpdated": "Serverkonfigurationen er opdateret",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Serverkonfiguration sektion {0} er opdateret",
-    "MessageApplicationUpdated": "Emby er blevet opdateret",
-    "FailedLoginAttemptWithUserName": "Fejlslagent loginfors\u00f8g fra {0}",
-    "AuthenticationSucceededWithUserName": "{0} autentificeret",
-    "DeviceOfflineWithName": "{0} har afbrudt forbindelsen",
-    "UserLockedOutWithName": "Bruger {0} er blevet l\u00e5st",
-    "UserOfflineFromDevice": "{0} har afbrudt forbindelsen fra {1}",
-    "UserStartedPlayingItemWithValues": "{0} afspiller {1}",
-    "UserStoppedPlayingItemWithValues": "{0} har stoppet afpilningen af {1}",
-    "SubtitleDownloadFailureForItem": "Hentning af undertekster til {0} fejlede",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "Bruger",
-    "HeaderName": "Navn",
-    "HeaderDate": "Dato",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Udgivelsesdato",
-    "HeaderRuntime": "Varighed",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "S\u00e6son",
-    "HeaderSeasonNumber": "S\u00e6sonnummer",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Netv\u00e6rk",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "F\u00e6llesskabsvurdering",
-    "HeaderTrailers": "Trailere",
-    "HeaderSpecials": "S\u00e6rudsendelser",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disk",
-    "HeaderTrack": "Spor",
-    "HeaderAudio": "Lyd",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Indlejret billede",
-    "HeaderResolution": "Opl\u00f8sning",
-    "HeaderSubtitles": "Undertekster",
-    "HeaderGenres": "Genrer",
-    "HeaderCountries": "Lande",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Spor",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studier",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Aldersgr\u00e6nser",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/de.json b/MediaBrowser.Server.Implementations/Localization/Core/de.json
deleted file mode 100644
index 30e3d9215..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/de.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Bitte warten Sie w\u00e4hrend die Emby Datenbank aktualisiert wird. {0}% verarbeitet.",
-    "AppDeviceValues": "App: {0}, Ger\u00e4t: {1}",
-    "UserDownloadingItemWithValues": "{0} l\u00e4dt {1} herunter",
-    "FolderTypeMixed": "Gemischte Inhalte",
-    "FolderTypeMovies": "Filme",
-    "FolderTypeMusic": "Musik",
-    "FolderTypeAdultVideos": "Videos f\u00fcr Erwachsene",
-    "FolderTypePhotos": "Fotos",
-    "FolderTypeMusicVideos": "Musikvideos",
-    "FolderTypeHomeVideos": "Heimvideos",
-    "FolderTypeGames": "Spiele",
-    "FolderTypeBooks": "B\u00fccher",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "\u00dcbernehmen",
-    "HeaderCastCrew": "Besetzung & Crew",
-    "HeaderPeople": "Personen",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Kapitel {0}",
-    "NameSeasonNumber": "Staffel {0}",
-    "LabelExit": "Beenden",
-    "LabelVisitCommunity": "Besuche die Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Dokumentation",
-    "LabelDeveloperResources": "Entwickler Ressourcen",
-    "LabelBrowseLibrary": "Bibliothek durchsuchen",
-    "LabelConfigureServer": "Konfiguriere Emby",
-    "LabelRestartServer": "Server neustarten",
-    "CategorySync": "Sync",
-    "CategoryUser": "Benutzer",
-    "CategorySystem": "System",
-    "CategoryApplication": "Anwendung",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin Fehler",
-    "NotificationOptionApplicationUpdateAvailable": "Anwendungsaktualisierung verf\u00fcgbar",
-    "NotificationOptionApplicationUpdateInstalled": "Anwendungsaktualisierung installiert",
-    "NotificationOptionPluginUpdateInstalled": "Pluginaktualisierung installiert",
-    "NotificationOptionPluginInstalled": "Plugin installiert",
-    "NotificationOptionPluginUninstalled": "Plugin deinstalliert",
-    "NotificationOptionVideoPlayback": "Videowiedergabe gestartet",
-    "NotificationOptionAudioPlayback": "Audiowiedergabe gestartet",
-    "NotificationOptionGamePlayback": "Spielwiedergabe gestartet",
-    "NotificationOptionVideoPlaybackStopped": "Videowiedergabe gestoppt",
-    "NotificationOptionAudioPlaybackStopped": "Audiowiedergabe gestoppt",
-    "NotificationOptionGamePlaybackStopped": "Spielwiedergabe gestoppt",
-    "NotificationOptionTaskFailed": "Fehler bei geplanter Aufgabe",
-    "NotificationOptionInstallationFailed": "Installationsfehler",
-    "NotificationOptionNewLibraryContent": "Neuer Inhalt hinzugef\u00fcgt",
-    "NotificationOptionNewLibraryContentMultiple": "Neuen Inhalte hinzugef\u00fcgt (mehrere)",
-    "NotificationOptionCameraImageUploaded": "Kamera Bild hochgeladen",
-    "NotificationOptionUserLockedOut": "Benutzer ausgeschlossen",
-    "NotificationOptionServerRestartRequired": "Serverneustart notwendig",
-    "ViewTypePlaylists": "Wiedergabelisten",
-    "ViewTypeMovies": "Filme",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Spiele",
-    "ViewTypeMusic": "Musik",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "K\u00fcnstler",
-    "ViewTypeBoxSets": "Sammlungen",
-    "ViewTypeChannels": "Kan\u00e4le",
-    "ViewTypeLiveTV": "Live-TV",
-    "ViewTypeLiveTvNowPlaying": "Gerade ausgestrahlt",
-    "ViewTypeLatestGames": "Neueste Spiele",
-    "ViewTypeRecentlyPlayedGames": "K\u00fcrzlich abgespielt",
-    "ViewTypeGameFavorites": "Favoriten",
-    "ViewTypeGameSystems": "Spielesysteme",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Fortsetzen",
-    "ViewTypeTvNextUp": "Als n\u00e4chstes",
-    "ViewTypeTvLatest": "Neueste",
-    "ViewTypeTvShowSeries": "Serien",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Serien Favoriten",
-    "ViewTypeTvFavoriteEpisodes": "Episoden Favoriten",
-    "ViewTypeMovieResume": "Fortsetzen",
-    "ViewTypeMovieLatest": "Neueste",
-    "ViewTypeMovieMovies": "Filme",
-    "ViewTypeMovieCollections": "Sammlungen",
-    "ViewTypeMovieFavorites": "Favoriten",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Neueste",
-    "ViewTypeMusicPlaylists": "Wiedergabelisten",
-    "ViewTypeMusicAlbums": "Alben",
-    "ViewTypeMusicAlbumArtists": "Album-K\u00fcnstler",
-    "HeaderOtherDisplaySettings": "Anzeige Einstellungen",
-    "ViewTypeMusicSongs": "Lieder",
-    "ViewTypeMusicFavorites": "Favoriten",
-    "ViewTypeMusicFavoriteAlbums": "Album Favoriten",
-    "ViewTypeMusicFavoriteArtists": "Interpreten Favoriten",
-    "ViewTypeMusicFavoriteSongs": "Lieder Favoriten",
-    "ViewTypeFolders": "Verzeichnisse",
-    "ViewTypeLiveTvRecordingGroups": "Aufnahmen",
-    "ViewTypeLiveTvChannels": "Kan\u00e4le",
-    "ScheduledTaskFailedWithName": "{0} fehlgeschlagen",
-    "LabelRunningTimeValue": "Laufzeit: {0}",
-    "ScheduledTaskStartedWithName": "{0} gestartet",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} wurde installiert",
-    "PluginUpdatedWithName": "{0} wurde aktualisiert",
-    "PluginUninstalledWithName": "{0} wurde deinstalliert",
-    "ItemAddedWithName": "{0} wurde der Bibliothek hinzugef\u00fcgt",
-    "ItemRemovedWithName": "{0} wurde aus der Bibliothek entfernt",
-    "LabelIpAddressValue": "IP Adresse: {0}",
-    "DeviceOnlineWithName": "{0} ist verbunden",
-    "UserOnlineFromDevice": "{0} ist online von {1}",
-    "ProviderValue": "Anbieter: {0}",
-    "SubtitlesDownloadedForItem": "Untertitel heruntergeladen f\u00fcr {0}",
-    "UserConfigurationUpdatedWithName": "Benutzereinstellungen wurden aktualisiert f\u00fcr {0}",
-    "UserCreatedWithName": "Benutzer {0} wurde erstellt",
-    "UserPasswordChangedWithName": "Das Passwort f\u00fcr Benutzer {0} wurde ge\u00e4ndert",
-    "UserDeletedWithName": "Benutzer {0} wurde gel\u00f6scht",
-    "MessageServerConfigurationUpdated": "Server Einstellungen wurden aktualisiert",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Der Server Einstellungsbereich {0} wurde aktualisiert",
-    "MessageApplicationUpdated": "Emby Server wurde auf den neusten Stand gebracht.",
-    "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
-    "AuthenticationSucceededWithUserName": "{0} erfolgreich authentifiziert",
-    "DeviceOfflineWithName": "{0} wurde getrennt",
-    "UserLockedOutWithName": "Benutzer {0} wurde ausgeschlossen",
-    "UserOfflineFromDevice": "{0} wurde getrennt von {1}",
-    "UserStartedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} gestartet",
-    "UserStoppedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} beendet",
-    "SubtitleDownloadFailureForItem": "Download der Untertitel fehlgeschlagen f\u00fcr {0}",
-    "HeaderUnidentified": "Nicht identifiziert",
-    "HeaderImagePrimary": "Bevorzugt",
-    "HeaderImageBackdrop": "Hintergrund",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Benutzerbild",
-    "HeaderOverview": "\u00dcbersicht",
-    "HeaderShortOverview": "Kurz\u00fcbersicht",
-    "HeaderType": "Typ",
-    "HeaderSeverity": "Schwere",
-    "HeaderUser": "Benutzer",
-    "HeaderName": "Name",
-    "HeaderDate": "Datum",
-    "HeaderPremiereDate": "Premiere Datum",
-    "HeaderDateAdded": "Datum hinzugef\u00fcgt",
-    "HeaderReleaseDate": "Ver\u00f6ffentlichungsdatum",
-    "HeaderRuntime": "Laufzeit",
-    "HeaderPlayCount": "Anzahl Wiedergaben",
-    "HeaderSeason": "Staffel",
-    "HeaderSeasonNumber": "Staffel Nummer",
-    "HeaderSeries": "Serien:",
-    "HeaderNetwork": "Netzwerk",
-    "HeaderYear": "Jahr:",
-    "HeaderYears": "Jahre:",
-    "HeaderParentalRating": "Altersfreigabe",
-    "HeaderCommunityRating": "Community Bewertung",
-    "HeaderTrailers": "Trailer",
-    "HeaderSpecials": "Extras",
-    "HeaderGameSystems": "Spiele Systeme",
-    "HeaderPlayers": "Spieler:",
-    "HeaderAlbumArtists": "Album K\u00fcnstler",
-    "HeaderAlbums": "Alben",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "St\u00fcck",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Integriertes Bild",
-    "HeaderResolution": "Aufl\u00f6sung",
-    "HeaderSubtitles": "Untertitel",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "L\u00e4nder",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Lieder",
-    "HeaderMusicArtist": "Musik K\u00fcnstler",
-    "HeaderLocked": "Blockiert",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Schauspieler",
-    "HeaderComposer": "Komponierer",
-    "HeaderDirector": "Regie",
-    "HeaderGuestStar": "Gaststar",
-    "HeaderProducer": "Produzenten",
-    "HeaderWriter": "Autoren",
-    "HeaderParentalRatings": "Altersbeschr\u00e4nkung",
-    "HeaderCommunityRatings": "Community Bewertungen",
-    "StartupEmbyServerIsLoading": "Emby Server startet, bitte versuchen Sie es gleich noch einmal."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/el.json b/MediaBrowser.Server.Implementations/Localization/Core/el.json
deleted file mode 100644
index 9e2d321cc..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/el.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "\u0391\u03bd\u03ac\u03bc\u03b5\u03b9\u03ba\u03c4\u03bf \u03a0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03bf",
-    "FolderTypeMovies": "\u03a4\u03b1\u03b9\u03bd\u03af\u03b5\u03c2",
-    "FolderTypeMusic": "\u039c\u03bf\u03c5\u03c3\u03b9\u03ba\u03ae",
-    "FolderTypeAdultVideos": "\u03a4\u03b1\u03b9\u03bd\u03af\u03b5\u03c2 \u0395\u03bd\u03b7\u03bb\u03af\u03ba\u03c9\u03bd",
-    "FolderTypePhotos": "\u03a6\u03c9\u03c4\u03bf\u03b3\u03c1\u03b1\u03c6\u03af\u03b5\u03c2",
-    "FolderTypeMusicVideos": "\u039c\u03bf\u03c5\u03c3\u03b9\u03ba\u03ac \u0392\u03af\u03bd\u03c4\u03b5\u03bf",
-    "FolderTypeHomeVideos": "\u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b9\u03ba\u03ac \u0392\u03af\u03bd\u03c4\u03b5\u03bf",
-    "FolderTypeGames": "\u03a0\u03b1\u03b9\u03c7\u03bd\u03af\u03b4\u03b9\u03b1",
-    "FolderTypeBooks": "\u0392\u03b9\u03b2\u03bb\u03af\u03b1",
-    "FolderTypeTvShows": "\u03a4\u03b7\u03bb\u03b5\u03cc\u03c1\u03b1\u03c3\u03b7",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "\u0397\u03b8\u03bf\u03c0\u03bf\u03b9\u03bf\u03af \u03ba\u03b1\u03b9 \u03c3\u03c5\u03bd\u03b5\u03c1\u03b3\u03b5\u03af\u03bf",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "\u0388\u03be\u03bf\u03b4\u03bf\u03c2",
-    "LabelVisitCommunity": "\u039a\u03bf\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "\u03a0\u03b7\u03b3\u03ad\u03c2 \u03a0\u03c1\u03bf\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03b9\u03c3\u03c4\u03ae",
-    "LabelBrowseLibrary": "\u03a0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03b8\u03b5\u03af\u03c4\u03b5 \u03c3\u03c4\u03b7 \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7",
-    "LabelConfigureServer": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 Emby",
-    "LabelRestartServer": "\u0395\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae",
-    "CategorySync": "\u03a3\u03c5\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03cc\u03c2",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "\u0388\u03ba\u03b4\u03bf\u03c3\u03b7 {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "\u0389\u03c7\u03bf\u03c2",
-    "HeaderVideo": "\u0392\u03af\u03bd\u03c4\u03b5\u03bf",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/en-GB.json b/MediaBrowser.Server.Implementations/Localization/Core/en-GB.json
deleted file mode 100644
index 493c6c4e9..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/en-GB.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Series {0}",
-    "LabelExit": "Exit",
-    "LabelVisitCommunity": "Visit Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Browse Library",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "Restart Server",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New (multiple) content added",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Showing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favourites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favourite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favourite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favourites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favourites",
-    "ViewTypeMusicFavoriteAlbums": "Favourite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favourite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favourite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/en-US.json b/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
deleted file mode 100644
index bc0dc236d..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "FolderTypeMixed": "Mixed content",
-  "FolderTypeMovies": "Movies",
-  "FolderTypeMusic": "Music",
-  "FolderTypeAdultVideos": "Adult videos",
-  "FolderTypePhotos": "Photos",
-  "FolderTypeMusicVideos": "Music videos",
-  "FolderTypeHomeVideos": "Home videos",
-  "FolderTypeGames": "Games",
-  "FolderTypeBooks": "Books",
-  "FolderTypeTvShows": "TV",
-  "FolderTypeInherit": "Inherit",
-  "HeaderCastCrew": "Cast & Crew",
-  "HeaderPeople": "People",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "LabelChapterName": "Chapter {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NameSeasonNumber": "Season {0}",
-  "LabelExit": "Exit",
-  "LabelVisitCommunity": "Visit Community",
-  "LabelGithub": "Github",
-  "LabelApiDocumentation": "Api Documentation",
-  "LabelDeveloperResources": "Developer Resources",
-  "LabelBrowseLibrary": "Browse Library",
-  "LabelConfigureServer": "Configure Emby",
-  "LabelRestartServer": "Restart Server",
-  "CategorySync": "Sync",
-  "CategoryUser": "User",
-  "CategorySystem": "System",
-  "CategoryApplication": "Application",
-  "CategoryPlugin": "Plugin",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "ViewTypePlaylists": "Playlists",
-  "ViewTypeMovies": "Movies",
-  "ViewTypeTvShows": "TV",
-  "ViewTypeGames": "Games",
-  "ViewTypeMusic": "Music",
-  "ViewTypeMusicGenres": "Genres",
-  "ViewTypeMusicArtists": "Artists",
-  "ViewTypeBoxSets": "Collections",
-  "ViewTypeChannels": "Channels",
-  "ViewTypeLiveTV": "Live TV",
-  "ViewTypeLiveTvNowPlaying": "Now Airing",
-  "ViewTypeLatestGames": "Latest Games",
-  "ViewTypeRecentlyPlayedGames": "Recently Played",
-  "ViewTypeGameFavorites": "Favorites",
-  "ViewTypeGameSystems": "Game Systems",
-  "ViewTypeGameGenres": "Genres",
-  "ViewTypeTvResume": "Resume",
-  "ViewTypeTvNextUp": "Next Up",
-  "ViewTypeTvLatest": "Latest",
-  "ViewTypeTvShowSeries": "Series",
-  "ViewTypeTvGenres": "Genres",
-  "ViewTypeTvFavoriteSeries": "Favorite Series",
-  "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-  "ViewTypeMovieResume": "Resume",
-  "ViewTypeMovieLatest": "Latest",
-  "ViewTypeMovieMovies": "Movies",
-  "ViewTypeMovieCollections": "Collections",
-  "ViewTypeMovieFavorites": "Favorites",
-  "ViewTypeMovieGenres": "Genres",
-  "ViewTypeMusicLatest": "Latest",
-  "ViewTypeMusicPlaylists": "Playlists",
-  "ViewTypeMusicAlbums": "Albums",
-  "ViewTypeMusicAlbumArtists": "Album Artists",
-  "HeaderOtherDisplaySettings": "Display Settings",
-  "ViewTypeMusicSongs": "Songs",
-  "ViewTypeMusicFavorites": "Favorites",
-  "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-  "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-  "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-  "ViewTypeFolders": "Folders",
-  "ViewTypeLiveTvRecordingGroups": "Recordings",
-  "ViewTypeLiveTvChannels": "Channels",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "VersionNumber": "Version {0}",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUpdatedWithName": "{0} was updated",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "DeviceOnlineWithName": "{0} is connected",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "ProviderValue": "Provider: {0}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageApplicationUpdated": "Emby Server has been updated",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-  "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "HeaderUnidentified": "Unidentified",
-  "HeaderImagePrimary": "Primary",
-  "HeaderImageBackdrop": "Backdrop",
-  "HeaderImageLogo": "Logo",
-  "HeaderUserPrimaryImage": "User Image",
-  "HeaderOverview": "Overview",
-  "HeaderShortOverview": "Short Overview",
-  "HeaderType": "Type",
-  "HeaderSeverity": "Severity",
-  "HeaderUser": "User",
-  "HeaderName": "Name",
-  "HeaderDate": "Date",
-  "HeaderPremiereDate": "Premiere Date",
-  "HeaderDateAdded": "Date Added",
-  "HeaderReleaseDate": "Release date",
-  "HeaderRuntime": "Runtime",
-  "HeaderPlayCount": "Play Count",
-  "HeaderSeason": "Season",
-  "HeaderSeasonNumber": "Season number",
-  "HeaderSeries": "Series:",
-  "HeaderNetwork": "Network",
-  "HeaderYear": "Year:",
-  "HeaderYears": "Years:",
-  "HeaderParentalRating": "Parental Rating",
-  "HeaderCommunityRating": "Community rating",
-  "HeaderTrailers": "Trailers",
-  "HeaderSpecials": "Specials",
-  "HeaderGameSystems": "Game Systems",
-  "HeaderPlayers": "Players:",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderAlbums": "Albums",
-  "HeaderDisc": "Disc",
-  "HeaderTrack": "Track",
-  "HeaderAudio": "Audio",
-  "HeaderVideo": "Video",
-  "HeaderEmbeddedImage": "Embedded image",
-  "HeaderResolution": "Resolution",
-  "HeaderSubtitles": "Subtitles",
-  "HeaderGenres": "Genres",
-  "HeaderCountries": "Countries",
-  "HeaderStatus": "Status",
-  "HeaderTracks": "Tracks",
-  "HeaderMusicArtist": "Music artist",
-  "HeaderLocked": "Locked",
-  "HeaderStudios": "Studios",
-  "HeaderActor": "Actors",
-  "HeaderComposer": "Composers",
-  "HeaderDirector": "Directors",
-  "HeaderGuestStar": "Guest star",
-  "HeaderProducer": "Producers",
-  "HeaderWriter": "Writers",
-  "HeaderParentalRatings": "Parental Ratings",
-  "HeaderCommunityRatings": "Community ratings",
-  "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/es-AR.json b/MediaBrowser.Server.Implementations/Localization/Core/es-AR.json
deleted file mode 100644
index 0555aa9d9..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/es-AR.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Salir",
-    "LabelVisitCommunity": "Visit Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentaci\u00f3n API",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Browse Library",
-    "LabelConfigureServer": "Configurar Emby",
-    "LabelRestartServer": "Reiniciar el servidor",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/es-MX.json b/MediaBrowser.Server.Implementations/Localization/Core/es-MX.json
deleted file mode 100644
index 630c7a037..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/es-MX.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Por favor espere mientras la base de datos de su Servidor Emby es actualizada. {0}% completo.",
-    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
-    "UserDownloadingItemWithValues": "{0} esta descargando {1}",
-    "FolderTypeMixed": "Contenido mezclado",
-    "FolderTypeMovies": "Pel\u00edculas",
-    "FolderTypeMusic": "M\u00fasica",
-    "FolderTypeAdultVideos": "Videos para adultos",
-    "FolderTypePhotos": "Fotos",
-    "FolderTypeMusicVideos": "Videos musicales",
-    "FolderTypeHomeVideos": "Videos caseros",
-    "FolderTypeGames": "Juegos",
-    "FolderTypeBooks": "Libros",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Heredar",
-    "HeaderCastCrew": "Reparto y Personal",
-    "HeaderPeople": "Personas",
-    "ValueSpecialEpisodeName": "Especial: {0}",
-    "LabelChapterName": "Cap\u00edtulo {0}",
-    "NameSeasonNumber": "Temporada {0}",
-    "LabelExit": "Salir",
-    "LabelVisitCommunity": "Visitar la Comunidad",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentaci\u00f3n del API",
-    "LabelDeveloperResources": "Recursos para Desarrolladores",
-    "LabelBrowseLibrary": "Explorar Biblioteca",
-    "LabelConfigureServer": "Configurar Emby",
-    "LabelRestartServer": "Reiniciar el Servidor",
-    "CategorySync": "Sinc.",
-    "CategoryUser": "Usuario",
-    "CategorySystem": "Sistema",
-    "CategoryApplication": "Aplicaci\u00f3n",
-    "CategoryPlugin": "Complemento",
-    "NotificationOptionPluginError": "Falla de complemento",
-    "NotificationOptionApplicationUpdateAvailable": "Actualizaci\u00f3n de aplicaci\u00f3n disponible",
-    "NotificationOptionApplicationUpdateInstalled": "Actualizaci\u00f3n de aplicaci\u00f3n instalada",
-    "NotificationOptionPluginUpdateInstalled": "Actualizaci\u00f3n de complemento instalada",
-    "NotificationOptionPluginInstalled": "Complemento instalado",
-    "NotificationOptionPluginUninstalled": "Complemento desinstalado",
-    "NotificationOptionVideoPlayback": "Reproducci\u00f3n de video iniciada",
-    "NotificationOptionAudioPlayback": "Reproducci\u00f3n de audio iniciada",
-    "NotificationOptionGamePlayback": "Ejecuci\u00f3n de juego iniciada",
-    "NotificationOptionVideoPlaybackStopped": "Reproducci\u00f3n de video detenida",
-    "NotificationOptionAudioPlaybackStopped": "Reproducci\u00f3n de audio detenida",
-    "NotificationOptionGamePlaybackStopped": "Ejecuci\u00f3n de juego detenida",
-    "NotificationOptionTaskFailed": "Falla de tarea programada",
-    "NotificationOptionInstallationFailed": "Falla de instalaci\u00f3n",
-    "NotificationOptionNewLibraryContent": "Nuevo contenido agregado",
-    "NotificationOptionNewLibraryContentMultiple": "Nuevo contenido agregado (varios)",
-    "NotificationOptionCameraImageUploaded": "Imagen de la c\u00e1mara subida",
-    "NotificationOptionUserLockedOut": "Usuario bloqueado",
-    "NotificationOptionServerRestartRequired": "Reinicio del servidor requerido",
-    "ViewTypePlaylists": "Listas de Reproducci\u00f3n",
-    "ViewTypeMovies": "Pel\u00edculas",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Juegos",
-    "ViewTypeMusic": "M\u00fasica",
-    "ViewTypeMusicGenres": "G\u00e9neros",
-    "ViewTypeMusicArtists": "Artistas",
-    "ViewTypeBoxSets": "Colecciones",
-    "ViewTypeChannels": "Canales",
-    "ViewTypeLiveTV": "TV en Vivo",
-    "ViewTypeLiveTvNowPlaying": "Transmiti\u00e9ndose",
-    "ViewTypeLatestGames": "Juegos Recientes",
-    "ViewTypeRecentlyPlayedGames": "Reproducido Reci\u00e9ntemente",
-    "ViewTypeGameFavorites": "Favoritos",
-    "ViewTypeGameSystems": "Sistemas de Juego",
-    "ViewTypeGameGenres": "G\u00e9neros",
-    "ViewTypeTvResume": "Continuar",
-    "ViewTypeTvNextUp": "A Continuaci\u00f3n",
-    "ViewTypeTvLatest": "Recientes",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "G\u00e9neros",
-    "ViewTypeTvFavoriteSeries": "Series Favoritas",
-    "ViewTypeTvFavoriteEpisodes": "Episodios Favoritos",
-    "ViewTypeMovieResume": "Continuar",
-    "ViewTypeMovieLatest": "Recientes",
-    "ViewTypeMovieMovies": "Pel\u00edculas",
-    "ViewTypeMovieCollections": "Colecciones",
-    "ViewTypeMovieFavorites": "Favoritos",
-    "ViewTypeMovieGenres": "G\u00e9neros",
-    "ViewTypeMusicLatest": "Recientes",
-    "ViewTypeMusicPlaylists": "Listas",
-    "ViewTypeMusicAlbums": "\u00c1lbumes",
-    "ViewTypeMusicAlbumArtists": "Artistas del \u00c1lbum",
-    "HeaderOtherDisplaySettings": "Configuraci\u00f3n de Pantalla",
-    "ViewTypeMusicSongs": "Canciones",
-    "ViewTypeMusicFavorites": "Favoritos",
-    "ViewTypeMusicFavoriteAlbums": "\u00c1lbumes Favoritos",
-    "ViewTypeMusicFavoriteArtists": "Artistas Favoritos",
-    "ViewTypeMusicFavoriteSongs": "Canciones Favoritas",
-    "ViewTypeFolders": "Carpetas",
-    "ViewTypeLiveTvRecordingGroups": "Grabaciones",
-    "ViewTypeLiveTvChannels": "Canales",
-    "ScheduledTaskFailedWithName": "{0} fall\u00f3",
-    "LabelRunningTimeValue": "Duraci\u00f3n: {0}",
-    "ScheduledTaskStartedWithName": "{0} Iniciado",
-    "VersionNumber": "Versi\u00f3n {0}",
-    "PluginInstalledWithName": "{0} fue instalado",
-    "PluginUpdatedWithName": "{0} fue actualizado",
-    "PluginUninstalledWithName": "{0} fue desinstalado",
-    "ItemAddedWithName": "{0} fue agregado a la biblioteca",
-    "ItemRemovedWithName": "{0} fue removido de la biblioteca",
-    "LabelIpAddressValue": "Direcci\u00f3n IP: {0}",
-    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
-    "UserOnlineFromDevice": "{0} est\u00e1 en l\u00ednea desde {1}",
-    "ProviderValue": "Proveedor: {0}",
-    "SubtitlesDownloadedForItem": "Subt\u00edtulos descargados para {0}",
-    "UserConfigurationUpdatedWithName": "Se ha actualizado la configuraci\u00f3n del usuario {0}",
-    "UserCreatedWithName": "Se ha creado el usuario {0}",
-    "UserPasswordChangedWithName": "Se ha cambiado la contrase\u00f1a para el usuario {0}",
-    "UserDeletedWithName": "Se ha eliminado al usuario {0}",
-    "MessageServerConfigurationUpdated": "Se ha actualizado la configuraci\u00f3n del servidor",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Se ha actualizado la secci\u00f3n {0} de la configuraci\u00f3n del servidor",
-    "MessageApplicationUpdated": "El servidor Emby ha sido actualizado",
-    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesi\u00f3n de {0}",
-    "AuthenticationSucceededWithUserName": "{0} autenticado con \u00e9xito",
-    "DeviceOfflineWithName": "{0} se ha desconectado",
-    "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
-    "UserOfflineFromDevice": "{0} se ha desconectado desde {1}",
-    "UserStartedPlayingItemWithValues": "{0} ha iniciado la reproducci\u00f3n de {1}",
-    "UserStoppedPlayingItemWithValues": "{0} ha detenido la reproducci\u00f3n de {1}",
-    "SubtitleDownloadFailureForItem": "Fall\u00f3 la descarga de subt\u00edtulos para {0}",
-    "HeaderUnidentified": "No Identificado",
-    "HeaderImagePrimary": "Principal",
-    "HeaderImageBackdrop": "Imagen de Fondo",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Imagen de Usuario",
-    "HeaderOverview": "Resumen",
-    "HeaderShortOverview": "Sinopsis corta:",
-    "HeaderType": "Tipo",
-    "HeaderSeverity": "Severidad",
-    "HeaderUser": "Usuario",
-    "HeaderName": "Nombre",
-    "HeaderDate": "Fecha",
-    "HeaderPremiereDate": "Fecha de Estreno",
-    "HeaderDateAdded": "Fecha de Adici\u00f3n",
-    "HeaderReleaseDate": "Fecha de estreno",
-    "HeaderRuntime": "Duraci\u00f3n",
-    "HeaderPlayCount": "Contador",
-    "HeaderSeason": "Temporada",
-    "HeaderSeasonNumber": "N\u00famero de temporada",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Cadena",
-    "HeaderYear": "A\u00f1o:",
-    "HeaderYears": "A\u00f1os:",
-    "HeaderParentalRating": "Clasificaci\u00f3n Parental",
-    "HeaderCommunityRating": "Calificaci\u00f3n de la comunidad",
-    "HeaderTrailers": "Tr\u00e1ilers",
-    "HeaderSpecials": "Especiales",
-    "HeaderGameSystems": "Sistemas de Juego",
-    "HeaderPlayers": "Reproductores:",
-    "HeaderAlbumArtists": "Artistas del \u00c1lbum",
-    "HeaderAlbums": "\u00c1lbumes",
-    "HeaderDisc": "Disco",
-    "HeaderTrack": "Pista",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Im\u00e1gen embebida",
-    "HeaderResolution": "Resoluci\u00f3n",
-    "HeaderSubtitles": "Subt\u00edtulos",
-    "HeaderGenres": "G\u00e9neros",
-    "HeaderCountries": "Pa\u00edses",
-    "HeaderStatus": "Estado",
-    "HeaderTracks": "Pistas",
-    "HeaderMusicArtist": "Int\u00e9rprete",
-    "HeaderLocked": "Bloqueado",
-    "HeaderStudios": "Estudios",
-    "HeaderActor": "Actores",
-    "HeaderComposer": "Compositores",
-    "HeaderDirector": "Directores",
-    "HeaderGuestStar": "Estrella invitada",
-    "HeaderProducer": "Productores",
-    "HeaderWriter": "Guionistas",
-    "HeaderParentalRatings": "Clasificaci\u00f3n Parental",
-    "HeaderCommunityRatings": "Clasificaciones de la comunidad",
-    "StartupEmbyServerIsLoading": "El servidor Emby esta cargando. Por favor intente de nuevo dentro de poco."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/es.json b/MediaBrowser.Server.Implementations/Localization/Core/es.json
deleted file mode 100644
index d1a56240d..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/es.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Por favor espere mientras la base de datos de su servidor Emby se actualiza. {0}% completado.",
-    "AppDeviceValues": "Aplicaci\u00f3n: {0}, Dispositivo: {1}",
-    "UserDownloadingItemWithValues": "{0} est\u00e1 descargando {1}",
-    "FolderTypeMixed": "Contenido mezclado",
-    "FolderTypeMovies": "Peliculas",
-    "FolderTypeMusic": "Musica",
-    "FolderTypeAdultVideos": "Videos para adultos",
-    "FolderTypePhotos": "Fotos",
-    "FolderTypeMusicVideos": "Videos Musicales",
-    "FolderTypeHomeVideos": "Videos caseros",
-    "FolderTypeGames": "Juegos",
-    "FolderTypeBooks": "Libros",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Heredado",
-    "HeaderCastCrew": "Reparto y equipo t\u00e9cnico",
-    "HeaderPeople": "Gente",
-    "ValueSpecialEpisodeName": "Especial - {0}",
-    "LabelChapterName": "Cap\u00edtulo {0}",
-    "NameSeasonNumber": "Temporada {0}",
-    "LabelExit": "Salir",
-    "LabelVisitCommunity": "Visitar la comunidad",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentaci\u00f3n API",
-    "LabelDeveloperResources": "Recursos del Desarrollador",
-    "LabelBrowseLibrary": "Navegar biblioteca",
-    "LabelConfigureServer": "Configurar Emby",
-    "LabelRestartServer": "Reiniciar el servidor",
-    "CategorySync": "Sincronizar",
-    "CategoryUser": "Usuario",
-    "CategorySystem": "Sistema",
-    "CategoryApplication": "Aplicaci\u00f3n",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Error en plugin",
-    "NotificationOptionApplicationUpdateAvailable": "Disponible actualizaci\u00f3n de la aplicaci\u00f3n",
-    "NotificationOptionApplicationUpdateInstalled": "Se ha instalado la actualizaci\u00f3n de la aplicaci\u00f3n",
-    "NotificationOptionPluginUpdateInstalled": "Se ha instalado la actualizaci\u00f3n del plugin",
-    "NotificationOptionPluginInstalled": "Plugin instalado",
-    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
-    "NotificationOptionVideoPlayback": "Reproduccion de video a iniciado",
-    "NotificationOptionAudioPlayback": "Reproduccion de audio a iniciado",
-    "NotificationOptionGamePlayback": "Reproduccion de video juego a iniciado",
-    "NotificationOptionVideoPlaybackStopped": "Reproducci\u00f3n de video detenida",
-    "NotificationOptionAudioPlaybackStopped": "Reproducci\u00f3n de audio detenida",
-    "NotificationOptionGamePlaybackStopped": "Reproducci\u00f3n de juego detenida",
-    "NotificationOptionTaskFailed": "La tarea programada ha fallado",
-    "NotificationOptionInstallationFailed": "Fallo en la instalaci\u00f3n",
-    "NotificationOptionNewLibraryContent": "Nuevo contenido a\u00f1adido",
-    "NotificationOptionNewLibraryContentMultiple": "Nuevo contenido a\u00f1adido (multiple)",
-    "NotificationOptionCameraImageUploaded": "Imagen de camara se a carcado",
-    "NotificationOptionUserLockedOut": "Usuario bloqueado",
-    "NotificationOptionServerRestartRequired": "Se requiere el reinicio del servidor",
-    "ViewTypePlaylists": "Listas de reproducci\u00f3n",
-    "ViewTypeMovies": "Pel\u00edculas",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Juegos",
-    "ViewTypeMusic": "M\u00fasica",
-    "ViewTypeMusicGenres": "G\u00e9neros",
-    "ViewTypeMusicArtists": "Artistas",
-    "ViewTypeBoxSets": "Colecciones",
-    "ViewTypeChannels": "Canales",
-    "ViewTypeLiveTV": "Tv en vivo",
-    "ViewTypeLiveTvNowPlaying": "Transmiti\u00e9ndose ahora",
-    "ViewTypeLatestGames": "\u00daltimos juegos",
-    "ViewTypeRecentlyPlayedGames": "Reproducido recientemente",
-    "ViewTypeGameFavorites": "Favoritos",
-    "ViewTypeGameSystems": "Sistemas de juego",
-    "ViewTypeGameGenres": "G\u00e9neros",
-    "ViewTypeTvResume": "Reanudar",
-    "ViewTypeTvNextUp": "Pr\u00f3ximamente",
-    "ViewTypeTvLatest": "\u00daltimas",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "G\u00e9neros",
-    "ViewTypeTvFavoriteSeries": "Series favoritas",
-    "ViewTypeTvFavoriteEpisodes": "Episodios favoritos",
-    "ViewTypeMovieResume": "Reanudar",
-    "ViewTypeMovieLatest": "\u00daltimas",
-    "ViewTypeMovieMovies": "Pel\u00edculas",
-    "ViewTypeMovieCollections": "Colecciones",
-    "ViewTypeMovieFavorites": "Favoritos",
-    "ViewTypeMovieGenres": "G\u00e9neros",
-    "ViewTypeMusicLatest": "\u00daltimas",
-    "ViewTypeMusicPlaylists": "Lista",
-    "ViewTypeMusicAlbums": "\u00c1lbumes",
-    "ViewTypeMusicAlbumArtists": "\u00c1lbumes de artistas",
-    "HeaderOtherDisplaySettings": "Configuraci\u00f3n de pantalla",
-    "ViewTypeMusicSongs": "Canciones",
-    "ViewTypeMusicFavorites": "Favoritos",
-    "ViewTypeMusicFavoriteAlbums": "\u00c1lbumes favoritos",
-    "ViewTypeMusicFavoriteArtists": "Artistas favoritos",
-    "ViewTypeMusicFavoriteSongs": "Canciones favoritas",
-    "ViewTypeFolders": "Carpetas",
-    "ViewTypeLiveTvRecordingGroups": "Grabaciones",
-    "ViewTypeLiveTvChannels": "Canales",
-    "ScheduledTaskFailedWithName": "{0} fall\u00f3",
-    "LabelRunningTimeValue": "Tiempo de ejecuci\u00f3n: {0}",
-    "ScheduledTaskStartedWithName": "{0} iniciado",
-    "VersionNumber": "Versi\u00f3n {0}",
-    "PluginInstalledWithName": "{0} ha sido instalado",
-    "PluginUpdatedWithName": "{0} ha sido actualizado",
-    "PluginUninstalledWithName": "{0} ha sido desinstalado",
-    "ItemAddedWithName": "{0} ha sido a\u00f1adido a la biblioteca",
-    "ItemRemovedWithName": "{0} se ha eliminado de la biblioteca",
-    "LabelIpAddressValue": "Direcci\u00f3n IP: {0}",
-    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
-    "UserOnlineFromDevice": "{0} est\u00e1 conectado desde {1}",
-    "ProviderValue": "Proveedor: {0}",
-    "SubtitlesDownloadedForItem": "Subt\u00edtulos descargados para {0}",
-    "UserConfigurationUpdatedWithName": "Se ha actualizado la configuraci\u00f3n de usuario para {0}",
-    "UserCreatedWithName": "Se ha creado el usuario {0}",
-    "UserPasswordChangedWithName": "Contrase\u00f1a cambiada al usuario {0}",
-    "UserDeletedWithName": "El usuario {0} ha sido eliminado",
-    "MessageServerConfigurationUpdated": "Se ha actualizado la configuraci\u00f3n del servidor",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Se ha actualizado la secci\u00f3n {0} de la configuraci\u00f3n del servidor",
-    "MessageApplicationUpdated": "Se ha actualizado el servidor Emby",
-    "FailedLoginAttemptWithUserName": "Intento de inicio de sesi\u00f3n fallido desde {0}",
-    "AuthenticationSucceededWithUserName": "{0} se ha autenticado satisfactoriamente",
-    "DeviceOfflineWithName": "{0} se ha desconectado",
-    "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
-    "UserOfflineFromDevice": "{0} se ha desconectado de {1}",
-    "UserStartedPlayingItemWithValues": "{0} ha empezado a reproducir {1}",
-    "UserStoppedPlayingItemWithValues": "{0} ha parado de reproducir {1}",
-    "SubtitleDownloadFailureForItem": "Fallo en la descarga de subt\u00edtulos para {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "Usuario",
-    "HeaderName": "Nombre",
-    "HeaderDate": "Fecha",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subt\u00edtulos",
-    "HeaderGenres": "G\u00e9neros",
-    "HeaderCountries": "Paises",
-    "HeaderStatus": "Estado",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Estudios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Clasificaci\u00f3n parental",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/fi.json b/MediaBrowser.Server.Implementations/Localization/Core/fi.json
deleted file mode 100644
index 20efa1406..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/fi.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Poistu",
-    "LabelVisitCommunity": "K\u00e4y Yhteis\u00f6ss\u00e4",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Selaa Kirjastoa",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "K\u00e4ynnist\u00e4 Palvelin uudelleen",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/fr-CA.json b/MediaBrowser.Server.Implementations/Localization/Core/fr-CA.json
deleted file mode 100644
index 789817c84..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/fr-CA.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Veuillez patienter pendant que la base de donn\u00e9e de votre Serveur Emby se met \u00e0 jour. Termin\u00e9e \u00e0 {0}%.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Quitter",
-    "LabelVisitCommunity": "Visiter la Communaut\u00e9",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentation de l'API",
-    "LabelDeveloperResources": "Ressources pour d\u00e9veloppeurs",
-    "LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",
-    "LabelConfigureServer": "Configurer Emby",
-    "LabelRestartServer": "Red\u00e9marrer le Serveur",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/fr.json b/MediaBrowser.Server.Implementations/Localization/Core/fr.json
deleted file mode 100644
index 25c722989..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/fr.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Veuillez patienter pendant que la base de donn\u00e9e de votre Emby Serveur se met \u00e0 jour. Termin\u00e9e \u00e0 {0}%.",
-    "AppDeviceValues": "Application : {0}, Appareil: {1}",
-    "UserDownloadingItemWithValues": "{0} est en train de t\u00e9l\u00e9charger {1}",
-    "FolderTypeMixed": "Contenus m\u00e9lang\u00e9s",
-    "FolderTypeMovies": "Films",
-    "FolderTypeMusic": "Musique",
-    "FolderTypeAdultVideos": "Vid\u00e9os Adultes",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Vid\u00e9os Musical",
-    "FolderTypeHomeVideos": "Vid\u00e9os personnelles",
-    "FolderTypeGames": "Jeux",
-    "FolderTypeBooks": "Livres",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "H\u00e9rite",
-    "HeaderCastCrew": "\u00c9quipe de tournage",
-    "HeaderPeople": "Personnes",
-    "ValueSpecialEpisodeName": "Sp\u00e9cial - {0}",
-    "LabelChapterName": "Chapitre {0}",
-    "NameSeasonNumber": "Saison {0}",
-    "LabelExit": "Quitter",
-    "LabelVisitCommunity": "Visiter la Communaut\u00e9",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentation de l'API",
-    "LabelDeveloperResources": "Ressources pour d\u00e9veloppeurs",
-    "LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",
-    "LabelConfigureServer": "Configurer Emby",
-    "LabelRestartServer": "Red\u00e9marrer le Serveur",
-    "CategorySync": "Sync",
-    "CategoryUser": "Utilisateur",
-    "CategorySystem": "Syst\u00e8me",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Erreur de plugin",
-    "NotificationOptionApplicationUpdateAvailable": "Mise \u00e0 jour d'application disponible",
-    "NotificationOptionApplicationUpdateInstalled": "Mise \u00e0 jour d'application install\u00e9e",
-    "NotificationOptionPluginUpdateInstalled": "Mise \u00e0 jour de plugin install\u00e9e",
-    "NotificationOptionPluginInstalled": "Plugin install\u00e9",
-    "NotificationOptionPluginUninstalled": "Plugin d\u00e9sinstall\u00e9",
-    "NotificationOptionVideoPlayback": "Lecture vid\u00e9o d\u00e9marr\u00e9e",
-    "NotificationOptionAudioPlayback": "Lecture audio d\u00e9marr\u00e9e",
-    "NotificationOptionGamePlayback": "Lecture de jeu d\u00e9marr\u00e9e",
-    "NotificationOptionVideoPlaybackStopped": "Lecture vid\u00e9o arr\u00eat\u00e9e",
-    "NotificationOptionAudioPlaybackStopped": "Lecture audio arr\u00eat\u00e9e",
-    "NotificationOptionGamePlaybackStopped": "Lecture de jeu arr\u00eat\u00e9e",
-    "NotificationOptionTaskFailed": "\u00c9chec de t\u00e2che planifi\u00e9e",
-    "NotificationOptionInstallationFailed": "\u00c9chec d'installation",
-    "NotificationOptionNewLibraryContent": "Nouveau contenu ajout\u00e9",
-    "NotificationOptionNewLibraryContentMultiple": "Nouveau contenu ajout\u00e9 (multiple)",
-    "NotificationOptionCameraImageUploaded": "L'image de l'appareil photo a \u00e9t\u00e9 upload\u00e9e",
-    "NotificationOptionUserLockedOut": "Utilisateur verrouill\u00e9",
-    "NotificationOptionServerRestartRequired": "Un red\u00e9marrage du serveur est requis",
-    "ViewTypePlaylists": "Listes de lecture",
-    "ViewTypeMovies": "Films",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Jeux",
-    "ViewTypeMusic": "Musique",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artistes",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Cha\u00eenes",
-    "ViewTypeLiveTV": "TV en direct",
-    "ViewTypeLiveTvNowPlaying": "En cours de diffusion",
-    "ViewTypeLatestGames": "Derniers jeux",
-    "ViewTypeRecentlyPlayedGames": "R\u00e9cemment jou\u00e9",
-    "ViewTypeGameFavorites": "Favoris",
-    "ViewTypeGameSystems": "Syst\u00e8me de jeu",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Reprise",
-    "ViewTypeTvNextUp": "A venir",
-    "ViewTypeTvLatest": "Derniers",
-    "ViewTypeTvShowSeries": "S\u00e9ries",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "S\u00e9ries favorites",
-    "ViewTypeTvFavoriteEpisodes": "Episodes favoris",
-    "ViewTypeMovieResume": "Reprise",
-    "ViewTypeMovieLatest": "Dernier",
-    "ViewTypeMovieMovies": "Films",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favoris",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Dernier",
-    "ViewTypeMusicPlaylists": "Listes de lectures",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Artiste de l'album",
-    "HeaderOtherDisplaySettings": "Param\u00e8tres d'affichage",
-    "ViewTypeMusicSongs": "Chansons",
-    "ViewTypeMusicFavorites": "Favoris",
-    "ViewTypeMusicFavoriteAlbums": "Albums favoris",
-    "ViewTypeMusicFavoriteArtists": "Artistes favoris",
-    "ViewTypeMusicFavoriteSongs": "Chansons favorites",
-    "ViewTypeFolders": "R\u00e9pertoires",
-    "ViewTypeLiveTvRecordingGroups": "Enregistrements",
-    "ViewTypeLiveTvChannels": "Cha\u00eenes",
-    "ScheduledTaskFailedWithName": "{0} a \u00e9chou\u00e9",
-    "LabelRunningTimeValue": "Dur\u00e9e: {0}",
-    "ScheduledTaskStartedWithName": "{0} a commenc\u00e9",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} a \u00e9t\u00e9 install\u00e9",
-    "PluginUpdatedWithName": "{0} a \u00e9t\u00e9 mis \u00e0 jour",
-    "PluginUninstalledWithName": "{0} a \u00e9t\u00e9 d\u00e9sinstall\u00e9",
-    "ItemAddedWithName": "{0} a \u00e9t\u00e9 ajout\u00e9 \u00e0 la biblioth\u00e8que",
-    "ItemRemovedWithName": "{0} a \u00e9t\u00e9 supprim\u00e9 de la biblioth\u00e8que",
-    "LabelIpAddressValue": "Adresse IP: {0}",
-    "DeviceOnlineWithName": "{0} est connect\u00e9",
-    "UserOnlineFromDevice": "{0} s'est connect\u00e9 depuis {1}",
-    "ProviderValue": "Fournisseur : {0}",
-    "SubtitlesDownloadedForItem": "Les sous-titres de {0} ont \u00e9t\u00e9 t\u00e9l\u00e9charg\u00e9s",
-    "UserConfigurationUpdatedWithName": "La configuration utilisateur de {0} a \u00e9t\u00e9 mise \u00e0 jour",
-    "UserCreatedWithName": "L'utilisateur {0} a \u00e9t\u00e9 cr\u00e9\u00e9.",
-    "UserPasswordChangedWithName": "Le mot de passe pour l'utilisateur {0} a \u00e9t\u00e9 modifi\u00e9.",
-    "UserDeletedWithName": "L'utilisateur {0} a \u00e9t\u00e9 supprim\u00e9.",
-    "MessageServerConfigurationUpdated": "La configuration du serveur a \u00e9t\u00e9 mise \u00e0 jour.",
-    "MessageNamedServerConfigurationUpdatedWithValue": "La configuration de la section {0} du serveur a \u00e9t\u00e9 mise \u00e0 jour.",
-    "MessageApplicationUpdated": "Le serveur Emby a \u00e9t\u00e9 mis \u00e0 jour",
-    "FailedLoginAttemptWithUserName": "Echec d'une tentative de connexion de {0}",
-    "AuthenticationSucceededWithUserName": "{0} s'est authentifi\u00e9 avec succ\u00e8s",
-    "DeviceOfflineWithName": "{0} s'est d\u00e9connect\u00e9",
-    "UserLockedOutWithName": "L'utilisateur {0} a \u00e9t\u00e9 verrouill\u00e9",
-    "UserOfflineFromDevice": "{0} s'est d\u00e9connect\u00e9 depuis {1}",
-    "UserStartedPlayingItemWithValues": "{0} vient de commencer la lecture de {1}",
-    "UserStoppedPlayingItemWithValues": "{0} vient d'arr\u00eater la lecture de {1}",
-    "SubtitleDownloadFailureForItem": "Le t\u00e9l\u00e9chargement des sous-titres pour {0} a \u00e9chou\u00e9.",
-    "HeaderUnidentified": "Non identifi\u00e9",
-    "HeaderImagePrimary": "Primaire",
-    "HeaderImageBackdrop": "Contexte",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Avatar de l'utilisateur",
-    "HeaderOverview": "Aper\u00e7u",
-    "HeaderShortOverview": "Synopsys",
-    "HeaderType": "Type",
-    "HeaderSeverity": "S\u00e9v\u00e9rit\u00e9",
-    "HeaderUser": "Utilisateur",
-    "HeaderName": "Nom",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Date de la Premi\u00e8re",
-    "HeaderDateAdded": "Date d'ajout",
-    "HeaderReleaseDate": "Date de sortie ",
-    "HeaderRuntime": "Dur\u00e9e",
-    "HeaderPlayCount": "Nombre de lectures",
-    "HeaderSeason": "Saison",
-    "HeaderSeasonNumber": "Num\u00e9ro de saison",
-    "HeaderSeries": "S\u00e9ries :",
-    "HeaderNetwork": "R\u00e9seau",
-    "HeaderYear": "Ann\u00e9e :",
-    "HeaderYears": "Ann\u00e9es :",
-    "HeaderParentalRating": "Classification parentale",
-    "HeaderCommunityRating": "Note de la communaut\u00e9",
-    "HeaderTrailers": "Bandes-annonces",
-    "HeaderSpecials": "Episodes sp\u00e9ciaux",
-    "HeaderGameSystems": "Plateformes de jeu",
-    "HeaderPlayers": "Lecteurs :",
-    "HeaderAlbumArtists": "Artistes sur l'album",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disque",
-    "HeaderTrack": "Piste",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Vid\u00e9o",
-    "HeaderEmbeddedImage": "Image int\u00e9gr\u00e9e",
-    "HeaderResolution": "R\u00e9solution",
-    "HeaderSubtitles": "Sous-titres",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Pays",
-    "HeaderStatus": "\u00c9tat",
-    "HeaderTracks": "Pistes",
-    "HeaderMusicArtist": "Artiste de l'album",
-    "HeaderLocked": "Verrouill\u00e9",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Acteurs",
-    "HeaderComposer": "Compositeurs",
-    "HeaderDirector": "R\u00e9alisateurs",
-    "HeaderGuestStar": "R\u00f4le principal",
-    "HeaderProducer": "Producteurs",
-    "HeaderWriter": "Auteur(e)s",
-    "HeaderParentalRatings": "Note parentale",
-    "HeaderCommunityRatings": "Classification de la communaut\u00e9",
-    "StartupEmbyServerIsLoading": "Le serveur Emby est en cours de chargement. Veuillez r\u00e9essayer dans quelques instant."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/gsw.json b/MediaBrowser.Server.Implementations/Localization/Core/gsw.json
deleted file mode 100644
index 88af82b7e..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/gsw.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Verschiedeni Sache",
-    "FolderTypeMovies": "Film",
-    "FolderTypeMusic": "Musig",
-    "FolderTypeAdultVideos": "Erwachseni Film",
-    "FolderTypePhotos": "F\u00f6teli",
-    "FolderTypeMusicVideos": "Musigvideos",
-    "FolderTypeHomeVideos": "Heimvideos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "B\u00fcecher",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "erbf\u00e4hig",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Verlasse",
-    "LabelVisitCommunity": "Bsuech d'Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "API Dokumentatione",
-    "LabelDeveloperResources": "Entwickler Ressurce",
-    "LabelBrowseLibrary": "Dursuech d'Bibliothek",
-    "LabelConfigureServer": "Konfigurier Emby",
-    "LabelRestartServer": "Server neustarte",
-    "CategorySync": "Synchronisierig",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/he.json b/MediaBrowser.Server.Implementations/Localization/Core/he.json
deleted file mode 100644
index 137b45544..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/he.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "\u05ea\u05d5\u05db\u05df \u05de\u05e2\u05d5\u05e8\u05d1",
-    "FolderTypeMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "\u05d8\u05dc\u05d5\u05d9\u05d6\u05d9\u05d4",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "\u05e9\u05d7\u05e7\u05e0\u05d9\u05dd \u05d5\u05e6\u05d5\u05d5\u05ea",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "\u05d9\u05e6\u05d9\u05d0\u05d4",
-    "LabelVisitCommunity": "\u05d1\u05e7\u05e8 \u05d1\u05e7\u05d4\u05d9\u05dc\u05d4",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "\u05ea\u05d9\u05e2\u05d5\u05d3 API",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "\u05d3\u05e4\u05d3\u05e3 \u05d1\u05e1\u05e4\u05e8\u05d9\u05d4",
-    "LabelConfigureServer": "\u05e7\u05d1\u05e2 \u05ea\u05e6\u05d5\u05e8\u05ea Emby",
-    "LabelRestartServer": "\u05d0\u05ea\u05d7\u05dc \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea",
-    "CategorySync": "\u05e1\u05e0\u05db\u05e8\u05df",
-    "CategoryUser": "\u05de\u05e9\u05ea\u05de\u05e9",
-    "CategorySystem": "\u05de\u05e2\u05e8\u05db\u05ea",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "\u05ea\u05e7\u05dc\u05d4 \u05d1\u05ea\u05d5\u05e1\u05e3",
-    "NotificationOptionApplicationUpdateAvailable": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d5\u05db\u05de\u05d4 \u05e7\u05d9\u05d9\u05dd",
-    "NotificationOptionApplicationUpdateInstalled": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d5\u05db\u05e0\u05d4 \u05d4\u05d5\u05ea\u05e7\u05df",
-    "NotificationOptionPluginUpdateInstalled": "\u05e2\u05d3\u05db\u05d5\u05df \u05ea\u05d5\u05e1\u05e3 \u05d4\u05d5\u05ea\u05e7\u05df",
-    "NotificationOptionPluginInstalled": "\u05ea\u05d5\u05e1\u05e3 \u05d4\u05d5\u05ea\u05e7\u05df",
-    "NotificationOptionPluginUninstalled": "\u05ea\u05d5\u05e1\u05e3 \u05d4\u05d5\u05e1\u05e8",
-    "NotificationOptionVideoPlayback": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05d7\u05dc\u05d4",
-    "NotificationOptionAudioPlayback": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05e6\u05dc\u05d9\u05dc \u05d4\u05d7\u05dc\u05d4",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05d5\u05e4\u05e1\u05e7\u05d4",
-    "NotificationOptionAudioPlaybackStopped": "\u05e0\u05d2\u05d9\u05e0\u05ea \u05e6\u05dc\u05d9\u05dc \u05d4\u05d5\u05e4\u05e1\u05e7\u05d4",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "\u05de\u05e9\u05d9\u05de\u05d4 \u05de\u05ea\u05d5\u05d6\u05de\u05e0\u05ea \u05e0\u05db\u05e9\u05dc\u05d4",
-    "NotificationOptionInstallationFailed": "\u05d4\u05ea\u05e7\u05e0\u05d4 \u05e0\u05db\u05e9\u05dc\u05d4",
-    "NotificationOptionNewLibraryContent": "\u05ea\u05d5\u05db\u05df \u05d7\u05d3\u05e9 \u05e0\u05d5\u05e1\u05e3",
-    "NotificationOptionNewLibraryContentMultiple": "\u05d4\u05ea\u05d5\u05d5\u05e1\u05e4\u05d5 \u05ea\u05db\u05e0\u05d9\u05dd \u05d7\u05d3\u05e9\u05d9\u05dd",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "\u05e0\u05d3\u05e8\u05e9\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4 \u05de\u05d7\u05d3\u05e9 \u05e9\u05dc \u05d4\u05e9\u05e8\u05ea",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
-    "ViewTypeTvShows": "\u05d8\u05dc\u05d5\u05d9\u05d6\u05d9\u05d4",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "\u05d2\u05d9\u05e8\u05e1\u05d0 {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "\u05e9\u05dd",
-    "HeaderDate": "\u05ea\u05d0\u05e8\u05d9\u05da",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "\u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05d5\u05e1\u05e4\u05d4",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "\u05e1\u05d3\u05e8\u05d4",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "\u05e9\u05e0\u05d4",
-    "HeaderYears": "\u05e9\u05e0\u05d9\u05dd",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "\u05de\u05e6\u05d1",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "\u05e9\u05d7\u05e7\u05e0\u05d9\u05dd",
-    "HeaderComposer": "\u05de\u05dc\u05d7\u05d9\u05e0\u05d9\u05dd",
-    "HeaderDirector": "\u05d1\u05de\u05d0\u05d9\u05dd",
-    "HeaderGuestStar": "\u05d0\u05de\u05df \u05d0\u05d5\u05e8\u05d7",
-    "HeaderProducer": "\u05de\u05e4\u05d9\u05e7\u05d9\u05dd",
-    "HeaderWriter": "\u05db\u05d5\u05ea\u05d1\u05d9\u05dd",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/hr.json b/MediaBrowser.Server.Implementations/Localization/Core/hr.json
deleted file mode 100644
index 7a94dc32b..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/hr.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Glumci i ekipa",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Izlaz",
-    "LabelVisitCommunity": "Posjeti zajednicu",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Pregledaj biblioteku",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "Restartiraj Server",
-    "CategorySync": "Sync",
-    "CategoryUser": "Korisnik",
-    "CategorySystem": "Sistem",
-    "CategoryApplication": "Aplikacija",
-    "CategoryPlugin": "Dodatak",
-    "NotificationOptionPluginError": "Dodatak otkazao",
-    "NotificationOptionApplicationUpdateAvailable": "Dostupno a\u017euriranje aplikacije",
-    "NotificationOptionApplicationUpdateInstalled": "Instalirano a\u017euriranje aplikacije",
-    "NotificationOptionPluginUpdateInstalled": "Instalirano a\u017euriranje za dodatak",
-    "NotificationOptionPluginInstalled": "Dodatak instaliran",
-    "NotificationOptionPluginUninstalled": "Dodatak uklonjen",
-    "NotificationOptionVideoPlayback": "Reprodukcija videa zapo\u010deta",
-    "NotificationOptionAudioPlayback": "Reprodukcija glazbe zapo\u010deta",
-    "NotificationOptionGamePlayback": "Igrica pokrenuta",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Zakazan zadatak nije izvr\u0161en",
-    "NotificationOptionInstallationFailed": "Instalacija nije izvr\u0161ena",
-    "NotificationOptionNewLibraryContent": "Novi sadr\u017eaj dodan",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Potrebno ponovo pokretanje servera",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Verzija {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Ime",
-    "HeaderDate": "Datum",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/hu.json b/MediaBrowser.Server.Implementations/Localization/Core/hu.json
deleted file mode 100644
index 2b9d28d8c..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/hu.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "K\u00e9rlek v\u00e1rj, m\u00edg az Emby Szerver adatb\u00e1zis friss\u00fcl. {0}% k\u00e9sz.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Vegyes tartalom",
-    "FolderTypeMovies": "Filmek",
-    "FolderTypeMusic": "Zen\u00e9k",
-    "FolderTypeAdultVideos": "Feln\u0151tt vide\u00f3k",
-    "FolderTypePhotos": "F\u00e9nyk\u00e9pek",
-    "FolderTypeMusicVideos": "Zenei vide\u00f3k",
-    "FolderTypeHomeVideos": "H\u00e1zi vide\u00f3k",
-    "FolderTypeGames": "J\u00e1t\u00e9kok",
-    "FolderTypeBooks": "K\u00f6nyvek",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Szerepl\u0151k & R\u00e9sztvev\u0151k",
-    "HeaderPeople": "Emberek",
-    "ValueSpecialEpisodeName": "K\u00fcl\u00f6nleges - {0}",
-    "LabelChapterName": "Fejezet {0}",
-    "NameSeasonNumber": "\u00c9vad {0}",
-    "LabelExit": "Kil\u00e9p\u00e9s",
-    "LabelVisitCommunity": "K\u00f6z\u00f6ss\u00e9g",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api dokument\u00e1ci\u00f3",
-    "LabelDeveloperResources": "Fejleszt\u0151i eszk\u00f6z\u00f6k",
-    "LabelBrowseLibrary": "M\u00e9diat\u00e1r tall\u00f3z\u00e1sa",
-    "LabelConfigureServer": "Emby konfigur\u00e1l\u00e1sa",
-    "LabelRestartServer": "Szerver \u00fajraindit\u00e1sa",
-    "CategorySync": "Sync",
-    "CategoryUser": "Felhaszn\u00e1l\u00f3",
-    "CategorySystem": "Rendszer",
-    "CategoryApplication": "Alkalmaz\u00e1s",
-    "CategoryPlugin": "B\u0151v\u00edtm\u00e9ny",
-    "NotificationOptionPluginError": "B\u0151v\u00edtm\u00e9ny hiba",
-    "NotificationOptionApplicationUpdateAvailable": "Friss\u00edt\u00e9s el\u00e9rhet\u0151",
-    "NotificationOptionApplicationUpdateInstalled": "Program friss\u00edt\u00e9s telep\u00edtve",
-    "NotificationOptionPluginUpdateInstalled": "B\u0151v\u00edtm\u00e9ny friss\u00edt\u00e9s telep\u00edtve",
-    "NotificationOptionPluginInstalled": "B\u0151v\u00edtm\u00e9ny telep\u00edtve",
-    "NotificationOptionPluginUninstalled": "B\u0151v\u00edtm\u00e9ny elt\u00e1vol\u00edtva",
-    "NotificationOptionVideoPlayback": "Vide\u00f3 elind\u00edtva",
-    "NotificationOptionAudioPlayback": "Zene elind\u00edtva",
-    "NotificationOptionGamePlayback": "J\u00e1t\u00e9k elind\u00edtva",
-    "NotificationOptionVideoPlaybackStopped": "Vide\u00f3 meg\u00e1ll\u00edtva",
-    "NotificationOptionAudioPlaybackStopped": "Zene meg\u00e1ll\u00edtva",
-    "NotificationOptionGamePlaybackStopped": "J\u00e1t\u00e9k meg\u00e1ll\u00edtva",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Telep\u00edt\u00e9si hiba",
-    "NotificationOptionNewLibraryContent": "\u00daj tartalom hozz\u00e1adva",
-    "NotificationOptionNewLibraryContentMultiple": "\u00daj tartalom hozz\u00e1adva (t\u00f6bbsz\u00f6r\u00f6s)",
-    "NotificationOptionCameraImageUploaded": "Kamera k\u00e9p felt\u00f6ltve",
-    "NotificationOptionUserLockedOut": "Felhaszn\u00e1l\u00f3 tiltva",
-    "NotificationOptionServerRestartRequired": "\u00dajraind\u00edt\u00e1s sz\u00fcks\u00e9ges",
-    "ViewTypePlaylists": "Lej\u00e1tsz\u00e1si list\u00e1k",
-    "ViewTypeMovies": "Filmek",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "J\u00e1t\u00e9kok",
-    "ViewTypeMusic": "Zene",
-    "ViewTypeMusicGenres": "M\u0171fajok",
-    "ViewTypeMusicArtists": "M\u0171v\u00e9szek",
-    "ViewTypeBoxSets": "Gy\u0171jtem\u00e9nyek",
-    "ViewTypeChannels": "Csatorn\u00e1k",
-    "ViewTypeLiveTV": "\u00c9l\u0151 TV",
-    "ViewTypeLiveTvNowPlaying": "Most J\u00e1tszott",
-    "ViewTypeLatestGames": "Leg\u00fajabb J\u00e1t\u00e9kok",
-    "ViewTypeRecentlyPlayedGames": "Legut\u00f3bb J\u00e1tszott",
-    "ViewTypeGameFavorites": "Kedvencek",
-    "ViewTypeGameSystems": "J\u00e1t\u00e9k Rendszer",
-    "ViewTypeGameGenres": "M\u0171fajok",
-    "ViewTypeTvResume": "Folytat\u00e1s",
-    "ViewTypeTvNextUp": "K\u00f6vetkez\u0151",
-    "ViewTypeTvLatest": "Leg\u00fajabb",
-    "ViewTypeTvShowSeries": "Sorozat",
-    "ViewTypeTvGenres": "M\u0171fajok",
-    "ViewTypeTvFavoriteSeries": "Kedvenc Sorozat",
-    "ViewTypeTvFavoriteEpisodes": "Kedvenc R\u00e9szek",
-    "ViewTypeMovieResume": "Folytat\u00e1s",
-    "ViewTypeMovieLatest": "Leg\u00fajabb",
-    "ViewTypeMovieMovies": "Filmek",
-    "ViewTypeMovieCollections": "Gy\u0171jtem\u00e9nyek",
-    "ViewTypeMovieFavorites": "Kedvencek",
-    "ViewTypeMovieGenres": "M\u0171fajok",
-    "ViewTypeMusicLatest": "Leg\u00fajabb",
-    "ViewTypeMusicPlaylists": "Lej\u00e1tsz\u00e1si list\u00e1k",
-    "ViewTypeMusicAlbums": "Albumok",
-    "ViewTypeMusicAlbumArtists": "Album El\u0151ad\u00f3k",
-    "HeaderOtherDisplaySettings": "Megjelen\u00edt\u00e9si Be\u00e1ll\u00edt\u00e1sok",
-    "ViewTypeMusicSongs": "Dalok",
-    "ViewTypeMusicFavorites": "Kedvencek",
-    "ViewTypeMusicFavoriteAlbums": "Kedvenc Albumok",
-    "ViewTypeMusicFavoriteArtists": "Kedvenc M\u0171v\u00e9szek",
-    "ViewTypeMusicFavoriteSongs": "Kedvenc Dalok",
-    "ViewTypeFolders": "K\u00f6nyvt\u00e1rak",
-    "ViewTypeLiveTvRecordingGroups": "Felv\u00e9telek",
-    "ViewTypeLiveTvChannels": "Csatorn\u00e1k",
-    "ScheduledTaskFailedWithName": "{0} hiba",
-    "LabelRunningTimeValue": "Fut\u00e1si id\u0151: {0}",
-    "ScheduledTaskStartedWithName": "{0} elkezdve",
-    "VersionNumber": "Verzi\u00f3 {0}",
-    "PluginInstalledWithName": "{0} telep\u00edtve",
-    "PluginUpdatedWithName": "{0} friss\u00edtve",
-    "PluginUninstalledWithName": "{0} elt\u00e1vol\u00edtva",
-    "ItemAddedWithName": "{0} k\u00f6nyvt\u00e1rhoz adva",
-    "ItemRemovedWithName": "{0} t\u00f6r\u00f6lve a k\u00f6nyvt\u00e1rb\u00f3l",
-    "LabelIpAddressValue": "Ip c\u00edm: {0}",
-    "DeviceOnlineWithName": "{0} kapcsol\u00f3dva",
-    "UserOnlineFromDevice": "{0} akt\u00edv err\u0151l {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Felirat let\u00f6lt\u00e9se ehhez {0}",
-    "UserConfigurationUpdatedWithName": "A k\u00f6vetkez\u0151 felhaszn\u00e1l\u00f3 be\u00e1ll\u00edt\u00e1sai friss\u00edtve {0}",
-    "UserCreatedWithName": "Felhaszn\u00e1l\u00f3 {0} l\u00e9trehozva",
-    "UserPasswordChangedWithName": "Jelsz\u00f3 m\u00f3dos\u00edtva ennek a felhaszn\u00e1l\u00f3nak {0}",
-    "UserDeletedWithName": "Felhaszn\u00e1l\u00f3 {0} t\u00f6r\u00f6lve",
-    "MessageServerConfigurationUpdated": "Szerver be\u00e1ll\u00edt\u00e1sok friss\u00edtve",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server friss\u00edtve",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} sz\u00e9tkapcsolt",
-    "UserLockedOutWithName": "A k\u00f6vetkez\u0151 felhaszn\u00e1l\u00f3 tiltva {0}",
-    "UserOfflineFromDevice": "{0} kil\u00e9pett innen {1}",
-    "UserStartedPlayingItemWithValues": "{0} megkezdte j\u00e1tszani a(z) {1}",
-    "UserStoppedPlayingItemWithValues": "{0} befejezte a(z) {1}",
-    "SubtitleDownloadFailureForItem": "Nem siker\u00fcl a felirat let\u00f6lt\u00e9s ehhez {0}",
-    "HeaderUnidentified": "Azonos\u00edtatlan",
-    "HeaderImagePrimary": "Els\u0151dleges",
-    "HeaderImageBackdrop": "H\u00e1tt\u00e9r",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Felhaszn\u00e1l\u00f3 K\u00e9p",
-    "HeaderOverview": "\u00c1ttekint\u00e9s",
-    "HeaderShortOverview": "R\u00f6vid \u00c1ttekint\u00e9s",
-    "HeaderType": "T\u00edpus",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "Felhaszn\u00e1l\u00f3",
-    "HeaderName": "N\u00e9v",
-    "HeaderDate": "D\u00e1tum",
-    "HeaderPremiereDate": "Megjelen\u00e9s D\u00e1tuma",
-    "HeaderDateAdded": "Hozz\u00e1adva",
-    "HeaderReleaseDate": "Megjelen\u00e9s d\u00e1tuma",
-    "HeaderRuntime": "J\u00e1t\u00e9kid\u0151",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "\u00c9vad",
-    "HeaderSeasonNumber": "\u00c9vad sz\u00e1ma",
-    "HeaderSeries": "Sorozatok:",
-    "HeaderNetwork": "H\u00e1l\u00f3zat",
-    "HeaderYear": "\u00c9v:",
-    "HeaderYears": "\u00c9v:",
-    "HeaderParentalRating": "Korhat\u00e1r besorol\u00e1s",
-    "HeaderCommunityRating": "K\u00f6z\u00f6ss\u00e9gi \u00e9rt\u00e9kel\u00e9s",
-    "HeaderTrailers": "El\u0151zetesek",
-    "HeaderSpecials": "Speci\u00e1lis",
-    "HeaderGameSystems": "J\u00e1t\u00e9k Rendszer",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albumok",
-    "HeaderDisc": "Lemez",
-    "HeaderTrack": "S\u00e1v",
-    "HeaderAudio": "Audi\u00f3",
-    "HeaderVideo": "Vide\u00f3",
-    "HeaderEmbeddedImage": "Be\u00e1gyazott k\u00e9p",
-    "HeaderResolution": "Felbont\u00e1s",
-    "HeaderSubtitles": "Feliratok",
-    "HeaderGenres": "M\u0171fajok",
-    "HeaderCountries": "Orsz\u00e1gok",
-    "HeaderStatus": "\u00c1llapot",
-    "HeaderTracks": "S\u00e1vok",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Z\u00e1rt",
-    "HeaderStudios": "St\u00fadi\u00f3k",
-    "HeaderActor": "Sz\u00edn\u00e9szek",
-    "HeaderComposer": "Zeneszerz\u0151k",
-    "HeaderDirector": "Rendez\u0151k",
-    "HeaderGuestStar": "Vend\u00e9g szt\u00e1r",
-    "HeaderProducer": "Producerek",
-    "HeaderWriter": "\u00cdr\u00f3k",
-    "HeaderParentalRatings": "Korhat\u00e1r besorol\u00e1s",
-    "HeaderCommunityRatings": "K\u00f6z\u00f6ss\u00e9gi \u00e9rt\u00e9kel\u00e9sek",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/id.json b/MediaBrowser.Server.Implementations/Localization/Core/id.json
deleted file mode 100644
index 8d64b63c4..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/id.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Silahkan menunggu sementara database Emby Server anda diupgrade. {0}% selesai.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Mewarisi",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Keluar",
-    "LabelVisitCommunity": "Kunjungi Komunitas",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Dokumentasi Api",
-    "LabelDeveloperResources": "Sumber daya Pengembang",
-    "LabelBrowseLibrary": "Telusuri Pustaka",
-    "LabelConfigureServer": "Konfigurasi Emby",
-    "LabelRestartServer": "Hidupkan ulang Server",
-    "CategorySync": "Singkron",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/it.json b/MediaBrowser.Server.Implementations/Localization/Core/it.json
deleted file mode 100644
index d2d697c3e..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/it.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
-    "UserDownloadingItemWithValues": "{0} sta scaricando {1}",
-    "FolderTypeMixed": "contenuto misto",
-    "FolderTypeMovies": "Film",
-    "FolderTypeMusic": "Musica",
-    "FolderTypeAdultVideos": "Video per adulti",
-    "FolderTypePhotos": "Foto",
-    "FolderTypeMusicVideos": "Video musicali",
-    "FolderTypeHomeVideos": "Video personali",
-    "FolderTypeGames": "Giochi",
-    "FolderTypeBooks": "Libri",
-    "FolderTypeTvShows": "Tv",
-    "FolderTypeInherit": "ereditare",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "Persone",
-    "ValueSpecialEpisodeName": "Speciali - {0}",
-    "LabelChapterName": "Capitolo {0}",
-    "NameSeasonNumber": "Stagione {0}",
-    "LabelExit": "Esci",
-    "LabelVisitCommunity": "Visita la Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentazione Api",
-    "LabelDeveloperResources": "Risorse programmatori",
-    "LabelBrowseLibrary": "Esplora la libreria",
-    "LabelConfigureServer": "Configura Emby",
-    "LabelRestartServer": "Riavvia Server",
-    "CategorySync": "Sincronizza",
-    "CategoryUser": "Utente",
-    "CategorySystem": "Sistema",
-    "CategoryApplication": "Applicazione",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin fallito",
-    "NotificationOptionApplicationUpdateAvailable": "Aggiornamento dell'applicazione disponibile",
-    "NotificationOptionApplicationUpdateInstalled": "Aggiornamento dell'applicazione installato",
-    "NotificationOptionPluginUpdateInstalled": "Aggiornamento del plugin installato",
-    "NotificationOptionPluginInstalled": "Plugin installato",
-    "NotificationOptionPluginUninstalled": "Plugin disinstallato",
-    "NotificationOptionVideoPlayback": "La riproduzione video \u00e8 iniziata",
-    "NotificationOptionAudioPlayback": "Riproduzione audio iniziata",
-    "NotificationOptionGamePlayback": "Gioco avviato",
-    "NotificationOptionVideoPlaybackStopped": "Riproduzione video interrotta",
-    "NotificationOptionAudioPlaybackStopped": "Audio Fermato",
-    "NotificationOptionGamePlaybackStopped": "Gioco Fermato",
-    "NotificationOptionTaskFailed": "Operazione pianificata fallita",
-    "NotificationOptionInstallationFailed": "Installazione fallita",
-    "NotificationOptionNewLibraryContent": "Nuovo contenuto aggiunto",
-    "NotificationOptionNewLibraryContentMultiple": "Nuovi contenuti aggiunti (multipli)",
-    "NotificationOptionCameraImageUploaded": "Immagine fotocamera caricata",
-    "NotificationOptionUserLockedOut": "Utente bloccato",
-    "NotificationOptionServerRestartRequired": "Riavvio del server necessario",
-    "ViewTypePlaylists": "Playlist",
-    "ViewTypeMovies": "Film",
-    "ViewTypeTvShows": "Serie Tv",
-    "ViewTypeGames": "Giochi",
-    "ViewTypeMusic": "Musica",
-    "ViewTypeMusicGenres": "Generi",
-    "ViewTypeMusicArtists": "Artisti",
-    "ViewTypeBoxSets": "Collezioni",
-    "ViewTypeChannels": "Canali",
-    "ViewTypeLiveTV": "TV in diretta",
-    "ViewTypeLiveTvNowPlaying": "Ora in onda",
-    "ViewTypeLatestGames": "Ultimi Giorchi",
-    "ViewTypeRecentlyPlayedGames": "Guardato di recente",
-    "ViewTypeGameFavorites": "Preferiti",
-    "ViewTypeGameSystems": "Configurazione gioco",
-    "ViewTypeGameGenres": "Generi",
-    "ViewTypeTvResume": "Riprendi",
-    "ViewTypeTvNextUp": "Prossimi",
-    "ViewTypeTvLatest": "Ultimi",
-    "ViewTypeTvShowSeries": "Serie",
-    "ViewTypeTvGenres": "Generi",
-    "ViewTypeTvFavoriteSeries": "Serie Preferite",
-    "ViewTypeTvFavoriteEpisodes": "Episodi Preferiti",
-    "ViewTypeMovieResume": "Riprendi",
-    "ViewTypeMovieLatest": "Ultimi",
-    "ViewTypeMovieMovies": "Film",
-    "ViewTypeMovieCollections": "Collezioni",
-    "ViewTypeMovieFavorites": "Preferiti",
-    "ViewTypeMovieGenres": "Generi",
-    "ViewTypeMusicLatest": "Ultimi",
-    "ViewTypeMusicPlaylists": "Playlist",
-    "ViewTypeMusicAlbums": "Album",
-    "ViewTypeMusicAlbumArtists": "Album Artisti",
-    "HeaderOtherDisplaySettings": "Impostazioni Video",
-    "ViewTypeMusicSongs": "Canzoni",
-    "ViewTypeMusicFavorites": "Preferiti",
-    "ViewTypeMusicFavoriteAlbums": "Album preferiti",
-    "ViewTypeMusicFavoriteArtists": "Artisti preferiti",
-    "ViewTypeMusicFavoriteSongs": "Canzoni Preferite",
-    "ViewTypeFolders": "Cartelle",
-    "ViewTypeLiveTvRecordingGroups": "Registrazioni",
-    "ViewTypeLiveTvChannels": "canali",
-    "ScheduledTaskFailedWithName": "{0} Falliti",
-    "LabelRunningTimeValue": "Durata: {0}",
-    "ScheduledTaskStartedWithName": "{0} Avviati",
-    "VersionNumber": "Versione {0}",
-    "PluginInstalledWithName": "{0} sono stati Installati",
-    "PluginUpdatedWithName": "{0} sono stati aggiornati",
-    "PluginUninstalledWithName": "{0} non sono stati installati",
-    "ItemAddedWithName": "{0} aggiunti alla libreria",
-    "ItemRemovedWithName": "{0} rimossi dalla libreria",
-    "LabelIpAddressValue": "Indirizzo IP: {0}",
-    "DeviceOnlineWithName": "{0} \u00e8 connesso",
-    "UserOnlineFromDevice": "{0} \u00e8 online da {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Sottotitoli scaricati per {0}",
-    "UserConfigurationUpdatedWithName": "Configurazione utente \u00e8 stata aggiornata per {0}",
-    "UserCreatedWithName": "Utente {0} \u00e8 stato creato",
-    "UserPasswordChangedWithName": "Password utente cambiata per {0}",
-    "UserDeletedWithName": "Utente {0} \u00e8 stato cancellato",
-    "MessageServerConfigurationUpdated": "Configurazione server aggioprnata",
-    "MessageNamedServerConfigurationUpdatedWithValue": "La sezione  {0} \u00e8 stata aggiornata",
-    "MessageApplicationUpdated": "Il Server Emby \u00e8 stato aggiornato",
-    "FailedLoginAttemptWithUserName": "Login fallito da  {0}",
-    "AuthenticationSucceededWithUserName": "{0} Autenticati con successo",
-    "DeviceOfflineWithName": "{0} \u00e8 stato disconesso",
-    "UserLockedOutWithName": "L'utente {0} \u00e8 stato bloccato",
-    "UserOfflineFromDevice": "{0} \u00e8 stato disconesso da {1}",
-    "UserStartedPlayingItemWithValues": "{0} \u00e8 partito da {1}",
-    "UserStoppedPlayingItemWithValues": "{0} stoppato {1}",
-    "SubtitleDownloadFailureForItem": "Sottotitoli non scaricati per {0}",
-    "HeaderUnidentified": "Non identificata",
-    "HeaderImagePrimary": "Primaria",
-    "HeaderImageBackdrop": "Sfondo",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Immagine utente",
-    "HeaderOverview": "Panoramica",
-    "HeaderShortOverview": "breve panoramica",
-    "HeaderType": "Tipo",
-    "HeaderSeverity": "gravit\u00e0",
-    "HeaderUser": "Utente",
-    "HeaderName": "Nome",
-    "HeaderDate": "Data",
-    "HeaderPremiereDate": "Data della prima",
-    "HeaderDateAdded": "Aggiunto il",
-    "HeaderReleaseDate": "Data Rilascio",
-    "HeaderRuntime": "Durata",
-    "HeaderPlayCount": "Visto N\u00b0",
-    "HeaderSeason": "Stagione",
-    "HeaderSeasonNumber": "Stagione Numero",
-    "HeaderSeries": "Serie:",
-    "HeaderNetwork": "Rete",
-    "HeaderYear": "Anno:",
-    "HeaderYears": "Anni",
-    "HeaderParentalRating": "Valutazione parentale",
-    "HeaderCommunityRating": "Voto Comunit\u00e0",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Speciali",
-    "HeaderGameSystems": "Sistemi di gioco",
-    "HeaderPlayers": "Giocatori",
-    "HeaderAlbumArtists": "Album Artisti",
-    "HeaderAlbums": "Album",
-    "HeaderDisc": "Disco",
-    "HeaderTrack": "Traccia",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Immagine incorporata",
-    "HeaderResolution": "Risoluzione",
-    "HeaderSubtitles": "Sottotitoli",
-    "HeaderGenres": "Generi",
-    "HeaderCountries": "Paesi",
-    "HeaderStatus": "Stato",
-    "HeaderTracks": "Traccia",
-    "HeaderMusicArtist": "Musica artisti",
-    "HeaderLocked": "Bloccato",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Attori",
-    "HeaderComposer": "Compositori",
-    "HeaderDirector": "Registi",
-    "HeaderGuestStar": "Personaggi famosi",
-    "HeaderProducer": "Produttori",
-    "HeaderWriter": "Sceneggiatori",
-    "HeaderParentalRatings": "Valutazioni genitori",
-    "HeaderCommunityRatings": "Valutazione Comunity",
-    "StartupEmbyServerIsLoading": "Emby server si sta avviando. Riprova tra un po"
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/kk.json b/MediaBrowser.Server.Implementations/Localization/Core/kk.json
deleted file mode 100644
index 93252c30b..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/kk.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Emby Server \u0434\u0435\u0440\u0435\u043a\u049b\u043e\u0440\u044b\u04a3\u044b\u0437\u0434\u044b\u04a3 \u0436\u0430\u04a3\u0493\u044b\u0440\u0442\u044b\u043b\u0443\u044b\u043d \u043a\u04af\u0442\u0435 \u0442\u04b1\u0440\u044b\u04a3\u044b\u0437. {0} % \u0430\u044f\u049b\u0442\u0430\u043b\u0434\u044b.",
-    "AppDeviceValues": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430: {0}, \u049a\u04b1\u0440\u044b\u043b\u0493\u044b: {1}",
-    "UserDownloadingItemWithValues": "{0} \u043c\u044b\u043d\u0430\u043d\u044b \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443\u0434\u0430: {1}",
-    "FolderTypeMixed": "\u0410\u0440\u0430\u043b\u0430\u0441 \u043c\u0430\u0437\u043c\u04b1\u043d",
-    "FolderTypeMovies": "\u041a\u0438\u043d\u043e",
-    "FolderTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
-    "FolderTypeAdultVideos": "\u0415\u0440\u0435\u0441\u0435\u043a\u0442\u0456\u043a \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440",
-    "FolderTypePhotos": "\u0424\u043e\u0442\u043e\u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440",
-    "FolderTypeMusicVideos": "\u041c\u0443\u0437\u044b\u043a\u0430\u043b\u044b\u049b \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440",
-    "FolderTypeHomeVideos": "\u04ae\u0439 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440\u0456",
-    "FolderTypeGames": "\u041e\u0439\u044b\u043d\u0434\u0430\u0440",
-    "FolderTypeBooks": "\u041a\u0456\u0442\u0430\u043f\u0442\u0430\u0440",
-    "FolderTypeTvShows": "\u0422\u0414",
-    "FolderTypeInherit": "\u041c\u04b1\u0440\u0430\u0493\u0430 \u0438\u0435\u043b\u0435\u043d\u0443",
-    "HeaderCastCrew": "\u0421\u043e\u043c\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440 \u043c\u0435\u043d \u0442\u04af\u0441\u0456\u0440\u0443\u0448\u0456\u043b\u0435\u0440",
-    "HeaderPeople": "\u0410\u0434\u0430\u043c\u0434\u0430\u0440",
-    "ValueSpecialEpisodeName": "\u0410\u0440\u043d\u0430\u0439\u044b - {0}",
-    "LabelChapterName": "{0}-\u0441\u0430\u0445\u043d\u0430",
-    "NameSeasonNumber": "{0}-\u0441\u0435\u0437\u043e\u043d",
-    "LabelExit": "\u0428\u044b\u0493\u0443",
-    "LabelVisitCommunity": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b\u049b\u0430 \u0431\u0430\u0440\u0443",
-    "LabelGithub": "GitHub \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0439\u0456",
-    "LabelApiDocumentation": "API \u049b\u04b1\u0436\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b",
-    "LabelDeveloperResources": "\u0416\u0430\u0441\u0430\u049b\u0442\u0430\u0443\u0448\u044b \u043a\u04e9\u0437\u0434\u0435\u0440\u0456",
-    "LabelBrowseLibrary": "\u0422\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u043d\u044b \u0448\u043e\u043b\u0443",
-    "LabelConfigureServer": "Emby \u0442\u0435\u04a3\u0448\u0435\u0443",
-    "LabelRestartServer": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443",
-    "CategorySync": "\u04ae\u043d\u0434\u0435\u0441\u0442\u0456\u0440\u0443",
-    "CategoryUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b",
-    "CategorySystem": "\u0416\u04af\u0439\u0435",
-    "CategoryApplication": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430",
-    "CategoryPlugin": "\u041f\u043b\u0430\u0433\u0438\u043d",
-    "NotificationOptionPluginError": "\u041f\u043b\u0430\u0433\u0438\u043d \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
-    "NotificationOptionApplicationUpdateAvailable": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430 \u0436\u0430\u04a3\u0430\u0440\u0442\u0443\u044b \u049b\u043e\u043b \u0436\u0435\u0442\u0456\u043c\u0434\u0456",
-    "NotificationOptionApplicationUpdateInstalled": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430 \u0436\u0430\u04a3\u0430\u0440\u0442\u0443\u044b \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
-    "NotificationOptionPluginUpdateInstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u0436\u0430\u04a3\u0430\u0440\u0442\u0443\u044b \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
-    "NotificationOptionPluginInstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
-    "NotificationOptionPluginUninstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u043e\u0440\u043d\u0430\u0442\u0443\u044b \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0434\u044b",
-    "NotificationOptionVideoPlayback": "\u0411\u0435\u0439\u043d\u0435 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0431\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
-    "NotificationOptionAudioPlayback": "\u0414\u044b\u0431\u044b\u0441 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0431\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
-    "NotificationOptionGamePlayback": "\u041e\u0439\u044b\u043d \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0431\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
-    "NotificationOptionVideoPlaybackStopped": "\u0411\u0435\u0439\u043d\u0435 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0442\u043e\u049b\u0442\u0430\u0442\u044b\u043b\u0434\u044b",
-    "NotificationOptionAudioPlaybackStopped": "\u0414\u044b\u0431\u044b\u0441 \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0442\u043e\u049b\u0442\u0430\u0442\u044b\u043b\u0434\u044b",
-    "NotificationOptionGamePlaybackStopped": "\u041e\u0439\u044b\u043d \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0442\u043e\u049b\u0442\u0430\u0442\u044b\u043b\u0434\u044b",
-    "NotificationOptionTaskFailed": "\u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
-    "NotificationOptionInstallationFailed": "\u041e\u0440\u043d\u0430\u0442\u0443 \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
-    "NotificationOptionNewLibraryContent": "\u0416\u0430\u04a3\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d \u04af\u0441\u0442\u0435\u043b\u0433\u0435\u043d",
-    "NotificationOptionNewLibraryContentMultiple": "\u0416\u0430\u04a3\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d \u049b\u043e\u0441\u044b\u043b\u0434\u044b (\u043a\u04e9\u043f\u0442\u0435\u0433\u0435\u043d)",
-    "NotificationOptionCameraImageUploaded": "\u041a\u0430\u043c\u0435\u0440\u0430\u0434\u0430\u043d \u0444\u043e\u0442\u043e\u0441\u0443\u0440\u0435\u0442 \u043a\u0435\u0440\u0456 \u049b\u043e\u0442\u0430\u0440\u044b\u043b\u0493\u0430\u043d",
-    "NotificationOptionUserLockedOut": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u049b\u04b1\u0440\u0441\u0430\u0443\u043b\u044b",
-    "NotificationOptionServerRestartRequired": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443 \u049b\u0430\u0436\u0435\u0442",
-    "ViewTypePlaylists": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0434\u0435\u0440\u0456",
-    "ViewTypeMovies": "\u041a\u0438\u043d\u043e",
-    "ViewTypeTvShows": "\u0422\u0414",
-    "ViewTypeGames": "\u041e\u0439\u044b\u043d\u0434\u0430\u0440",
-    "ViewTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
-    "ViewTypeMusicGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
-    "ViewTypeMusicArtists": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440",
-    "ViewTypeBoxSets": "\u0416\u0438\u044b\u043d\u0442\u044b\u049b\u0442\u0430\u0440",
-    "ViewTypeChannels": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440",
-    "ViewTypeLiveTV": "\u042d\u0444\u0438\u0440\u043b\u0456\u043a \u0422\u0414",
-    "ViewTypeLiveTvNowPlaying": "\u042d\u0444\u0438\u0440\u0434\u0435",
-    "ViewTypeLatestGames": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u043e\u0439\u044b\u043d\u0434\u0430\u0440",
-    "ViewTypeRecentlyPlayedGames": "\u0416\u0430\u049b\u044b\u043d\u0434\u0430 \u043e\u0439\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d\u0434\u0430\u0440",
-    "ViewTypeGameFavorites": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b\u043b\u0430\u0440",
-    "ViewTypeGameSystems": "\u041e\u0439\u044b\u043d \u0436\u04af\u0439\u0435\u043b\u0435\u0440\u0456",
-    "ViewTypeGameGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
-    "ViewTypeTvResume": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u043c\u0430\u043b\u044b",
-    "ViewTypeTvNextUp": "\u041a\u0435\u0437\u0435\u043a\u0442\u0456",
-    "ViewTypeTvLatest": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456",
-    "ViewTypeTvShowSeries": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043b\u0430\u0440",
-    "ViewTypeTvGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
-    "ViewTypeTvFavoriteSeries": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0442\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043b\u0430\u0440",
-    "ViewTypeTvFavoriteEpisodes": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0431\u04e9\u043b\u0456\u043c\u0434\u0435\u0440",
-    "ViewTypeMovieResume": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u043c\u0430\u043b\u044b",
-    "ViewTypeMovieLatest": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456",
-    "ViewTypeMovieMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
-    "ViewTypeMovieCollections": "\u0416\u0438\u044b\u043d\u0442\u044b\u049b\u0442\u0430\u0440",
-    "ViewTypeMovieFavorites": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b\u043b\u0430\u0440",
-    "ViewTypeMovieGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
-    "ViewTypeMusicLatest": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456",
-    "ViewTypeMusicPlaylists": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0434\u0435\u0440\u0456",
-    "ViewTypeMusicAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440",
-    "ViewTypeMusicAlbumArtists": "\u0410\u043b\u044c\u0431\u043e\u043c \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440\u044b",
-    "HeaderOtherDisplaySettings": "\u0411\u0435\u0439\u043d\u0435\u043b\u0435\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456",
-    "ViewTypeMusicSongs": "\u04d8\u0443\u0435\u043d\u0434\u0435\u0440",
-    "ViewTypeMusicFavorites": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b\u043b\u0430\u0440",
-    "ViewTypeMusicFavoriteAlbums": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0430\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440",
-    "ViewTypeMusicFavoriteArtists": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440",
-    "ViewTypeMusicFavoriteSongs": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u04d9\u0443\u0435\u043d\u0434\u0435\u0440",
-    "ViewTypeFolders": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
-    "ViewTypeLiveTvRecordingGroups": "\u0416\u0430\u0437\u0431\u0430\u043b\u0430\u0440",
-    "ViewTypeLiveTvChannels": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440",
-    "ScheduledTaskFailedWithName": "{0} \u0441\u04d9\u0442\u0441\u0456\u0437",
-    "LabelRunningTimeValue": "\u0406\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0443 \u0443\u0430\u049b\u044b\u0442\u044b: {0}",
-    "ScheduledTaskStartedWithName": "{0} \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0434\u044b",
-    "VersionNumber": "\u041d\u04b1\u0441\u049b\u0430\u0441\u044b: {0}",
-    "PluginInstalledWithName": "{0} \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
-    "PluginUpdatedWithName": "{0} \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
-    "PluginUninstalledWithName": "{0} \u0436\u043e\u0439\u044b\u043b\u0434\u044b",
-    "ItemAddedWithName": "{0} (\u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u0493\u0430 \u04af\u0441\u0442\u0435\u043b\u0456\u043d\u0434\u0456)",
-    "ItemRemovedWithName": "{0} (\u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u0434\u0430\u043d \u0430\u043b\u0430\u0441\u0442\u0430\u043b\u0434\u044b)",
-    "LabelIpAddressValue": "IP \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b: {0}",
-    "DeviceOnlineWithName": "{0} \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d",
-    "UserOnlineFromDevice": "{0} - {1} \u0430\u0440\u049b\u044b\u043b\u044b \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d",
-    "ProviderValue": "\u0416\u0435\u0442\u043a\u0456\u0437\u0443\u0448\u0456: {0}",
-    "SubtitlesDownloadedForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 {0} \u04af\u0448\u0456\u043d \u0436\u04af\u043a\u0442\u0435\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0434\u044b",
-    "UserConfigurationUpdatedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u04af\u0448\u0456\u043d \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
-    "UserCreatedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u0436\u0430\u0441\u0430\u043b\u0493\u0430\u043d",
-    "UserPasswordChangedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u04af\u0448\u0456\u043d \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437 \u04e9\u0437\u0433\u0435\u0440\u0442\u0456\u043b\u0434\u0456",
-    "UserDeletedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u0436\u043e\u0439\u044b\u043b\u0493\u0430\u043d",
-    "MessageServerConfigurationUpdated": "\u0421\u0435\u0440\u0432\u0435\u0440 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456 \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
-    "MessageNamedServerConfigurationUpdatedWithValue": "\u0421\u0435\u0440\u0432\u0435\u0440 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456 ({0} \u0431\u04e9\u043b\u0456\u043c\u0456) \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
-    "MessageApplicationUpdated": "Emby Server \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b.",
-    "FailedLoginAttemptWithUserName": "{0} \u043a\u0456\u0440\u0443 \u04d9\u0440\u0435\u043a\u0435\u0442\u0456 \u0441\u04d9\u0442\u0441\u0456\u0437",
-    "AuthenticationSucceededWithUserName": "{0} \u0442\u04af\u043f\u043d\u04b1\u0441\u049b\u0430\u043b\u044b\u0493\u044b\u043d \u0440\u0430\u0441\u0442\u0430\u043b\u0443\u044b \u0441\u04d9\u0442\u0442\u0456",
-    "DeviceOfflineWithName": "{0} \u0430\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
-    "UserLockedOutWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u049b\u04b1\u0440\u0441\u0430\u0443\u043b\u044b",
-    "UserOfflineFromDevice": "{0} - {1} \u0430\u0440\u049b\u044b\u043b\u044b \u0430\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
-    "UserStartedPlayingItemWithValues": "{0} - {1} \u043e\u0439\u043d\u0430\u0442\u0443\u044b\u043d \u0431\u0430\u0441\u0442\u0430\u0434\u044b",
-    "UserStoppedPlayingItemWithValues": "{0} - {1} \u043e\u0439\u043d\u0430\u0442\u0443\u044b\u043d \u0442\u043e\u049b\u0442\u0430\u0442\u0442\u044b",
-    "SubtitleDownloadFailureForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 {0} \u04af\u0448\u0456\u043d \u0436\u04af\u043a\u0442\u0435\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0443\u044b \u0441\u04d9\u0442\u0441\u0456\u0437",
-    "HeaderUnidentified": "\u0410\u043d\u044b\u049b\u0442\u0430\u043b\u043c\u0430\u0493\u0430\u043d",
-    "HeaderImagePrimary": "\u041d\u0435\u0433\u0456\u0437\u0433\u0456",
-    "HeaderImageBackdrop": "\u0410\u0440\u0442\u049b\u044b \u0441\u0443\u0440\u0435\u0442",
-    "HeaderImageLogo": "\u041b\u043e\u0433\u043e\u0442\u0438\u043f",
-    "HeaderUserPrimaryImage": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u0441\u0443\u0440\u0435\u0442\u0456",
-    "HeaderOverview": "\u0416\u0430\u043b\u043f\u044b \u0448\u043e\u043b\u0443",
-    "HeaderShortOverview": "\u049a\u044b\u0441\u049b\u0430\u0448\u0430 \u0448\u043e\u043b\u0443",
-    "HeaderType": "\u0422\u04af\u0440\u0456",
-    "HeaderSeverity": "\u049a\u0438\u044b\u043d\u0434\u044b\u0493\u044b",
-    "HeaderUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b",
-    "HeaderName": "\u0410\u0442\u044b",
-    "HeaderDate": "\u041a\u04af\u043d\u0456",
-    "HeaderPremiereDate": "\u0422\u04b1\u0441\u0430\u0443\u043a\u0435\u0441\u0435\u0440 \u043a\u04af\u043d\u0456",
-    "HeaderDateAdded": "\u04ae\u0441\u0442\u0435\u043b\u0433\u0435\u043d \u043a\u04af\u043d\u0456",
-    "HeaderReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d\u0456",
-    "HeaderRuntime": "\u04b0\u0437\u0430\u049b\u0442\u044b\u0493\u044b",
-    "HeaderPlayCount": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0435\u0441\u0435\u0431\u0456",
-    "HeaderSeason": "\u041c\u0430\u0443\u0441\u044b\u043c",
-    "HeaderSeasonNumber": "\u041c\u0430\u0443\u0441\u044b\u043c \u043d\u04e9\u043c\u0456\u0440\u0456",
-    "HeaderSeries": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043b\u0430\u0440",
-    "HeaderNetwork": "\u0422\u0435\u043b\u0435\u0436\u0435\u043b\u0456",
-    "HeaderYear": "\u0416\u044b\u043b:",
-    "HeaderYears": "\u0416\u044b\u043b\u0434\u0430\u0440:",
-    "HeaderParentalRating": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b",
-    "HeaderCommunityRating": "\u049a\u0430\u0443\u044b\u043c \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u044b",
-    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
-    "HeaderSpecials": "\u0410\u0440\u043d\u0430\u0439\u044b \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u0434\u0430\u0440",
-    "HeaderGameSystems": "\u041e\u0439\u044b\u043d \u0436\u04af\u0439\u0435\u043b\u0435\u0440\u0456",
-    "HeaderPlayers": "\u041e\u0439\u044b\u043d\u0448\u044b\u043b\u0430\u0440:",
-    "HeaderAlbumArtists": "\u0410\u043b\u044c\u0431\u043e\u043c \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440\u044b",
-    "HeaderAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440",
-    "HeaderDisc": "\u0414\u0438\u0441\u043a\u0456",
-    "HeaderTrack": "\u0416\u043e\u043b\u0448\u044b\u049b",
-    "HeaderAudio": "\u0414\u044b\u0431\u044b\u0441",
-    "HeaderVideo": "\u0411\u0435\u0439\u043d\u0435",
-    "HeaderEmbeddedImage": "\u0415\u043d\u0434\u0456\u0440\u0456\u043b\u0433\u0435\u043d \u0441\u0443\u0440\u0435\u0442",
-    "HeaderResolution": "\u0410\u0436\u044b\u0440\u0430\u0442\u044b\u043c\u0434\u044b\u043b\u044b\u0493\u044b",
-    "HeaderSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
-    "HeaderGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
-    "HeaderCountries": "\u0415\u043b\u0434\u0435\u0440",
-    "HeaderStatus": "\u041a\u04af\u0439",
-    "HeaderTracks": "\u0416\u043e\u043b\u0448\u044b\u049b\u0442\u0430\u0440",
-    "HeaderMusicArtist": "\u041c\u0443\u0437\u044b\u043a\u0430 \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b",
-    "HeaderLocked": "\u049a\u04b1\u043b\u044b\u043f\u0442\u0430\u043b\u0493\u0430\u043d",
-    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0438\u044f\u043b\u0430\u0440",
-    "HeaderActor": "\u0410\u043a\u0442\u0435\u0440\u043b\u0435\u0440",
-    "HeaderComposer": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u043b\u0430\u0440",
-    "HeaderDirector": "\u0420\u0435\u0436\u0438\u0441\u0441\u0435\u0440\u043b\u0435\u0440",
-    "HeaderGuestStar": "\u0428\u0430\u049b\u044b\u0440\u044b\u043b\u0493\u0430\u043d \u0430\u043a\u0442\u0435\u0440",
-    "HeaderProducer": "\u041f\u0440\u043e\u0434\u044e\u0441\u0435\u0440\u043b\u0435\u0440",
-    "HeaderWriter": "\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0439\u0448\u0456\u043b\u0435\u0440",
-    "HeaderParentalRatings": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u0442\u0430\u0440",
-    "HeaderCommunityRatings": "\u049a\u0430\u0443\u044b\u043c \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u043b\u0430\u0440\u044b",
-    "StartupEmbyServerIsLoading": "Emby Server \u0436\u04af\u043a\u0442\u0435\u043b\u0443\u0434\u0435. \u04d8\u0440\u0435\u043a\u0435\u0442\u0442\u0456 \u043a\u04e9\u043f \u04b1\u0437\u0430\u043c\u0430\u0439 \u049b\u0430\u0439\u0442\u0430\u043b\u0430\u04a3\u044b\u0437."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/ko.json b/MediaBrowser.Server.Implementations/Localization/Core/ko.json
deleted file mode 100644
index 834ccc17b..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/ko.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "\uc571: {0}, \uc7a5\uce58: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "\ud63c\ud569 \ucf58\ud150\ud2b8",
-    "FolderTypeMovies": "\uc601\ud654",
-    "FolderTypeMusic": "\uc74c\uc545",
-    "FolderTypeAdultVideos": "\uc131\uc778 \ube44\ub514\uc624",
-    "FolderTypePhotos": "\uc0ac\uc9c4",
-    "FolderTypeMusicVideos": "\ubba4\uc9c1 \ube44\ub514\uc624",
-    "FolderTypeHomeVideos": "\ud648 \ube44\ub514\uc624",
-    "FolderTypeGames": "\uac8c\uc784",
-    "FolderTypeBooks": "\ucc45",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "\ubc30\uc5ed \ubc0f \uc81c\uc791\uc9c4",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "\ucc55\ud130 {0}",
-    "NameSeasonNumber": "\uc2dc\uc98c {0}",
-    "LabelExit": "\uc885\ub8cc",
-    "LabelVisitCommunity": "\ucee4\ubba4\ub2c8\ud2f0 \ubc29\ubb38",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api \ubb38\uc11c",
-    "LabelDeveloperResources": "\uac1c\ubc1c\uc790 \ub9ac\uc18c\uc2a4",
-    "LabelBrowseLibrary": "\ub77c\uc774\ube0c\ub7ec\ub9ac \ud0d0\uc0c9",
-    "LabelConfigureServer": "Emby \uc124\uc815",
-    "LabelRestartServer": "\uc11c\ubc84 \uc7ac\uc2dc\ub3d9",
-    "CategorySync": "\ub3d9\uae30\ud654",
-    "CategoryUser": "\uc0ac\uc6a9\uc790",
-    "CategorySystem": "\uc2dc\uc2a4\ud15c",
-    "CategoryApplication": "\uc560\ud50c\ub9ac\ucf00\uc774\uc158",
-    "CategoryPlugin": "\ud50c\ub7ec\uadf8\uc778",
-    "NotificationOptionPluginError": "\ud50c\ub7ec\uadf8\uc778 \uc2e4\ud328",
-    "NotificationOptionApplicationUpdateAvailable": "\uc560\ud50c\ub9ac\ucf00\uc774\uc158 \uc5c5\ub370\uc774\ud2b8 \uc0ac\uc6a9 \uac00\ub2a5",
-    "NotificationOptionApplicationUpdateInstalled": "\uc560\ud50c\ub9ac\ucf00\uc774\uc158 \uc5c5\ub370\uc774\ud2b8 \uc124\uce58\ub428",
-    "NotificationOptionPluginUpdateInstalled": "\ud50c\ub7ec\uadf8\uc778 \uc5c5\ub370\uc774\ud2b8 \uc124\uce58\ub428",
-    "NotificationOptionPluginInstalled": "\ud50c\ub7ec\uadf8\uc778 \uc124\uce58\ub428",
-    "NotificationOptionPluginUninstalled": "\ud50c\ub7ec\uadf8\uc778 \uc124\uce58 \uc81c\uac70\ub428",
-    "NotificationOptionVideoPlayback": "\ube44\ub514\uc624 \uc7ac\uc0dd \uc2dc\uc791\ub428",
-    "NotificationOptionAudioPlayback": "\uc624\ub514\uc624 \uc7ac\uc0dd \uc2dc\uc791\ub428",
-    "NotificationOptionGamePlayback": "\uac8c\uc784 \ud50c\ub808\uc774 \uc9c0\uc791\ub428",
-    "NotificationOptionVideoPlaybackStopped": "\ube44\ub514\uc624 \uc7ac\uc0dd \uc911\uc9c0\ub428",
-    "NotificationOptionAudioPlaybackStopped": "\uc624\ub514\uc624 \uc7ac\uc0dd \uc911\uc9c0\ub428",
-    "NotificationOptionGamePlaybackStopped": "\uac8c\uc784 \ud50c\ub808\uc774 \uc911\uc9c0\ub428",
-    "NotificationOptionTaskFailed": "\uc608\uc57d \uc791\uc5c5 \uc2e4\ud328",
-    "NotificationOptionInstallationFailed": "\uc124\uce58 \uc2e4\ud328",
-    "NotificationOptionNewLibraryContent": "\uc0c8 \ucf58\ud150\ud2b8 \ucd94\uac00\ub428",
-    "NotificationOptionNewLibraryContentMultiple": "\uc0c8 \ucf58\ub374\ud2b8 \ucd94\uac00\ub428 (\ubcf5\uc218)",
-    "NotificationOptionCameraImageUploaded": "\uce74\uba54\ub77c \uc774\ubbf8\uc9c0 \uc5c5\ub85c\ub4dc\ub428",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "\uc11c\ubc84\ub97c \ub2e4\uc2dc \uc2dc\uc791\ud558\uc5ec\uc57c \ud569\ub2c8\ub2e4",
-    "ViewTypePlaylists": "\uc7ac\uc0dd\ubaa9\ub85d",
-    "ViewTypeMovies": "\uc601\ud654",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "\uac8c\uc784",
-    "ViewTypeMusic": "\uc74c\uc545",
-    "ViewTypeMusicGenres": "\uc7a5\ub974",
-    "ViewTypeMusicArtists": "\uc544\ud2f0\uc2a4\ud2b8",
-    "ViewTypeBoxSets": "\uceec\ub809\uc158",
-    "ViewTypeChannels": "\ucc44\ub110",
-    "ViewTypeLiveTV": "TV \ubc29\uc1a1",
-    "ViewTypeLiveTvNowPlaying": "\uc9c0\uae08 \ubc29\uc1a1 \uc911",
-    "ViewTypeLatestGames": "\ucd5c\uadfc \uac8c\uc784",
-    "ViewTypeRecentlyPlayedGames": "\ucd5c\uadfc \ud50c\ub808\uc774",
-    "ViewTypeGameFavorites": "\uc990\uaca8\ucc3e\uae30",
-    "ViewTypeGameSystems": "\uac8c\uc784 \uc2dc\uc2a4\ud15c",
-    "ViewTypeGameGenres": "\uc7a5\ub974",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "\uc2dc\ub9ac\uc988",
-    "ViewTypeTvGenres": "\uc7a5\ub974",
-    "ViewTypeTvFavoriteSeries": "\uc88b\uc544\ud558\ub294 \uc2dc\ub9ac\uc988",
-    "ViewTypeTvFavoriteEpisodes": "\uc88b\uc544\ud558\ub294 \uc5d0\ud53c\uc18c\ub4dc",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "\uc601\ud654",
-    "ViewTypeMovieCollections": "\uceec\ub809\uc158",
-    "ViewTypeMovieFavorites": "\uc990\uaca8\ucc3e\uae30",
-    "ViewTypeMovieGenres": "\uc7a5\ub974",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "\uc7ac\uc0dd\ubaa9\ub85d",
-    "ViewTypeMusicAlbums": "\uc568\ubc94",
-    "ViewTypeMusicAlbumArtists": "\uc568\ubc94 \uc544\ud2f0\uc2a4\ud2b8",
-    "HeaderOtherDisplaySettings": "\ud654\uba74 \uc124\uc815",
-    "ViewTypeMusicSongs": "\ub178\ub798",
-    "ViewTypeMusicFavorites": "\uc990\uaca8\ucc3e\uae30",
-    "ViewTypeMusicFavoriteAlbums": "\uc88b\uc544\ud558\ub294 \uc568\ubc94",
-    "ViewTypeMusicFavoriteArtists": "\uc88b\uc544\ud558\ub294 \uc544\ud2f0\uc2a4\ud2b8",
-    "ViewTypeMusicFavoriteSongs": "\uc88b\uc544\ud558\ub294 \ub178\ub798",
-    "ViewTypeFolders": "\ud3f4\ub354",
-    "ViewTypeLiveTvRecordingGroups": "\ub179\ud654",
-    "ViewTypeLiveTvChannels": "\ucc44\ub110",
-    "ScheduledTaskFailedWithName": "{0} \uc2e4\ud328",
-    "LabelRunningTimeValue": "\uc0c1\uc601 \uc2dc\uac04: {0}",
-    "ScheduledTaskStartedWithName": "{0} \uc2dc\uc791\ub428",
-    "VersionNumber": "\ubc84\uc804 {0}",
-    "PluginInstalledWithName": "{0} \uc124\uce58\ub428",
-    "PluginUpdatedWithName": "{0} \uc5c5\ub370\uc774\ud2b8\ub428",
-    "PluginUninstalledWithName": "{0} \uc124\uce58 \uc81c\uac70\ub428",
-    "ItemAddedWithName": "\ub77c\uc774\ube0c\ub7ec\ub9ac\uc5d0 {0} \ucd94\uac00\ub428",
-    "ItemRemovedWithName": "\ub77c\uc774\ube0c\ub7ec\ub9ac\uc5d0\uc11c {0} \uc0ad\uc81c\ub428",
-    "LabelIpAddressValue": "IP \uc8fc\uc18c: {0}",
-    "DeviceOnlineWithName": "{0} \uc5f0\uacb0\ub428",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "\uc81c\uacf5\uc790: {0}",
-    "SubtitlesDownloadedForItem": "{0} \uc790\ub9c9 \ub2e4\uc6b4\ub85c\ub4dc\ub428",
-    "UserConfigurationUpdatedWithName": "{0} \uc0ac\uc6a9\uc790 \uc124\uc815\uc774 \uc5c5\ub370\uc774\ud2b8\ub428",
-    "UserCreatedWithName": "\uc0ac\uc6a9\uc790 {0} \uc0dd\uc131\ub428",
-    "UserPasswordChangedWithName": "\uc0ac\uc6a9\uc790 {0} \ube44\ubc00\ubc88\ud638 \ubcc0\uacbd\ub428",
-    "UserDeletedWithName": "\uc0ac\uc6a9\uc790 {0} \uc0ad\uc81c\ub428",
-    "MessageServerConfigurationUpdated": "\uc11c\ubc84 \ud658\uacbd \uc124\uc815 \uc5c5\ub370\uc774\ub4dc\ub428",
-    "MessageNamedServerConfigurationUpdatedWithValue": "\uc11c\ubc84 \ud658\uacbd \uc124\uc815 {0} \uc139\uc158 \uc5c5\ub370\uc774\ud2b8 \ub428",
-    "MessageApplicationUpdated": "Emby \uc11c\ubc84 \uc5c5\ub370\uc774\ud2b8\ub428",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} \uc5f0\uacb0 \ud574\uc81c\ub428",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{1} \uc5d0\uc11c {0} \uc5f0\uacb0 \ud574\uc81c\ub428",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "{0} \uc790\ub9c9 \ub2e4\uc6b4\ub85c\ub4dc \uc2e4\ud328",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "\ubc30\uacbd",
-    "HeaderImageLogo": "\ub85c\uace0",
-    "HeaderUserPrimaryImage": "\uc0ac\uc6a9\uc790 \uc774\ubbf8\uc9c0",
-    "HeaderOverview": "\uc904\uac70\ub9ac",
-    "HeaderShortOverview": "\uac04\ub7b5 \uc904\uac70\ub9ac",
-    "HeaderType": "Type",
-    "HeaderSeverity": "\uc2ec\uac01\ub3c4",
-    "HeaderUser": "\uc0ac\uc6a9\uc790",
-    "HeaderName": "Name",
-    "HeaderDate": "\ub0a0\uc9dc",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "\uac1c\ubd09\uc77c",
-    "HeaderRuntime": "\uc0c1\uc601 \uc2dc\uac04",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "\uc2dc\uc98c",
-    "HeaderSeasonNumber": "\uc2dc\uc98c \ubc88\ud638",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "\ub124\ud2b8\uc6cc\ud06c",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "\ucee4\ubba4\ub2c8\ud2f0 \ud3c9\uc810",
-    "HeaderTrailers": "\uc608\uace0\ud3b8",
-    "HeaderSpecials": "\uc2a4\ud398\uc15c",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "\uc568\ubc94",
-    "HeaderDisc": "\ub514\uc2a4\ud06c",
-    "HeaderTrack": "\ud2b8\ub799",
-    "HeaderAudio": "\uc624\ub514\uc624",
-    "HeaderVideo": "\ube44\ub514\uc624",
-    "HeaderEmbeddedImage": "\ub0b4\uc7a5 \uc774\ubbf8\uc9c0",
-    "HeaderResolution": "\ud574\uc0c1\ub3c4",
-    "HeaderSubtitles": "\uc790\ub9c9",
-    "HeaderGenres": "\uc7a5\ub974",
-    "HeaderCountries": "\uad6d\uac00",
-    "HeaderStatus": "\uc0c1\ud0dc",
-    "HeaderTracks": "\ud2b8\ub799",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "\uc7a0\uae40",
-    "HeaderStudios": "\uc2a4\ud29c\ub514\uc624",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "\uc790\ub140 \ubcf4\ud638 \ub4f1\uae09",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/ms.json b/MediaBrowser.Server.Implementations/Localization/Core/ms.json
deleted file mode 100644
index fe5eef894..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/ms.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Tutup",
-    "LabelVisitCommunity": "Melawat Masyarakat",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Imbas Pengumpulan",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "Restart Server",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/nb.json b/MediaBrowser.Server.Implementations/Localization/Core/nb.json
deleted file mode 100644
index 315d49b5f..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/nb.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0} , Device: {1}",
-    "UserDownloadingItemWithValues": "{0} laster ned {1}",
-    "FolderTypeMixed": "Forskjellig innhold",
-    "FolderTypeMovies": "Filmer",
-    "FolderTypeMusic": "Musikk",
-    "FolderTypeAdultVideos": "Voksen-videoer",
-    "FolderTypePhotos": "Foto",
-    "FolderTypeMusicVideos": "Musikk-videoer",
-    "FolderTypeHomeVideos": "Hjemme-videoer",
-    "FolderTypeGames": "Spill",
-    "FolderTypeBooks": "B\u00f8ker",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Arve",
-    "HeaderCastCrew": "Mannskap",
-    "HeaderPeople": "Personer",
-    "ValueSpecialEpisodeName": "Spesiell - {0}",
-    "LabelChapterName": "Kapittel {0}",
-    "NameSeasonNumber": "Sesong {0}",
-    "LabelExit": "Avslutt",
-    "LabelVisitCommunity": "Bes\u00f8k oss",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "API-dokumentasjon",
-    "LabelDeveloperResources": "Ressurser for Utviklere",
-    "LabelBrowseLibrary": "Browse biblioteket",
-    "LabelConfigureServer": "Konfigurer Emby",
-    "LabelRestartServer": "Restart serveren",
-    "CategorySync": "Synk",
-    "CategoryUser": "Bruker",
-    "CategorySystem": "System",
-    "CategoryApplication": "Applikasjon",
-    "CategoryPlugin": "Programtillegg",
-    "NotificationOptionPluginError": "Programtillegg feilet",
-    "NotificationOptionApplicationUpdateAvailable": "Oppdatering tilgjengelig",
-    "NotificationOptionApplicationUpdateInstalled": "Oppdatering installert",
-    "NotificationOptionPluginUpdateInstalled": "Oppdatert programtillegg installert",
-    "NotificationOptionPluginInstalled": "Programtillegg installert",
-    "NotificationOptionPluginUninstalled": "Programtillegg er fjernet",
-    "NotificationOptionVideoPlayback": "Videoavspilling startet",
-    "NotificationOptionAudioPlayback": "Lydavspilling startet",
-    "NotificationOptionGamePlayback": "Spill startet",
-    "NotificationOptionVideoPlaybackStopped": "Videoavspilling stoppet",
-    "NotificationOptionAudioPlaybackStopped": "Lydavspilling stoppet",
-    "NotificationOptionGamePlaybackStopped": "Spill stoppet",
-    "NotificationOptionTaskFailed": "Planlagt oppgave feilet",
-    "NotificationOptionInstallationFailed": "Installasjon feilet",
-    "NotificationOptionNewLibraryContent": "Nytt innhold er lagt til",
-    "NotificationOptionNewLibraryContentMultiple": "Nytt innhold lagt til (flere)",
-    "NotificationOptionCameraImageUploaded": "Bilde fra kamera lastet opp",
-    "NotificationOptionUserLockedOut": "Bruker er utestengt",
-    "NotificationOptionServerRestartRequired": "Server m\u00e5 startes p\u00e5 nytt",
-    "ViewTypePlaylists": "Spillelister",
-    "ViewTypeMovies": "Filmer",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Spill",
-    "ViewTypeMusic": "Musikk",
-    "ViewTypeMusicGenres": "Sjangere",
-    "ViewTypeMusicArtists": "Artist",
-    "ViewTypeBoxSets": "Samlinger",
-    "ViewTypeChannels": "Kanaler",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Sendes n\u00e5",
-    "ViewTypeLatestGames": "Siste spill",
-    "ViewTypeRecentlyPlayedGames": "Nylig spilt",
-    "ViewTypeGameFavorites": "Favoritter",
-    "ViewTypeGameSystems": "Spillsystemer",
-    "ViewTypeGameGenres": "Sjangere",
-    "ViewTypeTvResume": "Fortsette",
-    "ViewTypeTvNextUp": "Neste",
-    "ViewTypeTvLatest": "Siste",
-    "ViewTypeTvShowSeries": "Serier",
-    "ViewTypeTvGenres": "Sjangere",
-    "ViewTypeTvFavoriteSeries": "Favoritt serier",
-    "ViewTypeTvFavoriteEpisodes": "Favoritt episoder",
-    "ViewTypeMovieResume": "Fortsette",
-    "ViewTypeMovieLatest": "Siste",
-    "ViewTypeMovieMovies": "Filmer",
-    "ViewTypeMovieCollections": "Samlinger",
-    "ViewTypeMovieFavorites": "Favoritter",
-    "ViewTypeMovieGenres": "Sjangere",
-    "ViewTypeMusicLatest": "Siste",
-    "ViewTypeMusicPlaylists": "Spillelister",
-    "ViewTypeMusicAlbums": "Albumer",
-    "ViewTypeMusicAlbumArtists": "Album artister",
-    "HeaderOtherDisplaySettings": "Visnings Innstillinger",
-    "ViewTypeMusicSongs": "Sanger",
-    "ViewTypeMusicFavorites": "Favoritter",
-    "ViewTypeMusicFavoriteAlbums": "Favorittalbumer",
-    "ViewTypeMusicFavoriteArtists": "Favorittartister",
-    "ViewTypeMusicFavoriteSongs": "Favorittsanger",
-    "ViewTypeFolders": "Mapper",
-    "ViewTypeLiveTvRecordingGroups": "Opptak",
-    "ViewTypeLiveTvChannels": "Kanaler",
-    "ScheduledTaskFailedWithName": "{0} feilet",
-    "LabelRunningTimeValue": "Spille tide: {0}",
-    "ScheduledTaskStartedWithName": "{0} startet",
-    "VersionNumber": "Versjon {0}",
-    "PluginInstalledWithName": "{0} ble installert",
-    "PluginUpdatedWithName": "{0} ble oppdatert",
-    "PluginUninstalledWithName": "{0} ble avinstallert",
-    "ItemAddedWithName": "{0} ble lagt til biblioteket",
-    "ItemRemovedWithName": "{0} ble fjernet fra biblioteket",
-    "LabelIpAddressValue": "Ip adresse: {0}",
-    "DeviceOnlineWithName": "{0} er tilkoblet",
-    "UserOnlineFromDevice": "{0} er online fra {1}",
-    "ProviderValue": "Tilbyder: {0}",
-    "SubtitlesDownloadedForItem": "Undertekster lastet ned for {0}",
-    "UserConfigurationUpdatedWithName": "Bruker konfigurasjon har blitt oppdatert for {0}",
-    "UserCreatedWithName": "Bruker {0} har blitt opprettet",
-    "UserPasswordChangedWithName": "Passord har blitt endret for bruker {0}",
-    "UserDeletedWithName": "Bruker {0} har blitt slettet",
-    "MessageServerConfigurationUpdated": "Server konfigurasjon har blitt oppdatert",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server konfigurasjon seksjon {0} har blitt oppdatert",
-    "MessageApplicationUpdated": "Emby server har blitt oppdatert",
-    "FailedLoginAttemptWithUserName": "P\u00e5loggingsfors\u00f8k feilet fra {0}",
-    "AuthenticationSucceededWithUserName": "{0} autentisert med suksess",
-    "DeviceOfflineWithName": "{0} har koblet fra",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} har koblet fra {1}",
-    "UserStartedPlayingItemWithValues": "{0} har startet avspilling av {1}",
-    "UserStoppedPlayingItemWithValues": "{0} har stoppet avspilling av {1}",
-    "SubtitleDownloadFailureForItem": "nedlasting av undertekster feilet for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "Bruker",
-    "HeaderName": "Navn",
-    "HeaderDate": "Dato",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Utgivelsesdato",
-    "HeaderRuntime": "Spilletid",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Sesong",
-    "HeaderSeasonNumber": "Sesong nummer",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Nettverk",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Fellesskap anmeldelse",
-    "HeaderTrailers": "Trailere",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albumer",
-    "HeaderDisc": "Disk",
-    "HeaderTrack": "Spor",
-    "HeaderAudio": "Lyd",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "innebygd bilde",
-    "HeaderResolution": "Oppl\u00f8sning",
-    "HeaderSubtitles": "Undertekster",
-    "HeaderGenres": "Sjanger",
-    "HeaderCountries": "Land",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Spor",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studioer",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Foreldresensur",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/nl.json b/MediaBrowser.Server.Implementations/Localization/Core/nl.json
deleted file mode 100644
index 2818fbf6a..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/nl.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Een ogenblik geduld terwijl uw Emby Server-database wordt bijgewerkt. {0}% voltooid.",
-    "AppDeviceValues": "App: {0}, Apparaat: {1}",
-    "UserDownloadingItemWithValues": "{0} download {1}",
-    "FolderTypeMixed": "Gemengde inhoud",
-    "FolderTypeMovies": "Films",
-    "FolderTypeMusic": "Muziek",
-    "FolderTypeAdultVideos": "Adult video's",
-    "FolderTypePhotos": "Foto's",
-    "FolderTypeMusicVideos": "Muziek video's",
-    "FolderTypeHomeVideos": "Thuis video's",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Boeken",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "overerven",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "Personen",
-    "ValueSpecialEpisodeName": "Speciaal - {0}",
-    "LabelChapterName": "Hoofdstuk {0}",
-    "NameSeasonNumber": "Seizoen {0}",
-    "LabelExit": "Afsluiten",
-    "LabelVisitCommunity": "Bezoek Gemeenschap",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api documentatie",
-    "LabelDeveloperResources": "Ontwikkelaars bronnen",
-    "LabelBrowseLibrary": "Bekijk bibliotheek",
-    "LabelConfigureServer": "Emby Configureren",
-    "LabelRestartServer": "Server herstarten",
-    "CategorySync": "Sync",
-    "CategoryUser": "Gebruiker",
-    "CategorySystem": "Systeem",
-    "CategoryApplication": "Toepassing",
-    "CategoryPlugin": "Plug-in",
-    "NotificationOptionPluginError": "Plug-in fout",
-    "NotificationOptionApplicationUpdateAvailable": "Programma-update beschikbaar",
-    "NotificationOptionApplicationUpdateInstalled": "Programma-update ge\u00efnstalleerd",
-    "NotificationOptionPluginUpdateInstalled": "Plug-in-update ge\u00efnstalleerd",
-    "NotificationOptionPluginInstalled": "Plug-in ge\u00efnstalleerd",
-    "NotificationOptionPluginUninstalled": "Plug-in verwijderd",
-    "NotificationOptionVideoPlayback": "Video afspelen gestart",
-    "NotificationOptionAudioPlayback": "Geluid afspelen gestart",
-    "NotificationOptionGamePlayback": "Game gestart",
-    "NotificationOptionVideoPlaybackStopped": "Video afspelen gestopt",
-    "NotificationOptionAudioPlaybackStopped": "Geluid afspelen gestopt",
-    "NotificationOptionGamePlaybackStopped": "Afspelen spel gestopt",
-    "NotificationOptionTaskFailed": "Mislukken van de geplande taak",
-    "NotificationOptionInstallationFailed": "Mislukken van de installatie",
-    "NotificationOptionNewLibraryContent": "Nieuwe content toegevoegd",
-    "NotificationOptionNewLibraryContentMultiple": "Nieuwe content toegevoegd (meerdere)",
-    "NotificationOptionCameraImageUploaded": "Camera afbeelding ge\u00fcpload",
-    "NotificationOptionUserLockedOut": "Gebruikersaccount vergrendeld",
-    "NotificationOptionServerRestartRequired": "Server herstart nodig",
-    "ViewTypePlaylists": "Afspeellijsten",
-    "ViewTypeMovies": "Films",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Muziek",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artiesten",
-    "ViewTypeBoxSets": "Collecties",
-    "ViewTypeChannels": "Kanalen",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Nu uitgezonden",
-    "ViewTypeLatestGames": "Nieuwste games",
-    "ViewTypeRecentlyPlayedGames": "Recent gespeelt",
-    "ViewTypeGameFavorites": "Favorieten",
-    "ViewTypeGameSystems": "Game systemen",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Hervatten",
-    "ViewTypeTvNextUp": "Volgende",
-    "ViewTypeTvLatest": "Nieuwste",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favoriete Series",
-    "ViewTypeTvFavoriteEpisodes": "Favoriete Afleveringen",
-    "ViewTypeMovieResume": "Hervatten",
-    "ViewTypeMovieLatest": "Nieuwste",
-    "ViewTypeMovieMovies": "Films",
-    "ViewTypeMovieCollections": "Collecties",
-    "ViewTypeMovieFavorites": "Favorieten",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Nieuwste",
-    "ViewTypeMusicPlaylists": "Afspeellijsten",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album artiesten",
-    "HeaderOtherDisplaySettings": "Beeld instellingen",
-    "ViewTypeMusicSongs": "Nummers",
-    "ViewTypeMusicFavorites": "Favorieten",
-    "ViewTypeMusicFavoriteAlbums": "Favoriete albums",
-    "ViewTypeMusicFavoriteArtists": "Favoriete artiesten",
-    "ViewTypeMusicFavoriteSongs": "Favoriete nummers",
-    "ViewTypeFolders": "Mappen",
-    "ViewTypeLiveTvRecordingGroups": "Opnamen",
-    "ViewTypeLiveTvChannels": "Kanalen",
-    "ScheduledTaskFailedWithName": "{0} is mislukt",
-    "LabelRunningTimeValue": "Looptijd: {0}",
-    "ScheduledTaskStartedWithName": "{0} is gestart",
-    "VersionNumber": "Versie {0}",
-    "PluginInstalledWithName": "{0} is ge\u00efnstalleerd",
-    "PluginUpdatedWithName": "{0} is bijgewerkt",
-    "PluginUninstalledWithName": "{0} is gede\u00efnstalleerd",
-    "ItemAddedWithName": "{0} is toegevoegd aan de bibliotheek",
-    "ItemRemovedWithName": "{0} is verwijderd uit de bibliotheek",
-    "LabelIpAddressValue": "IP adres: {0}",
-    "DeviceOnlineWithName": "{0} is verbonden",
-    "UserOnlineFromDevice": "{0} heeft verbinding met {1}",
-    "ProviderValue": "Aanbieder: {0}",
-    "SubtitlesDownloadedForItem": "Ondertiteling voor {0} is gedownload",
-    "UserConfigurationUpdatedWithName": "Gebruikersinstellingen voor {0} zijn bijgewerkt",
-    "UserCreatedWithName": "Gebruiker {0} is aangemaakt",
-    "UserPasswordChangedWithName": "Wachtwoord voor {0} is gewijzigd",
-    "UserDeletedWithName": "Gebruiker {0} is verwijderd",
-    "MessageServerConfigurationUpdated": "Server configuratie is bijgewerkt",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Sectie {0} van de server configuratie is bijgewerkt",
-    "MessageApplicationUpdated": "Emby Server is bijgewerkt",
-    "FailedLoginAttemptWithUserName": "Mislukte aanmeld poging van {0}",
-    "AuthenticationSucceededWithUserName": "{0} is succesvol geverifieerd",
-    "DeviceOfflineWithName": "{0} is losgekoppeld",
-    "UserLockedOutWithName": "Gebruikersaccount {0} is vergrendeld",
-    "UserOfflineFromDevice": "Verbinding van {0} met {1} is verbroken",
-    "UserStartedPlayingItemWithValues": "{0} heeft afspelen van {1} gestart",
-    "UserStoppedPlayingItemWithValues": "{0} heeft afspelen van {1} gestopt",
-    "SubtitleDownloadFailureForItem": "Downloaden van ondertiteling voor {0} is mislukt",
-    "HeaderUnidentified": "One\u00efdentificaard",
-    "HeaderImagePrimary": "Primair",
-    "HeaderImageBackdrop": "Achtergrond",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Afbeelding gebruiker",
-    "HeaderOverview": "Overzicht",
-    "HeaderShortOverview": "Kort overzicht",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Ernst",
-    "HeaderUser": "Gebruiker",
-    "HeaderName": "Naam",
-    "HeaderDate": "Datum",
-    "HeaderPremiereDate": "Premi\u00e8re Datum",
-    "HeaderDateAdded": "Datum toegevoegd",
-    "HeaderReleaseDate": "Uitgave datum",
-    "HeaderRuntime": "Speelduur",
-    "HeaderPlayCount": "Afspeel telling",
-    "HeaderSeason": "Seizoen",
-    "HeaderSeasonNumber": "Seizoen nummer",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Zender",
-    "HeaderYear": "Jaar:",
-    "HeaderYears": "Jaren:",
-    "HeaderParentalRating": "Kijkwijzer classificatie",
-    "HeaderCommunityRating": "Gemeenschap cijfer",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game systemen",
-    "HeaderPlayers": "Spelers:",
-    "HeaderAlbumArtists": "Album artiesten",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Schijf",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Geluid",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Ingesloten afbeelding",
-    "HeaderResolution": "Resolutie",
-    "HeaderSubtitles": "Ondertiteling",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Landen",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Muziek artiest",
-    "HeaderLocked": "Vergrendeld",
-    "HeaderStudios": "Studio's",
-    "HeaderActor": "Acteurs",
-    "HeaderComposer": "Componisten",
-    "HeaderDirector": "Regiseurs",
-    "HeaderGuestStar": "Gast ster",
-    "HeaderProducer": "Producenten",
-    "HeaderWriter": "Schrijvers",
-    "HeaderParentalRatings": "Ouderlijke toezicht",
-    "HeaderCommunityRatings": "Gemeenschapswaardering",
-    "StartupEmbyServerIsLoading": "Emby Server is aan het laden, probeer het later opnieuw."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/pl.json b/MediaBrowser.Server.Implementations/Localization/Core/pl.json
deleted file mode 100644
index cdaa87c4d..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/pl.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Prosz\u0119 czeka\u0107 na koniec aktualizacji biblioteki. Post\u0119p: {0}%",
-    "AppDeviceValues": "Aplikacja: {0}, Urz\u0105dzenie: {1}",
-    "UserDownloadingItemWithValues": "{0} pobiera {1}",
-    "FolderTypeMixed": "Zawarto\u015b\u0107 mieszana",
-    "FolderTypeMovies": "Filmy",
-    "FolderTypeMusic": "Muzyka",
-    "FolderTypeAdultVideos": "Filmy dla doros\u0142ych",
-    "FolderTypePhotos": "Zdj\u0119cia",
-    "FolderTypeMusicVideos": "Teledyski",
-    "FolderTypeHomeVideos": "Filmy domowe",
-    "FolderTypeGames": "Gry",
-    "FolderTypeBooks": "Ksi\u0105\u017cki",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Dziedzicz",
-    "HeaderCastCrew": "Obsada & Eikpa",
-    "HeaderPeople": "Ludzie",
-    "ValueSpecialEpisodeName": "Specjalny - {0}",
-    "LabelChapterName": "Rozdzia\u0142 {0}",
-    "NameSeasonNumber": "Sezon {0}",
-    "LabelExit": "Wyj\u015bcie",
-    "LabelVisitCommunity": "Odwied\u017a spo\u0142eczno\u015b\u0107",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Dokumantacja API",
-    "LabelDeveloperResources": "Materia\u0142y dla deweloper\u00f3w",
-    "LabelBrowseLibrary": "Przegl\u0105daj bibliotek\u0119",
-    "LabelConfigureServer": "Konfiguracja Emby",
-    "LabelRestartServer": "Restart serwera",
-    "CategorySync": "Sync",
-    "CategoryUser": "U\u017cytkownik",
-    "CategorySystem": "System",
-    "CategoryApplication": "Aplikacja",
-    "CategoryPlugin": "Wtyczka",
-    "NotificationOptionPluginError": "Niepowodzenie wtyczki",
-    "NotificationOptionApplicationUpdateAvailable": "Dost\u0119pna aktualizacja aplikacji",
-    "NotificationOptionApplicationUpdateInstalled": "Zainstalowano aktualizacj\u0119 aplikacji",
-    "NotificationOptionPluginUpdateInstalled": "Zainstalowano aktualizacj\u0119 wtyczki",
-    "NotificationOptionPluginInstalled": "Zainstalowano wtyczk\u0119",
-    "NotificationOptionPluginUninstalled": "Odinstalowano wtyczk\u0119",
-    "NotificationOptionVideoPlayback": "Rozpocz\u0119to odtwarzanie wideo",
-    "NotificationOptionAudioPlayback": "Rozpocz\u0119to odtwarzanie audio",
-    "NotificationOptionGamePlayback": "Odtwarzanie gry rozpocz\u0119te",
-    "NotificationOptionVideoPlaybackStopped": "Odtwarzanie wideo zatrzymane",
-    "NotificationOptionAudioPlaybackStopped": "Odtwarzane audio zatrzymane",
-    "NotificationOptionGamePlaybackStopped": "Odtwarzanie gry zatrzymane",
-    "NotificationOptionTaskFailed": "Niepowodzenie zaplanowanego zadania",
-    "NotificationOptionInstallationFailed": "Niepowodzenie instalacji",
-    "NotificationOptionNewLibraryContent": "Nowa zawarto\u015b\u0107 dodana",
-    "NotificationOptionNewLibraryContentMultiple": "Nowa zawarto\u015b\u0107 dodana (wiele)",
-    "NotificationOptionCameraImageUploaded": "Obraz z Kamery dodany",
-    "NotificationOptionUserLockedOut": "U\u017cytkownik zablokowany",
-    "NotificationOptionServerRestartRequired": "Restart serwera wymagany",
-    "ViewTypePlaylists": "Playlisty",
-    "ViewTypeMovies": "Filmy",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Gry",
-    "ViewTypeMusic": "Muzyka",
-    "ViewTypeMusicGenres": "Gatunki",
-    "ViewTypeMusicArtists": "Arty\u015bci",
-    "ViewTypeBoxSets": "Kolekcje",
-    "ViewTypeChannels": "Kana\u0142y",
-    "ViewTypeLiveTV": "TV Na \u017bywo",
-    "ViewTypeLiveTvNowPlaying": "Teraz Transmitowane",
-    "ViewTypeLatestGames": "Ostatnie Gry",
-    "ViewTypeRecentlyPlayedGames": "Ostatnio Odtwarzane",
-    "ViewTypeGameFavorites": "Ulubione",
-    "ViewTypeGameSystems": "Systemy Gier Wideo",
-    "ViewTypeGameGenres": "Gatunki",
-    "ViewTypeTvResume": "Wzn\u00f3w",
-    "ViewTypeTvNextUp": "Nast\u0119pny",
-    "ViewTypeTvLatest": "Najnowsze",
-    "ViewTypeTvShowSeries": "Seriale",
-    "ViewTypeTvGenres": "Gatunki",
-    "ViewTypeTvFavoriteSeries": "Ulubione Seriale",
-    "ViewTypeTvFavoriteEpisodes": "Ulubione Odcinki",
-    "ViewTypeMovieResume": "Wzn\u00f3w",
-    "ViewTypeMovieLatest": "Najnowsze",
-    "ViewTypeMovieMovies": "Filmy",
-    "ViewTypeMovieCollections": "Kolekcje",
-    "ViewTypeMovieFavorites": "Ulubione",
-    "ViewTypeMovieGenres": "Gatunki",
-    "ViewTypeMusicLatest": "Najnowsze",
-    "ViewTypeMusicPlaylists": "Playlisty",
-    "ViewTypeMusicAlbums": "Albumy",
-    "ViewTypeMusicAlbumArtists": "Arty\u015bci albumu",
-    "HeaderOtherDisplaySettings": "Ustawienia Wy\u015bwietlania",
-    "ViewTypeMusicSongs": "Utwory",
-    "ViewTypeMusicFavorites": "Ulubione",
-    "ViewTypeMusicFavoriteAlbums": "Ulubione Albumy",
-    "ViewTypeMusicFavoriteArtists": "Ulubieni Arty\u015bci",
-    "ViewTypeMusicFavoriteSongs": "Ulubione Utwory",
-    "ViewTypeFolders": "Foldery",
-    "ViewTypeLiveTvRecordingGroups": "Nagrania",
-    "ViewTypeLiveTvChannels": "Kana\u0142y",
-    "ScheduledTaskFailedWithName": "{0} niepowodze\u0144",
-    "LabelRunningTimeValue": "Czas trwania: {0}",
-    "ScheduledTaskStartedWithName": "{0} rozpocz\u0119te",
-    "VersionNumber": "Wersja {0}",
-    "PluginInstalledWithName": "{0} zainstalowanych",
-    "PluginUpdatedWithName": "{0} zaktualizowanych",
-    "PluginUninstalledWithName": "{0} odinstalowanych",
-    "ItemAddedWithName": "{0} dodanych do biblioteki",
-    "ItemRemovedWithName": "{0} usuni\u0119tych z biblioteki",
-    "LabelIpAddressValue": "Adres IP: {0}",
-    "DeviceOnlineWithName": "{0} po\u0142\u0105czonych",
-    "UserOnlineFromDevice": "{0} jest online od {1}",
-    "ProviderValue": "Dostawca: {0}",
-    "SubtitlesDownloadedForItem": "Napisy pobrane dla {0}",
-    "UserConfigurationUpdatedWithName": "Konfiguracja u\u017cytkownika zosta\u0142a zaktualizowana dla {0}",
-    "UserCreatedWithName": "U\u017cytkownik {0} zosta\u0142 utworzony",
-    "UserPasswordChangedWithName": "Has\u0142o zosta\u0142o zmienione dla u\u017cytkownika {0}",
-    "UserDeletedWithName": "u\u017cytkownik {0} zosta\u0142 usuni\u0119ty",
-    "MessageServerConfigurationUpdated": "Konfiguracja serwera zosta\u0142a zaktualizowana",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Sekcja {0} konfiguracji serwera zosta\u0142a zaktualizowana",
-    "MessageApplicationUpdated": "Serwer Emby zosta\u0142 zaktualizowany",
-    "FailedLoginAttemptWithUserName": "Nieudana pr\u00f3ba logowania z {0}",
-    "AuthenticationSucceededWithUserName": "{0} zaktualizowanych z powodzeniem",
-    "DeviceOfflineWithName": "{0} zosta\u0142o od\u0142aczonych",
-    "UserLockedOutWithName": "U\u017cytkownik {0} zosta\u0142 zablokowany",
-    "UserOfflineFromDevice": "{0} zosta\u0142o od\u0142\u0105czonych od {1}",
-    "UserStartedPlayingItemWithValues": "{0} rozpocz\u0105\u0142 odtwarzanie {1}",
-    "UserStoppedPlayingItemWithValues": "{0} zatrzyma\u0142 odtwarzanie {1}",
-    "SubtitleDownloadFailureForItem": "Napisy niepobrane dla {0}",
-    "HeaderUnidentified": "Niezidentyfikowane",
-    "HeaderImagePrimary": "Priorytetowy",
-    "HeaderImageBackdrop": "Obraz t\u0142a",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Avatar u\u017cytkownika",
-    "HeaderOverview": "Opis",
-    "HeaderShortOverview": "Kr\u00f3tki Opis",
-    "HeaderType": "Typ",
-    "HeaderSeverity": "Rygor",
-    "HeaderUser": "U\u017cytkownik",
-    "HeaderName": "Nazwa",
-    "HeaderDate": "Data",
-    "HeaderPremiereDate": "Data premiery",
-    "HeaderDateAdded": "Data dodania",
-    "HeaderReleaseDate": "Data wydania",
-    "HeaderRuntime": "D\u0142ugo\u015b\u0107 filmu",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Sezon",
-    "HeaderSeasonNumber": "Numer sezonu",
-    "HeaderSeries": "Seriale:",
-    "HeaderNetwork": "Sie\u0107",
-    "HeaderYear": "Rok:",
-    "HeaderYears": "Lata:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Ocena spo\u0142eczno\u015bci",
-    "HeaderTrailers": "Zwiastuny",
-    "HeaderSpecials": "Specjalne",
-    "HeaderGameSystems": "Systemy gier",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albumy",
-    "HeaderDisc": "P\u0142yta",
-    "HeaderTrack": "\u015acie\u017cka",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Wideo",
-    "HeaderEmbeddedImage": "Osadzony obraz",
-    "HeaderResolution": "Rozdzielczo\u015b\u0107",
-    "HeaderSubtitles": "Napisy",
-    "HeaderGenres": "Gatunki",
-    "HeaderCountries": "Kraje",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Utwory",
-    "HeaderMusicArtist": "Wykonawcy muzyczni",
-    "HeaderLocked": "Zablokowane",
-    "HeaderStudios": "Studia",
-    "HeaderActor": "Aktorzy",
-    "HeaderComposer": "Kopozytorzy",
-    "HeaderDirector": "Re\u017cyszerzy",
-    "HeaderGuestStar": "Go\u015b\u0107 specjalny",
-    "HeaderProducer": "Producenci",
-    "HeaderWriter": "Scenarzy\u015bci",
-    "HeaderParentalRatings": "Ocena rodzicielska",
-    "HeaderCommunityRatings": "Ocena spo\u0142eczno\u015bci",
-    "StartupEmbyServerIsLoading": "Serwer Emby si\u0119 \u0142aduje. Prosz\u0119 spr\u00f3bowa\u0107 za chwil\u0119."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/pt-BR.json b/MediaBrowser.Server.Implementations/Localization/Core/pt-BR.json
deleted file mode 100644
index 67f204b2e..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/pt-BR.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Por favor, aguarde enquanto a base de dados do Servidor Emby \u00e9 atualizada. {0}% completo.",
-    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
-    "UserDownloadingItemWithValues": "{0} est\u00e1 fazendo download de {1}",
-    "FolderTypeMixed": "Conte\u00fado misto",
-    "FolderTypeMovies": "Filmes",
-    "FolderTypeMusic": "M\u00fasica",
-    "FolderTypeAdultVideos": "V\u00eddeos adultos",
-    "FolderTypePhotos": "Fotos",
-    "FolderTypeMusicVideos": "V\u00eddeos musicais",
-    "FolderTypeHomeVideos": "V\u00eddeos caseiros",
-    "FolderTypeGames": "Jogos",
-    "FolderTypeBooks": "Livros",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Herdar",
-    "HeaderCastCrew": "Elenco & Equipe",
-    "HeaderPeople": "Pessoas",
-    "ValueSpecialEpisodeName": "Especial -  {0}",
-    "LabelChapterName": "Cap\u00edtulo {0}",
-    "NameSeasonNumber": "Temporada {0}",
-    "LabelExit": "Sair",
-    "LabelVisitCommunity": "Visitar a Comunidade",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documenta\u00e7\u00e3o da Api",
-    "LabelDeveloperResources": "Recursos do Desenvolvedor",
-    "LabelBrowseLibrary": "Explorar Biblioteca",
-    "LabelConfigureServer": "Configurar o Emby",
-    "LabelRestartServer": "Reiniciar Servidor",
-    "CategorySync": "Sincroniza\u00e7\u00e3o",
-    "CategoryUser": "Usu\u00e1rio",
-    "CategorySystem": "Sistema",
-    "CategoryApplication": "Aplica\u00e7\u00e3o",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Falha no plugin",
-    "NotificationOptionApplicationUpdateAvailable": "Atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o disponivel",
-    "NotificationOptionApplicationUpdateInstalled": "Atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o instalada",
-    "NotificationOptionPluginUpdateInstalled": "Atualiza\u00e7\u00e3o do plugin instalada",
-    "NotificationOptionPluginInstalled": "Plugin instalado",
-    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
-    "NotificationOptionVideoPlayback": "Reprodu\u00e7\u00e3o de v\u00eddeo iniciada",
-    "NotificationOptionAudioPlayback": "Reprodu\u00e7\u00e3o de \u00e1udio iniciada",
-    "NotificationOptionGamePlayback": "Reprodu\u00e7\u00e3o de jogo iniciada",
-    "NotificationOptionVideoPlaybackStopped": "Reprodu\u00e7\u00e3o de v\u00eddeo parada",
-    "NotificationOptionAudioPlaybackStopped": "Reprodu\u00e7\u00e3o de \u00e1udio parada",
-    "NotificationOptionGamePlaybackStopped": "Reprodu\u00e7\u00e3o de jogo parada",
-    "NotificationOptionTaskFailed": "Falha na tarefa agendada",
-    "NotificationOptionInstallationFailed": "Falha na instala\u00e7\u00e3o",
-    "NotificationOptionNewLibraryContent": "Novo conte\u00fado adicionado",
-    "NotificationOptionNewLibraryContentMultiple": "Novo conte\u00fado adicionado (m\u00faltiplo)",
-    "NotificationOptionCameraImageUploaded": "Imagem da c\u00e2mera carregada",
-    "NotificationOptionUserLockedOut": "Usu\u00e1rio bloqueado",
-    "NotificationOptionServerRestartRequired": "Necessidade de reiniciar servidor",
-    "ViewTypePlaylists": "Listas de Reprodu\u00e7\u00e3o",
-    "ViewTypeMovies": "Filmes",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Jogos",
-    "ViewTypeMusic": "M\u00fasicas",
-    "ViewTypeMusicGenres": "G\u00eaneros",
-    "ViewTypeMusicArtists": "Artistas",
-    "ViewTypeBoxSets": "Cole\u00e7\u00f5es",
-    "ViewTypeChannels": "Canais",
-    "ViewTypeLiveTV": "TV ao Vivo",
-    "ViewTypeLiveTvNowPlaying": "Exibindo Agora",
-    "ViewTypeLatestGames": "Jogos Recentes",
-    "ViewTypeRecentlyPlayedGames": "Reproduzido Recentemente",
-    "ViewTypeGameFavorites": "Favoritos",
-    "ViewTypeGameSystems": "Sistemas de Jogo",
-    "ViewTypeGameGenres": "G\u00eaneros",
-    "ViewTypeTvResume": "Retomar",
-    "ViewTypeTvNextUp": "Pr\u00f3ximos",
-    "ViewTypeTvLatest": "Recentes",
-    "ViewTypeTvShowSeries": "S\u00e9ries",
-    "ViewTypeTvGenres": "G\u00eaneros",
-    "ViewTypeTvFavoriteSeries": "S\u00e9ries Favoritas",
-    "ViewTypeTvFavoriteEpisodes": "Epis\u00f3dios Favoritos",
-    "ViewTypeMovieResume": "Retomar",
-    "ViewTypeMovieLatest": "Recentes",
-    "ViewTypeMovieMovies": "Filmes",
-    "ViewTypeMovieCollections": "Cole\u00e7\u00f5es",
-    "ViewTypeMovieFavorites": "Favoritos",
-    "ViewTypeMovieGenres": "G\u00eaneros",
-    "ViewTypeMusicLatest": "Recentes",
-    "ViewTypeMusicPlaylists": "Listas de Reprodu\u00e7\u00e3o",
-    "ViewTypeMusicAlbums": "\u00c1lbuns",
-    "ViewTypeMusicAlbumArtists": "Artistas do \u00c1lbum",
-    "HeaderOtherDisplaySettings": "Ajustes de Exibi\u00e7\u00e3o",
-    "ViewTypeMusicSongs": "M\u00fasicas",
-    "ViewTypeMusicFavorites": "Favoritos",
-    "ViewTypeMusicFavoriteAlbums": "\u00c1lbuns Favoritos",
-    "ViewTypeMusicFavoriteArtists": "Artistas Favoritos",
-    "ViewTypeMusicFavoriteSongs": "M\u00fasicas Favoritas",
-    "ViewTypeFolders": "Pastas",
-    "ViewTypeLiveTvRecordingGroups": "Grava\u00e7\u00f5es",
-    "ViewTypeLiveTvChannels": "Canais",
-    "ScheduledTaskFailedWithName": "{0} falhou",
-    "LabelRunningTimeValue": "Dura\u00e7\u00e3o: {0}",
-    "ScheduledTaskStartedWithName": "{0} iniciado",
-    "VersionNumber": "Vers\u00e3o {0}",
-    "PluginInstalledWithName": "{0} foi instalado",
-    "PluginUpdatedWithName": "{0} foi atualizado",
-    "PluginUninstalledWithName": "{0} foi desinstalado",
-    "ItemAddedWithName": "{0} foi adicionado \u00e0 biblioteca",
-    "ItemRemovedWithName": "{0} foi removido da biblioteca",
-    "LabelIpAddressValue": "Endere\u00e7o Ip: {0}",
-    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
-    "UserOnlineFromDevice": "{0} est\u00e1 ativo em {1}",
-    "ProviderValue": "Provedor: {0}",
-    "SubtitlesDownloadedForItem": "Legendas baixadas para {0}",
-    "UserConfigurationUpdatedWithName": "A configura\u00e7\u00e3o do usu\u00e1rio {0} foi atualizada",
-    "UserCreatedWithName": "O usu\u00e1rio {0} foi criado",
-    "UserPasswordChangedWithName": "A senha do usu\u00e1rio {0} foi alterada",
-    "UserDeletedWithName": "O usu\u00e1rio {0} foi exclu\u00eddo",
-    "MessageServerConfigurationUpdated": "A configura\u00e7\u00e3o do servidor foi atualizada",
-    "MessageNamedServerConfigurationUpdatedWithValue": "A se\u00e7\u00e3o {0} da configura\u00e7\u00e3o do servidor foi atualizada",
-    "MessageApplicationUpdated": "O Servidor Emby foi atualizado",
-    "FailedLoginAttemptWithUserName": "Falha na tentativa de login de {0}",
-    "AuthenticationSucceededWithUserName": "{0} autenticou-se com sucesso",
-    "DeviceOfflineWithName": "{0} foi desconectado",
-    "UserLockedOutWithName": "Usu\u00e1rio {0} foi bloqueado",
-    "UserOfflineFromDevice": "{0} foi desconectado de {1}",
-    "UserStartedPlayingItemWithValues": "{0} come\u00e7ou a reproduzir {1}",
-    "UserStoppedPlayingItemWithValues": "{0} parou de reproduzir {1}",
-    "SubtitleDownloadFailureForItem": "Falha ao baixar legendas para {0}",
-    "HeaderUnidentified": "N\u00e3o-identificado",
-    "HeaderImagePrimary": "Principal",
-    "HeaderImageBackdrop": "Imagem de Fundo",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "Imagem do Usu\u00e1rio",
-    "HeaderOverview": "Sinopse",
-    "HeaderShortOverview": "Sinopse curta",
-    "HeaderType": "Tipo",
-    "HeaderSeverity": "Severidade",
-    "HeaderUser": "Usu\u00e1rio",
-    "HeaderName": "Nome",
-    "HeaderDate": "Data",
-    "HeaderPremiereDate": "Data da Estr\u00e9ia",
-    "HeaderDateAdded": "Data da Adi\u00e7\u00e3o",
-    "HeaderReleaseDate": "Data de lan\u00e7amento",
-    "HeaderRuntime": "Dura\u00e7\u00e3o",
-    "HeaderPlayCount": "N\u00famero de Reprodu\u00e7\u00f5es",
-    "HeaderSeason": "Temporada",
-    "HeaderSeasonNumber": "N\u00famero da temporada",
-    "HeaderSeries": "S\u00e9rie:",
-    "HeaderNetwork": "Rede de TV",
-    "HeaderYear": "Ano:",
-    "HeaderYears": "Anos:",
-    "HeaderParentalRating": "Classifica\u00e7\u00e3o Parental",
-    "HeaderCommunityRating": "Avalia\u00e7\u00e3o da Comunidade",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Especiais",
-    "HeaderGameSystems": "Sistemas de Jogo",
-    "HeaderPlayers": "Jogadores:",
-    "HeaderAlbumArtists": "Artistas do \u00c1lbum",
-    "HeaderAlbums": "\u00c1lbuns",
-    "HeaderDisc": "Disco",
-    "HeaderTrack": "Faixa",
-    "HeaderAudio": "\u00c1udio",
-    "HeaderVideo": "V\u00eddeo",
-    "HeaderEmbeddedImage": "Imagem incorporada",
-    "HeaderResolution": "Resolu\u00e7\u00e3o",
-    "HeaderSubtitles": "Legendas",
-    "HeaderGenres": "G\u00eaneros",
-    "HeaderCountries": "Pa\u00edses",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Faixas",
-    "HeaderMusicArtist": "Artista da m\u00fasica",
-    "HeaderLocked": "Travado",
-    "HeaderStudios": "Est\u00fadios",
-    "HeaderActor": "Atores",
-    "HeaderComposer": "Compositores",
-    "HeaderDirector": "Diretores",
-    "HeaderGuestStar": "Ator convidado",
-    "HeaderProducer": "Produtores",
-    "HeaderWriter": "Escritores",
-    "HeaderParentalRatings": "Classifica\u00e7\u00f5es Parentais",
-    "HeaderCommunityRatings": "Avalia\u00e7\u00f5es da comunidade",
-    "StartupEmbyServerIsLoading": "O Servidor Emby est\u00e1 carregando. Por favor, tente novamente em breve."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/pt-PT.json b/MediaBrowser.Server.Implementations/Localization/Core/pt-PT.json
deleted file mode 100644
index f12939b10..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/pt-PT.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Filmes",
-    "FolderTypeMusic": "M\u00fasica",
-    "FolderTypeAdultVideos": "V\u00eddeos adultos",
-    "FolderTypePhotos": "Fotos",
-    "FolderTypeMusicVideos": "V\u00eddeos musicais",
-    "FolderTypeHomeVideos": "V\u00eddeos caseiros",
-    "FolderTypeGames": "Jogos",
-    "FolderTypeBooks": "Livros",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Elenco e Equipa",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Sair",
-    "LabelVisitCommunity": "Visitar a Comunidade",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documenta\u00e7\u00e3o da API",
-    "LabelDeveloperResources": "Recursos do Programador",
-    "LabelBrowseLibrary": "Navegar pela Biblioteca",
-    "LabelConfigureServer": "Configurar o Emby",
-    "LabelRestartServer": "Reiniciar Servidor",
-    "CategorySync": "Sincroniza\u00e7\u00e3o",
-    "CategoryUser": "Utilizador",
-    "CategorySystem": "Sistema",
-    "CategoryApplication": "Aplica\u00e7\u00e3o",
-    "CategoryPlugin": "Extens\u00e3o",
-    "NotificationOptionPluginError": "Falha na extens\u00e3o",
-    "NotificationOptionApplicationUpdateAvailable": "Dispon\u00edvel atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o",
-    "NotificationOptionApplicationUpdateInstalled": "Instalada atualiza\u00e7\u00e3o da aplica\u00e7\u00e3o",
-    "NotificationOptionPluginUpdateInstalled": "Instalada atualiza\u00e7\u00e3o da extens\u00e3o",
-    "NotificationOptionPluginInstalled": "Extens\u00e3o instalada",
-    "NotificationOptionPluginUninstalled": "Extens\u00e3o desinstalada",
-    "NotificationOptionVideoPlayback": "Reprodu\u00e7\u00e3o de v\u00eddeo iniciada",
-    "NotificationOptionAudioPlayback": "Reprodu\u00e7\u00e3o de \u00e1udio iniciada",
-    "NotificationOptionGamePlayback": "Reprodu\u00e7\u00e3o de jogo iniciada",
-    "NotificationOptionVideoPlaybackStopped": "Reprodu\u00e7\u00e3o de v\u00eddeo parada",
-    "NotificationOptionAudioPlaybackStopped": "Reprodu\u00e7\u00e3o de \u00e1udio parada",
-    "NotificationOptionGamePlaybackStopped": "Reprodu\u00e7\u00e3o de jogo parada",
-    "NotificationOptionTaskFailed": "Falha na tarefa agendada",
-    "NotificationOptionInstallationFailed": "Falha na instala\u00e7\u00e3o",
-    "NotificationOptionNewLibraryContent": "Adicionado novo conte\u00fado",
-    "NotificationOptionNewLibraryContentMultiple": "Novo conte\u00fado adicionado (m\u00faltiplo)",
-    "NotificationOptionCameraImageUploaded": "Imagem da c\u00e2mara carregada",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "\u00c9 necess\u00e1rio reiniciar o servidor",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "TV ao Vivo",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Reproduzido Recentemente",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "\u00daltimas",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "\u00daltimas",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "\u00daltimas",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Vers\u00e3o {0}",
-    "PluginInstalledWithName": "{0} foi instalado",
-    "PluginUpdatedWithName": "{0} foi atualizado",
-    "PluginUninstalledWithName": "{0} foi desinstalado",
-    "ItemAddedWithName": "{0} foi adicionado \u00e0 biblioteca",
-    "ItemRemovedWithName": "{0} foi removido da biblioteca",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Nome",
-    "HeaderDate": "Data",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "\u00c1udio",
-    "HeaderVideo": "V\u00eddeo",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Estado",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/ro.json b/MediaBrowser.Server.Implementations/Localization/Core/ro.json
deleted file mode 100644
index c58df27d5..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/ro.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Continut mixt",
-    "FolderTypeMovies": "Filme",
-    "FolderTypeMusic": "Muzica",
-    "FolderTypeAdultVideos": "Filme Porno",
-    "FolderTypePhotos": "Fotografii",
-    "FolderTypeMusicVideos": "Videoclipuri",
-    "FolderTypeHomeVideos": "Video Personale",
-    "FolderTypeGames": "Jocuri",
-    "FolderTypeBooks": "Carti",
-    "FolderTypeTvShows": "Seriale TV",
-    "FolderTypeInherit": "Relationat",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Iesire",
-    "LabelVisitCommunity": "Viziteaza comunitatea",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Documentatie Api",
-    "LabelDeveloperResources": "Resurse Dezvoltator",
-    "LabelBrowseLibrary": "Rasfoieste Librarie",
-    "LabelConfigureServer": "Configureaza Emby",
-    "LabelRestartServer": "Restarteaza Server",
-    "CategorySync": "Sincronizeaza",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Muzica",
-    "HeaderVideo": "Filme",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/ru.json b/MediaBrowser.Server.Implementations/Localization/Core/ru.json
deleted file mode 100644
index 62fe3b496..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/ru.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "\u041f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435, \u043f\u043e\u043a\u0430 \u0431\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0430 \u0432\u0430\u0448\u0435\u043c Emby Server \u043c\u043e\u0434\u0435\u0440\u043d\u0438\u0437\u0438\u0440\u0443\u0435\u0442\u0441\u044f. {0} % \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e.",
-    "AppDeviceValues": "\u041f\u0440\u0438\u043b.: {0}, \u0423\u0441\u0442\u0440.: {1}",
-    "UserDownloadingItemWithValues": "{0} \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442 {1}",
-    "FolderTypeMixed": "\u0421\u043c\u0435\u0448\u0430\u043d\u043d\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435",
-    "FolderTypeMovies": "\u041a\u0438\u043d\u043e",
-    "FolderTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
-    "FolderTypeAdultVideos": "\u0414\u043b\u044f \u0432\u0437\u0440\u043e\u0441\u043b\u044b\u0445",
-    "FolderTypePhotos": "\u0424\u043e\u0442\u043e",
-    "FolderTypeMusicVideos": "\u041c\u0443\u0437. \u0432\u0438\u0434\u0435\u043e",
-    "FolderTypeHomeVideos": "\u0414\u043e\u043c. \u0432\u0438\u0434\u0435\u043e",
-    "FolderTypeGames": "\u0418\u0433\u0440\u044b",
-    "FolderTypeBooks": "\u041b\u0438\u0442\u0435\u0440\u0430\u0442\u0443\u0440\u0430",
-    "FolderTypeTvShows": "\u0422\u0412",
-    "FolderTypeInherit": "\u041d\u0430\u0441\u043b\u0435\u0434\u0443\u0435\u043c\u044b\u0439",
-    "HeaderCastCrew": "\u0421\u043d\u0438\u043c\u0430\u043b\u0438\u0441\u044c \u0438 \u0441\u043d\u0438\u043c\u0430\u043b\u0438",
-    "HeaderPeople": "\u041b\u044e\u0434\u0438",
-    "ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}",
-    "LabelChapterName": "\u0421\u0446\u0435\u043d\u0430 {0}",
-    "NameSeasonNumber": "\u0421\u0435\u0437\u043e\u043d {0}",
-    "LabelExit": "\u0412\u044b\u0445\u043e\u0434",
-    "LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u0435 \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430",
-    "LabelGithub": "GitHub",
-    "LabelApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
-    "LabelDeveloperResources": "\u0420\u0435\u0441\u0443\u0440\u0441\u044b \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432",
-    "LabelBrowseLibrary": "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f \u043f\u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435",
-    "LabelConfigureServer": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Emby",
-    "LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
-    "CategorySync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
-    "CategoryUser": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c",
-    "CategorySystem": "\u0421\u0438\u0441\u0442\u0435\u043c\u0430",
-    "CategoryApplication": "\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435",
-    "CategoryPlugin": "\u041f\u043b\u0430\u0433\u0438\u043d",
-    "NotificationOptionPluginError": "\u0421\u0431\u043e\u0439 \u043f\u043b\u0430\u0433\u0438\u043d\u0430",
-    "NotificationOptionApplicationUpdateAvailable": "\u0418\u043c\u0435\u0435\u0442\u0441\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
-    "NotificationOptionApplicationUpdateInstalled": "\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
-    "NotificationOptionPluginUpdateInstalled": "\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043b\u0430\u0433\u0438\u043d\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
-    "NotificationOptionPluginInstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d",
-    "NotificationOptionPluginUninstalled": "\u041f\u043b\u0430\u0433\u0438\u043d \u0443\u0434\u0430\u043b\u0451\u043d",
-    "NotificationOptionVideoPlayback": "\u0412\u043e\u0441\u043f\u0440-\u0438\u0435 \u0432\u0438\u0434\u0435\u043e \u0437\u0430\u043f-\u043d\u043e",
-    "NotificationOptionAudioPlayback": "\u0412\u043e\u0441\u043f\u0440-\u0438\u0435 \u0430\u0443\u0434\u0438\u043e \u0437\u0430\u043f-\u043d\u043e",
-    "NotificationOptionGamePlayback": "\u0412\u043e\u0441\u043f\u0440-\u0438\u0435 \u0438\u0433\u0440\u044b \u0437\u0430\u043f-\u043d\u043e",
-    "NotificationOptionVideoPlaybackStopped": "\u0412\u043e\u0441\u043f-\u0438\u0435 \u0432\u0438\u0434\u0435\u043e \u043e\u0441\u0442-\u043d\u043e",
-    "NotificationOptionAudioPlaybackStopped": "\u0412\u043e\u0441\u043f-\u0438\u0435 \u0430\u0443\u0434\u0438\u043e \u043e\u0441\u0442-\u043d\u043e",
-    "NotificationOptionGamePlaybackStopped": "\u0412\u043e\u0441\u043f-\u0438\u0435 \u0438\u0433\u0440\u044b \u043e\u0441\u0442-\u043d\u043e",
-    "NotificationOptionTaskFailed": "\u0421\u0431\u043e\u0439 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0439 \u0437\u0430\u0434\u0430\u0447\u0438",
-    "NotificationOptionInstallationFailed": "\u0421\u0431\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438",
-    "NotificationOptionNewLibraryContent": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e",
-    "NotificationOptionNewLibraryContentMultiple": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e (\u043c\u043d\u043e\u0433\u043e\u043a\u0440\u0430\u0442\u043d\u043e)",
-    "NotificationOptionCameraImageUploaded": "\u041f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0430 \u0432\u044b\u043a\u043b\u0430\u0434\u043a\u0430 \u043e\u0442\u0441\u043d\u044f\u0442\u043e\u0433\u043e \u0441 \u043a\u0430\u043c\u0435\u0440\u044b",
-    "NotificationOptionUserLockedOut": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d",
-    "NotificationOptionServerRestartRequired": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
-    "ViewTypePlaylists": "\u041f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442\u044b",
-    "ViewTypeMovies": "\u041a\u0438\u043d\u043e",
-    "ViewTypeTvShows": "\u0422\u0412",
-    "ViewTypeGames": "\u0418\u0433\u0440\u044b",
-    "ViewTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
-    "ViewTypeMusicGenres": "\u0416\u0430\u043d\u0440\u044b",
-    "ViewTypeMusicArtists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
-    "ViewTypeBoxSets": "\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438",
-    "ViewTypeChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
-    "ViewTypeLiveTV": "\u042d\u0444\u0438\u0440",
-    "ViewTypeLiveTvNowPlaying": "\u0412 \u044d\u0444\u0438\u0440\u0435",
-    "ViewTypeLatestGames": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0438\u0433\u0440\u044b",
-    "ViewTypeRecentlyPlayedGames": "C\u044b\u0433\u0440\u0430\u043d\u043d\u044b\u0435 \u043d\u0435\u0434\u0430\u0432\u043d\u043e",
-    "ViewTypeGameFavorites": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u043e\u0435",
-    "ViewTypeGameSystems": "\u0418\u0433\u0440\u043e\u0432\u044b\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b",
-    "ViewTypeGameGenres": "\u0416\u0430\u043d\u0440\u044b",
-    "ViewTypeTvResume": "\u0412\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u043e\u0435",
-    "ViewTypeTvNextUp": "\u041e\u0447\u0435\u0440\u0435\u0434\u043d\u043e\u0435",
-    "ViewTypeTvLatest": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435",
-    "ViewTypeTvShowSeries": "\u0421\u0435\u0440\u0438\u0430\u043b\u044b",
-    "ViewTypeTvGenres": "\u0416\u0430\u043d\u0440\u044b",
-    "ViewTypeTvFavoriteSeries": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u0441\u0435\u0440\u0438\u0430\u043b\u044b",
-    "ViewTypeTvFavoriteEpisodes": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b",
-    "ViewTypeMovieResume": "\u0412\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u043e\u0435",
-    "ViewTypeMovieLatest": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435",
-    "ViewTypeMovieMovies": "\u0424\u0438\u043b\u044c\u043c\u044b",
-    "ViewTypeMovieCollections": "\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438",
-    "ViewTypeMovieFavorites": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u043e\u0435",
-    "ViewTypeMovieGenres": "\u0416\u0430\u043d\u0440\u044b",
-    "ViewTypeMusicLatest": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435",
-    "ViewTypeMusicPlaylists": "\u041f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442\u044b",
-    "ViewTypeMusicAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u044b",
-    "ViewTypeMusicAlbumArtists": "\u0418\u0441\u043f-\u043b\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430",
-    "HeaderOtherDisplaySettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-    "ViewTypeMusicSongs": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u0438",
-    "ViewTypeMusicFavorites": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u043e\u0435",
-    "ViewTypeMusicFavoriteAlbums": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u0430\u043b\u044c\u0431\u043e\u043c\u044b",
-    "ViewTypeMusicFavoriteArtists": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
-    "ViewTypeMusicFavoriteSongs": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u043a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u0438",
-    "ViewTypeFolders": "\u041f\u0430\u043f\u043a\u0438",
-    "ViewTypeLiveTvRecordingGroups": "\u0417\u0430\u043f\u0438\u0441\u0438",
-    "ViewTypeLiveTvChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
-    "ScheduledTaskFailedWithName": "{0} - \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430",
-    "LabelRunningTimeValue": "\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f: {0}",
-    "ScheduledTaskStartedWithName": "{0} - \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u0430",
-    "VersionNumber": "\u0412\u0435\u0440\u0441\u0438\u044f {0}",
-    "PluginInstalledWithName": "{0} - \u0431\u044b\u043b\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
-    "PluginUpdatedWithName": "{0} - \u0431\u044b\u043b\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
-    "PluginUninstalledWithName": "{0} - \u0431\u044b\u043b\u043e \u0443\u0434\u0430\u043b\u0435\u043d\u043e",
-    "ItemAddedWithName": "{0} (\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443)",
-    "ItemRemovedWithName": "{0} (\u0438\u0437\u044a\u044f\u0442\u043e \u0438\u0437 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438)",
-    "LabelIpAddressValue": "IP-\u0430\u0434\u0440\u0435\u0441: {0}",
-    "DeviceOnlineWithName": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0443\u0441\u0442-\u043d\u043e",
-    "UserOnlineFromDevice": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0441 {1} \u0443\u0441\u0442-\u043d\u043e",
-    "ProviderValue": "\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a: {0}",
-    "SubtitlesDownloadedForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u0434\u043b\u044f {0} \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u043b\u0438\u0441\u044c",
-    "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437-\u043b\u044f {0} \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
-    "UserCreatedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0441\u043e\u0437\u0434\u0430\u043d",
-    "UserPasswordChangedWithName": "\u041f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437-\u043b\u044f {0} \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0451\u043d",
-    "UserDeletedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0451\u043d",
-    "MessageServerConfigurationUpdated": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
-    "MessageNamedServerConfigurationUpdatedWithValue": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 (\u0440\u0430\u0437\u0434\u0435\u043b {0}) \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
-    "MessageApplicationUpdated": "Emby Server \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
-    "FailedLoginAttemptWithUserName": "{0} - \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u0445\u043e\u0434\u0430 \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430",
-    "AuthenticationSucceededWithUserName": "{0} - \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f \u0443\u0441\u043f\u0435\u0448\u043d\u0430",
-    "DeviceOfflineWithName": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0440\u0430\u0437\u044a-\u043d\u043e",
-    "UserLockedOutWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d",
-    "UserOfflineFromDevice": "{0} - \u043f\u043e\u0434\u043a\u043b. \u0441 {1} \u0440\u0430\u0437\u044a-\u043d\u043e",
-    "UserStartedPlayingItemWithValues": "{0} - \u0432\u043e\u0441\u043f\u0440. \u00ab{1}\u00bb \u0437\u0430\u043f-\u043d\u043e",
-    "UserStoppedPlayingItemWithValues": "{0} - \u0432\u043e\u0441\u043f\u0440. \u00ab{1}\u00bb \u043e\u0441\u0442-\u043d\u043e",
-    "SubtitleDownloadFailureForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u043a {0} \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c",
-    "HeaderUnidentified": "\u041d\u0435 \u0440\u0430\u0441\u043f\u043e\u0437\u043d\u0430\u043d\u043e",
-    "HeaderImagePrimary": "\u0413\u043e\u043b\u043e\u0432\u043d\u043e\u0439",
-    "HeaderImageBackdrop": "\u0417\u0430\u0434\u043d\u0438\u043a",
-    "HeaderImageLogo": "\u041b\u043e\u0433\u043e\u0442\u0438\u043f",
-    "HeaderUserPrimaryImage": "\u0420\u0438\u0441\u0443\u043d\u043e\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
-    "HeaderOverview": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-    "HeaderShortOverview": "\u041a\u0440\u0430\u0442\u043a\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-    "HeaderType": "\u0422\u0438\u043f",
-    "HeaderSeverity": "\u0412\u0430\u0436\u043d\u043e\u0441\u0442\u044c",
-    "HeaderUser": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c",
-    "HeaderName": "\u0418\u043c\u044f (\u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435)",
-    "HeaderDate": "\u0414\u0430\u0442\u0430",
-    "HeaderPremiereDate": "\u0414\u0430\u0442\u0430 \u043f\u0440\u0435\u043c\u044c\u0435\u0440\u044b",
-    "HeaderDateAdded": "\u0414\u0430\u0442\u0430 \u0434\u043e\u0431.",
-    "HeaderReleaseDate": "\u0414\u0430\u0442\u0430 \u0432\u044b\u043f.",
-    "HeaderRuntime": "\u0414\u043b\u0438\u0442.",
-    "HeaderPlayCount": "\u041a\u043e\u043b-\u0432\u043e \u0432\u043e\u0441\u043f\u0440.",
-    "HeaderSeason": "\u0421\u0435\u0437\u043e\u043d",
-    "HeaderSeasonNumber": "\u2116 \u0441\u0435\u0437\u043e\u043d\u0430",
-    "HeaderSeries": "\u0421\u0435\u0440\u0438\u0430\u043b:",
-    "HeaderNetwork": "\u0422\u0435\u043b\u0435\u0441\u0435\u0442\u044c",
-    "HeaderYear": "\u0413\u043e\u0434:",
-    "HeaderYears": "\u0413\u043e\u0434\u044b:",
-    "HeaderParentalRating": "\u0412\u043e\u0437\u0440. \u043a\u0430\u0442.",
-    "HeaderCommunityRating": "\u041e\u0431\u0449. \u043e\u0446\u0435\u043d\u043a\u0430",
-    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b.",
-    "HeaderSpecials": "\u0421\u043f\u0435\u0446.",
-    "HeaderGameSystems": "\u0418\u0433\u0440. \u0441\u0438\u0441\u0442\u0435\u043c\u044b",
-    "HeaderPlayers": "\u0418\u0433\u0440\u043e\u043a\u0438:",
-    "HeaderAlbumArtists": "\u0418\u0441\u043f-\u043b\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430",
-    "HeaderAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u044b",
-    "HeaderDisc": "\u0414\u0438\u0441\u043a",
-    "HeaderTrack": "\u0414\u043e\u0440-\u043a\u0430",
-    "HeaderAudio": "\u0410\u0443\u0434\u0438\u043e",
-    "HeaderVideo": "\u0412\u0438\u0434\u0435\u043e",
-    "HeaderEmbeddedImage": "\u0412\u043d\u0435\u0434\u0440\u0451\u043d\u043d\u044b\u0439 \u0440\u0438\u0441\u0443\u043d\u043e\u043a",
-    "HeaderResolution": "\u0420\u0430\u0437\u0440.",
-    "HeaderSubtitles": "\u0421\u0443\u0431\u0442.",
-    "HeaderGenres": "\u0416\u0430\u043d\u0440\u044b",
-    "HeaderCountries": "\u0421\u0442\u0440\u0430\u043d\u044b",
-    "HeaderStatus": "\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435",
-    "HeaderTracks": "\u0414\u043e\u0440-\u043a\u0438",
-    "HeaderMusicArtist": "\u041c\u0443\u0437. \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c",
-    "HeaderLocked": "\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043e",
-    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0438\u0438",
-    "HeaderActor": "\u0410\u043a\u0442\u0451\u0440\u044b",
-    "HeaderComposer": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u044b",
-    "HeaderDirector": "\u0420\u0435\u0436\u0438\u0441\u0441\u0451\u0440\u044b",
-    "HeaderGuestStar": "\u041f\u0440\u0438\u0433\u043b. \u0430\u043a\u0442\u0451\u0440",
-    "HeaderProducer": "\u041f\u0440\u043e\u0434\u044e\u0441\u0435\u0440\u044b",
-    "HeaderWriter": "\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0441\u0442\u044b",
-    "HeaderParentalRatings": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
-    "HeaderCommunityRatings": "\u041e\u0431\u0449. \u043e\u0446\u0435\u043d\u043a\u0438",
-    "StartupEmbyServerIsLoading": "Emby Server \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442\u0441\u044f. \u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u0432 \u0431\u043b\u0438\u0436\u0430\u0439\u0448\u0435\u0435 \u0432\u0440\u0435\u043c\u044f."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/sl-SI.json b/MediaBrowser.Server.Implementations/Localization/Core/sl-SI.json
deleted file mode 100644
index 0631e3fa8..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/sl-SI.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Prosimo pocakajte podatkovna baza Emby Streznika se posodablja. {0}% koncano.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Izhod",
-    "LabelVisitCommunity": "Obiscite Skupnost",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Dokumentacija",
-    "LabelDeveloperResources": "Vsebine za razvijalce",
-    "LabelBrowseLibrary": "Brskanje po knjiznici",
-    "LabelConfigureServer": "Emby Nastavitve",
-    "LabelRestartServer": "Ponovni Zagon Streznika",
-    "CategorySync": "Sync",
-    "CategoryUser": "Uporabnik",
-    "CategorySystem": "Sistem",
-    "CategoryApplication": "Aplikacija",
-    "CategoryPlugin": "Vticnik",
-    "NotificationOptionPluginError": "Napaka v vticniku",
-    "NotificationOptionApplicationUpdateAvailable": "Na voljo je posodobitev",
-    "NotificationOptionApplicationUpdateInstalled": "Posodobitev je bila namescena",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Vticnik namescen",
-    "NotificationOptionPluginUninstalled": "Vticnik odstranjen",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Predvajanje videa koncano",
-    "NotificationOptionAudioPlaybackStopped": "Predvajanje audia koncano",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Napaka v namestitvi",
-    "NotificationOptionNewLibraryContent": "Dodana nova vsebina",
-    "NotificationOptionNewLibraryContentMultiple": "Dodane nove vsebine",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Zahtevan je ponovni zagon",
-    "ViewTypePlaylists": "Playliste",
-    "ViewTypeMovies": "Filmi",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Igre",
-    "ViewTypeMusic": "Glasba",
-    "ViewTypeMusicGenres": "Zvrsti",
-    "ViewTypeMusicArtists": "Izvajalci",
-    "ViewTypeBoxSets": "Zbirke",
-    "ViewTypeChannels": "Kanali",
-    "ViewTypeLiveTV": "TV v Zivo",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Zadnje Igre",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Priljubljeno",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Zvrsti",
-    "ViewTypeTvResume": "Nadaljuj",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Serije",
-    "ViewTypeTvGenres": "Zvrsti",
-    "ViewTypeTvFavoriteSeries": "Priljubljene Serije",
-    "ViewTypeTvFavoriteEpisodes": "Priljubljene Epizode",
-    "ViewTypeMovieResume": "Nadaljuj",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Filmi",
-    "ViewTypeMovieCollections": "Zbirke",
-    "ViewTypeMovieFavorites": "Priljubljeno",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albumi",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Priljubljeni Albumi",
-    "ViewTypeMusicFavoriteArtists": "Priljubljeni Izvajalci",
-    "ViewTypeMusicFavoriteSongs": "Priljubljene skladbe",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Verzija {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "Uporabnik",
-    "HeaderName": "Name",
-    "HeaderDate": "Datum",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/sv.json b/MediaBrowser.Server.Implementations/Localization/Core/sv.json
deleted file mode 100644
index 4a6565aff..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/sv.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "V\u00e4nligen v\u00e4nta medan databasen p\u00e5 din Emby Server uppgraderas. {0}% klar",
-    "AppDeviceValues": "App: {0}, enhet: {1}",
-    "UserDownloadingItemWithValues": "{0} laddar ned {1}",
-    "FolderTypeMixed": "Blandat inneh\u00e5ll",
-    "FolderTypeMovies": "Filmer",
-    "FolderTypeMusic": "Musik",
-    "FolderTypeAdultVideos": "Inneh\u00e5ll f\u00f6r vuxna",
-    "FolderTypePhotos": "Foton",
-    "FolderTypeMusicVideos": "Musikvideor",
-    "FolderTypeHomeVideos": "Hemvideor",
-    "FolderTypeGames": "Spel",
-    "FolderTypeBooks": "B\u00f6cker",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "\u00c4rv",
-    "HeaderCastCrew": "Rollista & bes\u00e4ttning",
-    "HeaderPeople": "Personer",
-    "ValueSpecialEpisodeName": "Specialavsnitt - {0}",
-    "LabelChapterName": "Kapitel {0}",
-    "NameSeasonNumber": "S\u00e4song {0}",
-    "LabelExit": "Avsluta",
-    "LabelVisitCommunity": "Bes\u00f6k v\u00e5rt diskussionsforum",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api-dokumentation",
-    "LabelDeveloperResources": "Resurser f\u00f6r utvecklare",
-    "LabelBrowseLibrary": "Bl\u00e4ddra i biblioteket",
-    "LabelConfigureServer": "Konfigurera Emby",
-    "LabelRestartServer": "Starta om servern",
-    "CategorySync": "Synkronisera",
-    "CategoryUser": "Anv\u00e4ndare",
-    "CategorySystem": "System",
-    "CategoryApplication": "App",
-    "CategoryPlugin": "Till\u00e4gg",
-    "NotificationOptionPluginError": "Fel uppstod med till\u00e4gget",
-    "NotificationOptionApplicationUpdateAvailable": "Ny programversion tillg\u00e4nglig",
-    "NotificationOptionApplicationUpdateInstalled": "Programuppdatering installerad",
-    "NotificationOptionPluginUpdateInstalled": "Till\u00e4gg har uppdaterats",
-    "NotificationOptionPluginInstalled": "Till\u00e4gg har installerats",
-    "NotificationOptionPluginUninstalled": "Till\u00e4gg har avinstallerats",
-    "NotificationOptionVideoPlayback": "Videouppspelning har p\u00e5b\u00f6rjats",
-    "NotificationOptionAudioPlayback": "Ljuduppspelning har p\u00e5b\u00f6rjats",
-    "NotificationOptionGamePlayback": "Spel har startats",
-    "NotificationOptionVideoPlaybackStopped": "Videouppspelning stoppad",
-    "NotificationOptionAudioPlaybackStopped": "Ljuduppspelning stoppad",
-    "NotificationOptionGamePlaybackStopped": "Spel stoppat",
-    "NotificationOptionTaskFailed": "Schemalagd aktivitet har misslyckats",
-    "NotificationOptionInstallationFailed": "Fel vid installation",
-    "NotificationOptionNewLibraryContent": "Nytt inneh\u00e5ll har tillkommit",
-    "NotificationOptionNewLibraryContentMultiple": "Nytillkommet inneh\u00e5ll finns (flera objekt)",
-    "NotificationOptionCameraImageUploaded": "Kaberabild uppladdad",
-    "NotificationOptionUserLockedOut": "Anv\u00e4ndare har l\u00e5sts ute",
-    "NotificationOptionServerRestartRequired": "Servern m\u00e5ste startas om",
-    "ViewTypePlaylists": "Spellistor",
-    "ViewTypeMovies": "Filmer",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Spel",
-    "ViewTypeMusic": "Musik",
-    "ViewTypeMusicGenres": "Genrer",
-    "ViewTypeMusicArtists": "Artister",
-    "ViewTypeBoxSets": "Samlingar",
-    "ViewTypeChannels": "Kanaler",
-    "ViewTypeLiveTV": "Live-TV",
-    "ViewTypeLiveTvNowPlaying": "Visas nu",
-    "ViewTypeLatestGames": "Senaste spelen",
-    "ViewTypeRecentlyPlayedGames": "Nyligen spelade",
-    "ViewTypeGameFavorites": "Favoriter",
-    "ViewTypeGameSystems": "Spelsystem",
-    "ViewTypeGameGenres": "Genrer",
-    "ViewTypeTvResume": "\u00c5teruppta",
-    "ViewTypeTvNextUp": "N\u00e4stkommande",
-    "ViewTypeTvLatest": "Nytillkommet",
-    "ViewTypeTvShowSeries": "Serier",
-    "ViewTypeTvGenres": "Genrer",
-    "ViewTypeTvFavoriteSeries": "Favoritserier",
-    "ViewTypeTvFavoriteEpisodes": "Favoritavsnitt",
-    "ViewTypeMovieResume": "\u00c5teruppta",
-    "ViewTypeMovieLatest": "Nytillkommet",
-    "ViewTypeMovieMovies": "Filmer",
-    "ViewTypeMovieCollections": "Samlingar",
-    "ViewTypeMovieFavorites": "Favoriter",
-    "ViewTypeMovieGenres": "Genrer",
-    "ViewTypeMusicLatest": "Nytillkommet",
-    "ViewTypeMusicPlaylists": "Spellistor",
-    "ViewTypeMusicAlbums": "Album",
-    "ViewTypeMusicAlbumArtists": "Albumartister",
-    "HeaderOtherDisplaySettings": "Visningsalternativ",
-    "ViewTypeMusicSongs": "L\u00e5tar",
-    "ViewTypeMusicFavorites": "Favoriter",
-    "ViewTypeMusicFavoriteAlbums": "Favoritalbum",
-    "ViewTypeMusicFavoriteArtists": "Favoritartister",
-    "ViewTypeMusicFavoriteSongs": "Favoritl\u00e5tar",
-    "ViewTypeFolders": "Mappar",
-    "ViewTypeLiveTvRecordingGroups": "Inspelningar",
-    "ViewTypeLiveTvChannels": "Kanaler",
-    "ScheduledTaskFailedWithName": "{0} misslyckades",
-    "LabelRunningTimeValue": "Speltid: {0}",
-    "ScheduledTaskStartedWithName": "{0} startad",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} installerades",
-    "PluginUpdatedWithName": "{0} uppdaterades",
-    "PluginUninstalledWithName": "{0} avinstallerades",
-    "ItemAddedWithName": "{0} lades till i biblioteket",
-    "ItemRemovedWithName": "{0} togs bort ur biblioteket",
-    "LabelIpAddressValue": "IP-adress: {0}",
-    "DeviceOnlineWithName": "{0} \u00e4r ansluten",
-    "UserOnlineFromDevice": "{0} \u00e4r uppkopplad fr\u00e5n {1}",
-    "ProviderValue": "K\u00e4lla: {0}",
-    "SubtitlesDownloadedForItem": "Undertexter har laddats ner f\u00f6r {0}",
-    "UserConfigurationUpdatedWithName": "Anv\u00e4ndarinst\u00e4llningarna f\u00f6r {0} har uppdaterats",
-    "UserCreatedWithName": "Anv\u00e4ndaren {0} har skapats",
-    "UserPasswordChangedWithName": "L\u00f6senordet f\u00f6r {0} har \u00e4ndrats",
-    "UserDeletedWithName": "Anv\u00e4ndaren {0} har tagits bort",
-    "MessageServerConfigurationUpdated": "Server konfigurationen har uppdaterats",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Serverinst\u00e4llningarnas del {0} ar uppdaterats",
-    "MessageApplicationUpdated": "Emby Server har uppdaterats",
-    "FailedLoginAttemptWithUserName": "Misslyckat inloggningsf\u00f6rs\u00f6k fr\u00e5n {0}",
-    "AuthenticationSucceededWithUserName": "{0} har autentiserats",
-    "DeviceOfflineWithName": "{0} har avbrutit anslutningen",
-    "UserLockedOutWithName": "Anv\u00e4ndare {0} har l\u00e5sts ute",
-    "UserOfflineFromDevice": "{0} har avbrutit anslutningen fr\u00e5n {1}",
-    "UserStartedPlayingItemWithValues": "{0} har p\u00e5b\u00f6rjat uppspelning av {1}",
-    "UserStoppedPlayingItemWithValues": "{0} har avslutat uppspelning av {1}",
-    "SubtitleDownloadFailureForItem": "Nerladdning av undertexter f\u00f6r {0} misslyckades",
-    "HeaderUnidentified": "Oidentifierad",
-    "HeaderImagePrimary": "Huvudbild",
-    "HeaderImageBackdrop": "Bakgrundsbild",
-    "HeaderImageLogo": "Logotyp",
-    "HeaderUserPrimaryImage": "Anv\u00e4ndarbild",
-    "HeaderOverview": "\u00d6versikt",
-    "HeaderShortOverview": "Kort \u00f6versikt",
-    "HeaderType": "Typ",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "Anv\u00e4ndare",
-    "HeaderName": "Namn",
-    "HeaderDate": "Datum",
-    "HeaderPremiereDate": "Premi\u00e4rdatum",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Premi\u00e4rdatum:",
-    "HeaderRuntime": "Speltid",
-    "HeaderPlayCount": "Antal spelningar",
-    "HeaderSeason": "S\u00e4song",
-    "HeaderSeasonNumber": "S\u00e4songsnummer:",
-    "HeaderSeries": "Serie:",
-    "HeaderNetwork": "TV-bolag",
-    "HeaderYear": "\u00c5r:",
-    "HeaderYears": "\u00c5r:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Anv\u00e4ndaromd\u00f6me",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specialavsnitt",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Spelare:",
-    "HeaderAlbumArtists": "Albumartister",
-    "HeaderAlbums": "Album",
-    "HeaderDisc": "Skiva",
-    "HeaderTrack": "Sp\u00e5r",
-    "HeaderAudio": "Ljud",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Infogad bild",
-    "HeaderResolution": "Uppl\u00f6sning",
-    "HeaderSubtitles": "Undertexter",
-    "HeaderGenres": "Genrer",
-    "HeaderCountries": "L\u00e4nder",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Sp\u00e5r",
-    "HeaderMusicArtist": "Musikartist",
-    "HeaderLocked": "L\u00e5st",
-    "HeaderStudios": "Studior",
-    "HeaderActor": "Sk\u00e5despelare",
-    "HeaderComposer": "Komposit\u00f6rer",
-    "HeaderDirector": "Regiss\u00f6r",
-    "HeaderGuestStar": "G\u00e4startist",
-    "HeaderProducer": "Producenter",
-    "HeaderWriter": "F\u00f6rfattare",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server startar. V\u00e4nligen f\u00f6rs\u00f6k igen om en kort stund."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/tr.json b/MediaBrowser.Server.Implementations/Localization/Core/tr.json
deleted file mode 100644
index a691e9d02..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/tr.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Cikis",
-    "LabelVisitCommunity": "Bizi Ziyaret Edin",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "K\u00fct\u00fcphane",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "Server Yeniden Baslat",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Uygulamalar",
-    "CategoryPlugin": "Eklenti",
-    "NotificationOptionPluginError": "Eklenti Ba\u015far\u0131s\u0131z",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Sunucu yeniden ba\u015flat\u0131lmal\u0131",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Versiyon {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Durum",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/uk.json b/MediaBrowser.Server.Implementations/Localization/Core/uk.json
deleted file mode 100644
index 0dc6afe8a..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/uk.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "\u0424\u0456\u043b\u044c\u043c\u0438",
-    "FolderTypeMusic": "\u041c\u0443\u0437\u0438\u043a\u0430",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "\u0421\u0432\u0456\u0442\u043b\u0438\u043d\u0438",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "\u0406\u0433\u0440\u0438",
-    "FolderTypeBooks": "\u041a\u043d\u0438\u0433\u0438",
-    "FolderTypeTvShows": "\u0422\u0411",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "\u0412\u0438\u0439\u0442\u0438",
-    "LabelVisitCommunity": "Visit Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Browse Library",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "\u0424\u0456\u043b\u044c\u043c\u0438",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "\u041a\u043e\u043b\u0435\u043a\u0446\u0456\u0457",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "\u041e\u0441\u0442\u0430\u043d\u043d\u0456 \u0456\u0433\u0440\u0438",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "\u0424\u0456\u043b\u044c\u043c\u0438",
-    "ViewTypeMovieCollections": "\u041a\u043e\u043b\u0435\u043a\u0446\u0456\u0457",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "\u041e\u0441\u0442\u0430\u043d\u043d\u0456",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "\u0421\u0435\u0437\u043e\u043d",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u0438",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0438",
-    "HeaderDisc": "\u0414\u0438\u0441\u043a",
-    "HeaderTrack": "\u0414\u043e\u0440\u0456\u0436\u043a\u0430",
-    "HeaderAudio": "\u0410\u0443\u0434\u0456\u043e",
-    "HeaderVideo": "\u0412\u0456\u0434\u0435\u043e",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "\u0414\u043e\u0440\u0456\u0436\u043a\u0438",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0456\u0457",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/vi.json b/MediaBrowser.Server.Implementations/Localization/Core/vi.json
deleted file mode 100644
index 6ea1d1d3f..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/vi.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Tho\u00e1t",
-    "LabelVisitCommunity": "Gh\u00e9 th\u0103m trang C\u1ed9ng \u0111\u1ed3ng",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Duy\u1ec7t th\u01b0 vi\u1ec7n",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "Kh\u1edfi \u0111\u1ed9ng l\u1ea1i m\u00e1y ch\u1ee7",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "T\u00ean",
-    "HeaderDate": "Ng\u00e0y",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Tr\u1ea1ng th\u00e1i",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/zh-CN.json b/MediaBrowser.Server.Implementations/Localization/Core/zh-CN.json
deleted file mode 100644
index 580832a9e..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/zh-CN.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App\uff1a {0}\uff0c\u8bbe\u5907\uff1a {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "\u6df7\u5408\u5185\u5bb9",
-    "FolderTypeMovies": "\u7535\u5f71",
-    "FolderTypeMusic": "\u97f3\u4e50",
-    "FolderTypeAdultVideos": "\u6210\u4eba\u89c6\u9891",
-    "FolderTypePhotos": "\u56fe\u7247",
-    "FolderTypeMusicVideos": "\u97f3\u4e50\u89c6\u9891",
-    "FolderTypeHomeVideos": "\u5bb6\u5ead\u89c6\u9891",
-    "FolderTypeGames": "\u6e38\u620f",
-    "FolderTypeBooks": "\u4e66\u7c4d",
-    "FolderTypeTvShows": "\u7535\u89c6",
-    "FolderTypeInherit": "\u7ee7\u627f",
-    "HeaderCastCrew": "\u6f14\u804c\u4eba\u5458",
-    "HeaderPeople": "\u4eba\u7269",
-    "ValueSpecialEpisodeName": "\u7279\u522b - {0}",
-    "LabelChapterName": "\u7ae0\u8282 {0}",
-    "NameSeasonNumber": "\u5b63 {0}",
-    "LabelExit": "\u9000\u51fa",
-    "LabelVisitCommunity": "\u8bbf\u95ee\u793e\u533a",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "API\u6587\u6863",
-    "LabelDeveloperResources": "\u5f00\u53d1\u8005\u8d44\u6e90",
-    "LabelBrowseLibrary": "\u6d4f\u89c8\u5a92\u4f53\u5e93",
-    "LabelConfigureServer": "\u914d\u7f6eEmby",
-    "LabelRestartServer": "\u91cd\u542f\u670d\u52a1\u5668",
-    "CategorySync": "\u540c\u6b65",
-    "CategoryUser": "\u7528\u6237",
-    "CategorySystem": "\u7cfb\u7edf",
-    "CategoryApplication": "\u5e94\u7528\u7a0b\u5e8f",
-    "CategoryPlugin": "\u63d2\u4ef6",
-    "NotificationOptionPluginError": "\u63d2\u4ef6\u5931\u8d25",
-    "NotificationOptionApplicationUpdateAvailable": "\u6709\u53ef\u7528\u7684\u5e94\u7528\u7a0b\u5e8f\u66f4\u65b0",
-    "NotificationOptionApplicationUpdateInstalled": "\u5e94\u7528\u7a0b\u5e8f\u66f4\u65b0\u5df2\u5b89\u88c5",
-    "NotificationOptionPluginUpdateInstalled": "\u63d2\u4ef6\u66f4\u65b0\u5df2\u5b89\u88c5",
-    "NotificationOptionPluginInstalled": "\u63d2\u4ef6\u5df2\u5b89\u88c5",
-    "NotificationOptionPluginUninstalled": "\u63d2\u4ef6\u5df2\u5378\u8f7d",
-    "NotificationOptionVideoPlayback": "\u89c6\u9891\u5f00\u59cb\u64ad\u653e",
-    "NotificationOptionAudioPlayback": "\u97f3\u9891\u5f00\u59cb\u64ad\u653e",
-    "NotificationOptionGamePlayback": "\u6e38\u620f\u5f00\u59cb",
-    "NotificationOptionVideoPlaybackStopped": "\u89c6\u9891\u64ad\u653e\u505c\u6b62",
-    "NotificationOptionAudioPlaybackStopped": "\u97f3\u9891\u64ad\u653e\u505c\u6b62",
-    "NotificationOptionGamePlaybackStopped": "\u6e38\u620f\u505c\u6b62",
-    "NotificationOptionTaskFailed": "\u8ba1\u5212\u4efb\u52a1\u5931\u8d25",
-    "NotificationOptionInstallationFailed": "\u5b89\u88c5\u5931\u8d25",
-    "NotificationOptionNewLibraryContent": "\u6dfb\u52a0\u65b0\u5185\u5bb9",
-    "NotificationOptionNewLibraryContentMultiple": "\u65b0\u7684\u5185\u5bb9\u52a0\u5165\uff08\u591a\u4e2a\uff09",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "\u9700\u8981\u91cd\u65b0\u542f\u52a8\u670d\u52a1\u5668",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "\u7535\u5f71",
-    "ViewTypeTvShows": "\u7535\u89c6",
-    "ViewTypeGames": "\u6e38\u620f",
-    "ViewTypeMusic": "\u97f3\u4e50",
-    "ViewTypeMusicGenres": "\u98ce\u683c",
-    "ViewTypeMusicArtists": "\u827a\u672f\u5bb6",
-    "ViewTypeBoxSets": "\u5408\u96c6",
-    "ViewTypeChannels": "\u9891\u9053",
-    "ViewTypeLiveTV": "\u7535\u89c6\u76f4\u64ad",
-    "ViewTypeLiveTvNowPlaying": "\u73b0\u5728\u64ad\u653e",
-    "ViewTypeLatestGames": "\u6700\u65b0\u6e38\u620f",
-    "ViewTypeRecentlyPlayedGames": "\u6700\u8fd1\u64ad\u653e",
-    "ViewTypeGameFavorites": "\u6211\u7684\u6700\u7231",
-    "ViewTypeGameSystems": "\u6e38\u620f\u7cfb\u7edf",
-    "ViewTypeGameGenres": "\u98ce\u683c",
-    "ViewTypeTvResume": "\u6062\u590d\u64ad\u653e",
-    "ViewTypeTvNextUp": "\u4e0b\u4e00\u4e2a",
-    "ViewTypeTvLatest": "\u6700\u65b0",
-    "ViewTypeTvShowSeries": "\u7535\u89c6\u5267",
-    "ViewTypeTvGenres": "\u98ce\u683c",
-    "ViewTypeTvFavoriteSeries": "\u6700\u559c\u6b22\u7684\u7535\u89c6\u5267",
-    "ViewTypeTvFavoriteEpisodes": "\u6700\u559c\u6b22\u7684\u5267\u96c6",
-    "ViewTypeMovieResume": "\u6062\u590d\u64ad\u653e",
-    "ViewTypeMovieLatest": "\u6700\u65b0",
-    "ViewTypeMovieMovies": "\u7535\u5f71",
-    "ViewTypeMovieCollections": "\u5408\u96c6",
-    "ViewTypeMovieFavorites": "\u6536\u85cf\u5939",
-    "ViewTypeMovieGenres": "\u98ce\u683c",
-    "ViewTypeMusicLatest": "\u6700\u65b0",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "\u4e13\u8f91",
-    "ViewTypeMusicAlbumArtists": "\u4e13\u8f91\u827a\u672f\u5bb6",
-    "HeaderOtherDisplaySettings": "\u663e\u793a\u8bbe\u7f6e",
-    "ViewTypeMusicSongs": "\u6b4c\u66f2",
-    "ViewTypeMusicFavorites": "\u6211\u7684\u6700\u7231",
-    "ViewTypeMusicFavoriteAlbums": "\u6700\u7231\u7684\u4e13\u8f91",
-    "ViewTypeMusicFavoriteArtists": "\u6700\u7231\u7684\u827a\u672f\u5bb6",
-    "ViewTypeMusicFavoriteSongs": "\u6700\u7231\u7684\u6b4c\u66f2",
-    "ViewTypeFolders": "\u6587\u4ef6\u5939",
-    "ViewTypeLiveTvRecordingGroups": "\u5f55\u5236",
-    "ViewTypeLiveTvChannels": "\u9891\u9053",
-    "ScheduledTaskFailedWithName": "{0} \u5931\u8d25",
-    "LabelRunningTimeValue": "\u8fd0\u884c\u65f6\u95f4\uff1a {0}",
-    "ScheduledTaskStartedWithName": "{0} \u5f00\u59cb",
-    "VersionNumber": "\u7248\u672c {0}",
-    "PluginInstalledWithName": "{0} \u5df2\u5b89\u88c5",
-    "PluginUpdatedWithName": "{0} \u5df2\u66f4\u65b0",
-    "PluginUninstalledWithName": "{0} \u5df2\u5378\u8f7d",
-    "ItemAddedWithName": "{0} \u5df2\u6dfb\u52a0\u5230\u5a92\u4f53\u5e93",
-    "ItemRemovedWithName": "{0} \u5df2\u4ece\u5a92\u4f53\u5e93\u4e2d\u79fb\u9664",
-    "LabelIpAddressValue": "Ip \u5730\u5740\uff1a {0}",
-    "DeviceOnlineWithName": "{0} \u5df2\u8fde\u63a5",
-    "UserOnlineFromDevice": "{0} \u5728\u7ebf\uff0c\u6765\u81ea {1}",
-    "ProviderValue": "\u63d0\u4f9b\u8005\uff1a {0}",
-    "SubtitlesDownloadedForItem": "\u5df2\u4e3a {0} \u4e0b\u8f7d\u4e86\u5b57\u5e55",
-    "UserConfigurationUpdatedWithName": "\u7528\u6237\u914d\u7f6e\u5df2\u66f4\u65b0\u4e3a {0}",
-    "UserCreatedWithName": "\u7528\u6237 {0} \u5df2\u88ab\u521b\u5efa",
-    "UserPasswordChangedWithName": "\u5df2\u4e3a\u7528\u6237 {0} \u66f4\u6539\u5bc6\u7801",
-    "UserDeletedWithName": "\u7528\u6237 {0} \u5df2\u88ab\u5220\u9664",
-    "MessageServerConfigurationUpdated": "\u670d\u52a1\u5668\u914d\u7f6e\u5df2\u66f4\u65b0",
-    "MessageNamedServerConfigurationUpdatedWithValue": "\u670d\u52a1\u5668\u914d\u7f6e {0} \u90e8\u5206\u5df2\u66f4\u65b0",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "\u5931\u8d25\u7684\u767b\u5f55\u5c1d\u8bd5\uff0c\u6765\u81ea {0}",
-    "AuthenticationSucceededWithUserName": "{0} \u6210\u529f\u88ab\u6388\u6743",
-    "DeviceOfflineWithName": "{0} \u5df2\u65ad\u5f00\u8fde\u63a5",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} \u5df2\u4ece {1} \u65ad\u5f00\u8fde\u63a5",
-    "UserStartedPlayingItemWithValues": "{0} \u5f00\u59cb\u64ad\u653e {1}",
-    "UserStoppedPlayingItemWithValues": "{0} \u505c\u6b62\u64ad\u653e {1}",
-    "SubtitleDownloadFailureForItem": "\u4e3a {0} \u4e0b\u8f7d\u5b57\u5e55\u5931\u8d25",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "\u7528\u6237",
-    "HeaderName": "\u540d\u5b57",
-    "HeaderDate": "\u65e5\u671f",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "\u53d1\u884c\u65e5\u671f",
-    "HeaderRuntime": "\u64ad\u653e\u65f6\u95f4",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "\u5b63",
-    "HeaderSeasonNumber": "\u591a\u5c11\u5b63",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "\u7f51\u7edc",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "\u516c\u4f17\u8bc4\u5206",
-    "HeaderTrailers": "\u9884\u544a\u7247",
-    "HeaderSpecials": "\u7279\u96c6",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "\u4e13\u8f91",
-    "HeaderDisc": "\u5149\u76d8",
-    "HeaderTrack": "\u97f3\u8f68",
-    "HeaderAudio": "\u97f3\u9891",
-    "HeaderVideo": "\u89c6\u9891",
-    "HeaderEmbeddedImage": "\u5d4c\u5165\u5f0f\u56fe\u50cf",
-    "HeaderResolution": "\u5206\u8fa8\u7387",
-    "HeaderSubtitles": "\u5b57\u5e55",
-    "HeaderGenres": "\u98ce\u683c",
-    "HeaderCountries": "\u56fd\u5bb6",
-    "HeaderStatus": "\u72b6\u6001",
-    "HeaderTracks": "\u97f3\u8f68",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "\u5de5\u4f5c\u5ba4",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "\u5bb6\u957f\u5206\u7ea7",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/zh-HK.json b/MediaBrowser.Server.Implementations/Localization/Core/zh-HK.json
deleted file mode 100644
index a70e7a003..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/zh-HK.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "\u6df7\u5408\u5167\u5bb9",
-    "FolderTypeMovies": "\u96fb\u5f71",
-    "FolderTypeMusic": "\u97f3\u6a02",
-    "FolderTypeAdultVideos": "\u6210\u4eba\u5f71\u7247",
-    "FolderTypePhotos": "\u76f8\u7247",
-    "FolderTypeMusicVideos": "MV",
-    "FolderTypeHomeVideos": "\u500b\u4eba\u5f71\u7247",
-    "FolderTypeGames": "\u904a\u6232",
-    "FolderTypeBooks": "\u66f8\u85c9",
-    "FolderTypeTvShows": "\u96fb\u8996\u7bc0\u76ee",
-    "FolderTypeInherit": "\u7e7c\u627f",
-    "HeaderCastCrew": "\u6f14\u54e1\u9663\u5bb9",
-    "HeaderPeople": "\u4eba\u7269",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "\u5287\u96c6\u5b63\u5ea6 {0}",
-    "LabelExit": "\u96e2\u958b",
-    "LabelVisitCommunity": "\u8a2a\u554f\u8a0e\u8ad6\u5340",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api \u6587\u4ef6",
-    "LabelDeveloperResources": "\u958b\u767c\u8005\u8cc7\u6e90",
-    "LabelBrowseLibrary": "\u700f\u89bd\u8cc7\u6599\u5eab",
-    "LabelConfigureServer": "\u8a2d\u7f6e Emby",
-    "LabelRestartServer": "\u91cd\u65b0\u555f\u52d5\u4f3a\u670d\u5668",
-    "CategorySync": "\u540c\u6b65",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "\u9700\u8981\u91cd\u65b0\u555f\u52d5",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "\u904a\u6232",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "\u85cf\u54c1",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "\u6700\u8fd1\u904a\u6232",
-    "ViewTypeRecentlyPlayedGames": "\u6700\u8fd1\u64ad\u653e",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "\u904a\u6232\u7cfb\u7d71",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "\u96fb\u8996\u5287",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "\u6211\u7684\u6700\u611b\u96fb\u8996\u5287",
-    "ViewTypeTvFavoriteEpisodes": "\u6211\u7684\u6700\u611b\u5287\u96c6",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "\u85cf\u54c1",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "\u6b4c\u66f2",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "\u6211\u7684\u6700\u611b\u6b4c\u66f2",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "\u7248\u672c {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "\u5df2\u7d93\u70ba {0} \u4e0b\u8f09\u4e86\u5b57\u5e55",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "\u70ba {0} \u4e0b\u8f09\u5b57\u5e55\u5931\u6557",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "\u540d\u7a31",
-    "HeaderDate": "\u65e5\u671f",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "\u5287\u96c6\u5b63\u5ea6",
-    "HeaderSeasonNumber": "\u5287\u96c6\u5b63\u5ea6\u6578\u76ee",
-    "HeaderSeries": "\u96fb\u8996\u5287\uff1a",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "\u904a\u6232\u7cfb\u7d71",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "\u97f3\u8a0a",
-    "HeaderVideo": "\u5f71\u7247",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "\u5b57\u5e55",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "\u72c0\u614b",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "\u6b4c\u624b",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "\u7279\u7d04\u660e\u661f",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/zh-TW.json b/MediaBrowser.Server.Implementations/Localization/Core/zh-TW.json
deleted file mode 100644
index b711aab1f..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Core/zh-TW.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "DbUpgradeMessage": "\u8acb\u7a0d\u5019\uff0cEmby\u4f3a\u670d\u5668\u8cc7\u6599\u5eab\u6b63\u5728\u66f4\u65b0...\uff08\u5df2\u5b8c\u6210{0}%\uff09",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "\u62cd\u651d\u4eba\u54e1\u53ca\u6f14\u54e1",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "\u96e2\u958b",
-    "LabelVisitCommunity": "\u8a2a\u554f\u793e\u7fa4",
-    "LabelGithub": "GitHub",
-    "LabelApiDocumentation": "API\u8aaa\u660e\u6587\u4ef6",
-    "LabelDeveloperResources": "\u958b\u767c\u4eba\u54e1\u5c08\u5340",
-    "LabelBrowseLibrary": "\u700f\u89bd\u5a92\u9ad4\u6ac3",
-    "LabelConfigureServer": "Emby\u8a2d\u5b9a",
-    "LabelRestartServer": "\u91cd\u65b0\u555f\u52d5\u4f3a\u670d\u5668",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "\u96fb\u8996",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "\u7248\u672c{0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "\u72c0\u614b",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
deleted file mode 100644
index e4db98b3f..000000000
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ /dev/null
@@ -1,422 +0,0 @@
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-
-namespace MediaBrowser.Server.Implementations.Localization
-{
-    /// <summary>
-    /// Class LocalizationManager
-    /// </summary>
-    public class LocalizationManager : ILocalizationManager
-    {
-        /// <summary>
-        /// The _configuration manager
-        /// </summary>
-        private readonly IServerConfigurationManager _configurationManager;
-
-        /// <summary>
-        /// The us culture
-        /// </summary>
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
-        private readonly ConcurrentDictionary<string, Dictionary<string, ParentalRating>> _allParentalRatings =
-            new ConcurrentDictionary<string, Dictionary<string, ParentalRating>>(StringComparer.OrdinalIgnoreCase);
-
-        private readonly IFileSystem _fileSystem;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly ILogger _logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalizationManager" /> class.
-        /// </summary>
-        /// <param name="configurationManager">The configuration manager.</param>
-        /// <param name="fileSystem">The file system.</param>
-        /// <param name="jsonSerializer">The json serializer.</param>
-        public LocalizationManager(IServerConfigurationManager configurationManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer, ILogger logger)
-        {
-            _configurationManager = configurationManager;
-            _fileSystem = fileSystem;
-            _jsonSerializer = jsonSerializer;
-            _logger = logger;
-
-            ExtractAll();
-        }
-
-        private void ExtractAll()
-        {
-            var type = GetType();
-            var resourcePath = type.Namespace + ".Ratings.";
-
-            var localizationPath = LocalizationPath;
-
-			_fileSystem.CreateDirectory(localizationPath);
-
-            var existingFiles = Directory.EnumerateFiles(localizationPath, "ratings-*.txt", SearchOption.TopDirectoryOnly)
-                .Select(Path.GetFileName)
-                .ToList();
-
-            // Extract from the assembly
-            foreach (var resource in type.Assembly
-                .GetManifestResourceNames()
-                .Where(i => i.StartsWith(resourcePath)))
-            {
-                var filename = "ratings-" + resource.Substring(resourcePath.Length);
-
-                if (!existingFiles.Contains(filename))
-                {
-                    using (var stream = type.Assembly.GetManifestResourceStream(resource))
-                    {
-                        var target = Path.Combine(localizationPath, filename);
-                        _logger.Info("Extracting ratings to {0}", target);
-
-                        using (var fs = _fileSystem.GetFileStream(target, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
-                        {
-                            stream.CopyTo(fs);
-                        }
-                    }
-                }
-            }
-
-            foreach (var file in Directory.EnumerateFiles(localizationPath, "ratings-*.txt", SearchOption.TopDirectoryOnly))
-            {
-                LoadRatings(file);
-            }
-        }
-
-        /// <summary>
-        /// Gets the localization path.
-        /// </summary>
-        /// <value>The localization path.</value>
-        public string LocalizationPath
-        {
-            get
-            {
-                return Path.Combine(_configurationManager.ApplicationPaths.ProgramDataPath, "localization");
-            }
-        }
-
-        public string RemoveDiacritics(string text)
-        {
-            return String.Concat(
-                text.Normalize(NormalizationForm.FormD)
-                .Where(ch => CharUnicodeInfo.GetUnicodeCategory(ch) !=
-                                              UnicodeCategory.NonSpacingMark)
-              ).Normalize(NormalizationForm.FormC);
-        }
-
-        public string NormalizeFormKD(string text)
-        {
-            return text.Normalize(NormalizationForm.FormKD);
-        }
-
-        /// <summary>
-        /// Gets the cultures.
-        /// </summary>
-        /// <returns>IEnumerable{CultureDto}.</returns>
-        public IEnumerable<CultureDto> GetCultures()
-        {
-            var type = GetType();
-            var path = type.Namespace + ".iso6392.txt";
-
-            var list = new List<CultureDto>();
-
-            using (var stream = type.Assembly.GetManifestResourceStream(path))
-            {
-                using (var reader = new StreamReader(stream))
-                {
-                    while (!reader.EndOfStream)
-                    {
-                        var line = reader.ReadLine();
-
-                        if (!string.IsNullOrWhiteSpace(line))
-                        {
-                            var parts = line.Split('|');
-
-                            if (parts.Length == 5)
-                            {
-                                list.Add(new CultureDto
-                                {
-                                    DisplayName = parts[3],
-                                    Name = parts[3],
-                                    ThreeLetterISOLanguageName = parts[0],
-                                    TwoLetterISOLanguageName = parts[2]
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-
-            return list.Where(i => !string.IsNullOrWhiteSpace(i.Name) &&
-                !string.IsNullOrWhiteSpace(i.DisplayName) &&
-                !string.IsNullOrWhiteSpace(i.ThreeLetterISOLanguageName) &&
-                !string.IsNullOrWhiteSpace(i.TwoLetterISOLanguageName));
-        }
-
-        /// <summary>
-        /// Gets the countries.
-        /// </summary>
-        /// <returns>IEnumerable{CountryInfo}.</returns>
-        public IEnumerable<CountryInfo> GetCountries()
-        {
-            var type = GetType();
-            var path = type.Namespace + ".countries.json";
-
-            using (var stream = type.Assembly.GetManifestResourceStream(path))
-            {
-                return _jsonSerializer.DeserializeFromStream<List<CountryInfo>>(stream);
-            }
-        }
-
-        /// <summary>
-        /// Gets the parental ratings.
-        /// </summary>
-        /// <returns>IEnumerable{ParentalRating}.</returns>
-        public IEnumerable<ParentalRating> GetParentalRatings()
-        {
-            return GetParentalRatingsDictionary().Values.ToList();
-        }
-
-        /// <summary>
-        /// Gets the parental ratings dictionary.
-        /// </summary>
-        /// <returns>Dictionary{System.StringParentalRating}.</returns>
-        private Dictionary<string, ParentalRating> GetParentalRatingsDictionary()
-        {
-            var countryCode = _configurationManager.Configuration.MetadataCountryCode;
-
-            if (string.IsNullOrEmpty(countryCode))
-            {
-                countryCode = "us";
-            }
-
-            var ratings = GetRatings(countryCode);
-
-            if (ratings == null)
-            {
-                ratings = GetRatings("us");
-            }
-
-            return ratings;
-        }
-
-        /// <summary>
-        /// Gets the ratings.
-        /// </summary>
-        /// <param name="countryCode">The country code.</param>
-        private Dictionary<string, ParentalRating> GetRatings(string countryCode)
-        {
-            Dictionary<string, ParentalRating> value;
-
-            _allParentalRatings.TryGetValue(countryCode, out value);
-
-            return value;
-        }
-
-        /// <summary>
-        /// Loads the ratings.
-        /// </summary>
-        /// <param name="file">The file.</param>
-        /// <returns>Dictionary{System.StringParentalRating}.</returns>
-        private void LoadRatings(string file)
-        {
-			var dict = File.ReadAllLines(file).Select(i =>
-            {
-                if (!string.IsNullOrWhiteSpace(i))
-                {
-                    var parts = i.Split(',');
-
-                    if (parts.Length == 2)
-                    {
-                        int value;
-
-                        if (int.TryParse(parts[1], NumberStyles.Integer, UsCulture, out value))
-                        {
-                            return new ParentalRating { Name = parts[0], Value = value };
-                        }
-                    }
-                }
-
-                return null;
-
-            })
-            .Where(i => i != null)
-            .ToDictionary(i => i.Name, StringComparer.OrdinalIgnoreCase);
-
-            var countryCode = _fileSystem.GetFileNameWithoutExtension(file)
-                .Split('-')
-                .Last();
-
-            _allParentalRatings.TryAdd(countryCode, dict);
-        }
-
-        private readonly string[] _unratedValues = {"n/a", "unrated", "not rated"};
-
-        /// <summary>
-        /// Gets the rating level.
-        /// </summary>
-        public int? GetRatingLevel(string rating)
-        {
-            if (string.IsNullOrEmpty(rating))
-            {
-                throw new ArgumentNullException("rating");
-            }
-
-            if (_unratedValues.Contains(rating, StringComparer.OrdinalIgnoreCase))
-            {
-                return null;
-            }
-
-            // Fairly common for some users to have "Rated R" in their rating field
-            rating = rating.Replace("Rated ", string.Empty, StringComparison.OrdinalIgnoreCase);
-
-            var ratingsDictionary = GetParentalRatingsDictionary();
-
-            ParentalRating value;
-
-            if (!ratingsDictionary.TryGetValue(rating, out value))
-            {
-                // If we don't find anything check all ratings systems
-                foreach (var dictionary in _allParentalRatings.Values)
-                {
-                    if (dictionary.TryGetValue(rating, out value))
-                    {
-                        return value.Value;
-                    }
-                }
-            }
-
-            return value == null ? (int?)null : value.Value;
-        }
-
-        public string GetLocalizedString(string phrase)
-        {
-            return GetLocalizedString(phrase, _configurationManager.Configuration.UICulture);
-        }
-
-        public string GetLocalizedString(string phrase, string culture)
-        {
-            var dictionary = GetLocalizationDictionary(culture);
-
-            string value;
-
-            if (dictionary.TryGetValue(phrase, out value))
-            {
-                return value;
-            }
-
-            return phrase;
-        }
-
-        private readonly ConcurrentDictionary<string, Dictionary<string, string>> _dictionaries =
-            new ConcurrentDictionary<string, Dictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
-
-        public Dictionary<string, string> GetLocalizationDictionary(string culture)
-        {
-            const string prefix = "Core";
-            var key = prefix + culture;
-
-            return _dictionaries.GetOrAdd(key, k => GetDictionary(prefix, culture, "core.json"));
-        }
-
-        private Dictionary<string, string> GetDictionary(string prefix, string culture, string baseFilename)
-        {
-            var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            var assembly = GetType().Assembly;
-            var namespaceName = GetType().Namespace + "." + prefix;
-
-            CopyInto(dictionary, namespaceName + "." + baseFilename, assembly);
-            CopyInto(dictionary, namespaceName + "." + GetResourceFilename(culture), assembly);
-
-            return dictionary;
-        }
-
-        private void CopyInto(IDictionary<string, string> dictionary, string resourcePath, Assembly assembly)
-        {
-            using (var stream = assembly.GetManifestResourceStream(resourcePath))
-            {
-                if (stream != null)
-                {
-                    var dict = _jsonSerializer.DeserializeFromStream<Dictionary<string, string>>(stream);
-
-                    foreach (var key in dict.Keys)
-                    {
-                        dictionary[key] = dict[key];
-                    }
-                }
-            }
-        }
-
-        private string GetResourceFilename(string culture)
-        {
-            var parts = culture.Split('-');
-
-            if (parts.Length == 2)
-            {
-                culture = parts[0].ToLower() + "-" + parts[1].ToUpper();
-            }
-            else
-            {
-                culture = culture.ToLower();
-            }
-
-            return culture + ".json";
-        }
-
-        public IEnumerable<LocalizatonOption> GetLocalizationOptions()
-        {
-            return new List<LocalizatonOption>
-            {
-                new LocalizatonOption{ Name="Arabic", Value="ar"},
-                new LocalizatonOption{ Name="Bulgarian (Bulgaria)", Value="bg-BG"},
-                new LocalizatonOption{ Name="Catalan", Value="ca"},
-                new LocalizatonOption{ Name="Chinese Simplified", Value="zh-CN"},
-                new LocalizatonOption{ Name="Chinese Traditional", Value="zh-TW"},
-                new LocalizatonOption{ Name="Croatian", Value="hr"},
-                new LocalizatonOption{ Name="Czech", Value="cs"},
-                new LocalizatonOption{ Name="Danish", Value="da"},
-                new LocalizatonOption{ Name="Dutch", Value="nl"},
-                new LocalizatonOption{ Name="English (United Kingdom)", Value="en-GB"},
-                new LocalizatonOption{ Name="English (United States)", Value="en-us"},
-                new LocalizatonOption{ Name="Finnish", Value="fi"},
-                new LocalizatonOption{ Name="French", Value="fr"},
-                new LocalizatonOption{ Name="French (Canada)", Value="fr-CA"},
-                new LocalizatonOption{ Name="German", Value="de"},
-                new LocalizatonOption{ Name="Greek", Value="el"},
-                new LocalizatonOption{ Name="Hebrew", Value="he"},
-                new LocalizatonOption{ Name="Hungarian", Value="hu"},
-                new LocalizatonOption{ Name="Indonesian", Value="id"},
-                new LocalizatonOption{ Name="Italian", Value="it"},
-                new LocalizatonOption{ Name="Kazakh", Value="kk"},
-                new LocalizatonOption{ Name="Norwegian Bokmål", Value="nb"},
-                new LocalizatonOption{ Name="Polish", Value="pl"},
-                new LocalizatonOption{ Name="Portuguese (Brazil)", Value="pt-BR"},
-                new LocalizatonOption{ Name="Portuguese (Portugal)", Value="pt-PT"},
-                new LocalizatonOption{ Name="Russian", Value="ru"},
-                new LocalizatonOption{ Name="Slovenian (Slovenia)", Value="sl-SI"},
-                new LocalizatonOption{ Name="Spanish", Value="es-ES"},
-                new LocalizatonOption{ Name="Spanish (Mexico)", Value="es-MX"},
-                new LocalizatonOption{ Name="Swedish", Value="sv"},
-                new LocalizatonOption{ Name="Turkish", Value="tr"},
-                new LocalizatonOption{ Name="Ukrainian", Value="uk"},
-                new LocalizatonOption{ Name="Vietnamese", Value="vi"}
-
-            }.OrderBy(i => i.Name);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/au.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/au.txt
deleted file mode 100644
index fa60f5305..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/au.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-AU-G,1
-AU-PG,5
-AU-M,6
-AU-MA15+,7
-AU-M15+,8
-AU-R18+,9 
-AU-X18+,10
-AU-RC,11
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/be.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/be.txt
deleted file mode 100644
index 99a53f664..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/be.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-BE-AL,1
-BE-MG6,2
-BE-6,3
-BE-9,5
-BE-12,6
-BE-16,8
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/br.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/br.txt
deleted file mode 100644
index 62f00fb87..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/br.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-BR-L,1
-BR-10,5
-BR-12,7
-BR-14,8
-BR-16,8
-BR-18,9
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/ca.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/ca.txt
deleted file mode 100644
index 5a110648c..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/ca.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CA-G,1
-CA-PG,5
-CA-14A,7
-CA-A,8
-CA-18A,9
-CA-R,10
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/co.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/co.txt
deleted file mode 100644
index a694a0be6..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/co.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CO-T,1
-CO-7,5
-CO-12,7
-CO-15,8
-CO-18,10
-CO-X,100
-CO-BANNED,15
-CO-E,15
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/de.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/de.txt
deleted file mode 100644
index ad1f18619..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/de.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-DE-0,1
-FSK-0,1
-DE-6,5
-FSK-6,5
-DE-12,7
-FSK-12,7
-DE-16,8
-FSK-16,8
-DE-18,9
-FSK-18,9
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/dk.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/dk.txt
deleted file mode 100644
index b9a085e01..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/dk.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-DA-A,1
-DA-7,5
-DA-11,6
-DA-15,8
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/fr.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/fr.txt
deleted file mode 100644
index 2bb205b0d..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/fr.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-FR-U,1
-FR-10,5
-FR-12,7
-FR-16,9
-FR-18,10
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/gb.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/gb.txt
deleted file mode 100644
index c1f7d0452..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/gb.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GB-U,1
-GB-PG,5
-GB-12,6
-GB-12A,7
-GB-15,8
-GB-18,9
-GB-R18,15
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/ie.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/ie.txt
deleted file mode 100644
index 283f07767..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/ie.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-IE-G,1
-IE-PG,5
-IE-12A,7
-IE-15A,8
-IE-16,9
-IE-18,10
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/jp.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/jp.txt
deleted file mode 100644
index 2e1da30d8..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/jp.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-JP-G,1
-JP-PG12,7
-JP-15+,8
-JP-18+,10
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/kz.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/kz.txt
deleted file mode 100644
index b31e12d96..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/kz.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-KZ-К,1
-KZ-БА,6
-KZ-Б14,7
-KZ-Е16,8
-KZ-Е18,10
-KZ-НА,15
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/mx.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/mx.txt
deleted file mode 100644
index 93b609c3d..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/mx.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-MX-AA,1
-MX-A,5
-MX-B,7
-MX-B-15,8
-MX-C,9
-MX-D,10
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/nl.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/nl.txt
deleted file mode 100644
index f69cc2bcc..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/nl.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-NL-AL,1
-NL-MG6,2
-NL-6,3
-NL-9,5
-NL-12,6
-NL-16,8
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/nz.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/nz.txt
deleted file mode 100644
index bc761dcab..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/nz.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-NZ-G,1
-NZ-PG,5
-NZ-M,9
-NZ-R13,7
-NZ-R15,8
-NZ-R16,9
-NZ-R18,10
-NZ-RP13,7
-NZ-RP16,9
-NZ-R,10
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/ru.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/ru.txt
deleted file mode 100644
index 1bc94affd..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/ru.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-RU-0+,1
-RU-6+,3
-RU-12+,7
-RU-16+,9
-RU-18+,10
diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/us.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/us.txt
deleted file mode 100644
index 3f5311e0e..000000000
--- a/MediaBrowser.Server.Implementations/Localization/Ratings/us.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-G,1
-E,1
-EC,1
-TV-G,1
-TV-Y,2
-TV-Y7,3
-TV-Y7-FV,4
-PG,5
-TV-PG,5
-PG-13,7
-T,7
-TV-14,8
-R,9
-M,9
-TV-MA,9
-NC-17,10
-AO,15
-RP,15
-UR,15
-NR,15
-X,15
-XXX,100
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/countries.json b/MediaBrowser.Server.Implementations/Localization/countries.json
deleted file mode 100644
index e671b3685..000000000
--- a/MediaBrowser.Server.Implementations/Localization/countries.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"Name":"AF","DisplayName":"Afghanistan","TwoLetterISORegionName":"AF","ThreeLetterISORegionName":"AFG"},{"Name":"AL","DisplayName":"Albania","TwoLetterISORegionName":"AL","ThreeLetterISORegionName":"ALB"},{"Name":"DZ","DisplayName":"Algeria","TwoLetterISORegionName":"DZ","ThreeLetterISORegionName":"DZA"},{"Name":"AR","DisplayName":"Argentina","TwoLetterISORegionName":"AR","ThreeLetterISORegionName":"ARG"},{"Name":"AM","DisplayName":"Armenia","TwoLetterISORegionName":"AM","ThreeLetterISORegionName":"ARM"},{"Name":"AU","DisplayName":"Australia","TwoLetterISORegionName":"AU","ThreeLetterISORegionName":"AUS"},{"Name":"AT","DisplayName":"Austria","TwoLetterISORegionName":"AT","ThreeLetterISORegionName":"AUT"},{"Name":"AZ","DisplayName":"Azerbaijan","TwoLetterISORegionName":"AZ","ThreeLetterISORegionName":"AZE"},{"Name":"BH","DisplayName":"Bahrain","TwoLetterISORegionName":"BH","ThreeLetterISORegionName":"BHR"},{"Name":"BD","DisplayName":"Bangladesh","TwoLetterISORegionName":"BD","ThreeLetterISORegionName":"BGD"},{"Name":"BY","DisplayName":"Belarus","TwoLetterISORegionName":"BY","ThreeLetterISORegionName":"BLR"},{"Name":"BE","DisplayName":"Belgium","TwoLetterISORegionName":"BE","ThreeLetterISORegionName":"BEL"},{"Name":"BZ","DisplayName":"Belize","TwoLetterISORegionName":"BZ","ThreeLetterISORegionName":"BLZ"},{"Name":"VE","DisplayName":"Bolivarian Republic of Venezuela","TwoLetterISORegionName":"VE","ThreeLetterISORegionName":"VEN"},{"Name":"BO","DisplayName":"Bolivia","TwoLetterISORegionName":"BO","ThreeLetterISORegionName":"BOL"},{"Name":"BA","DisplayName":"Bosnia and Herzegovina","TwoLetterISORegionName":"BA","ThreeLetterISORegionName":"BIH"},{"Name":"BW","DisplayName":"Botswana","TwoLetterISORegionName":"BW","ThreeLetterISORegionName":"BWA"},{"Name":"BR","DisplayName":"Brazil","TwoLetterISORegionName":"BR","ThreeLetterISORegionName":"BRA"},{"Name":"BN","DisplayName":"Brunei Darussalam","TwoLetterISORegionName":"BN","ThreeLetterISORegionName":"BRN"},{"Name":"BG","DisplayName":"Bulgaria","TwoLetterISORegionName":"BG","ThreeLetterISORegionName":"BGR"},{"Name":"KH","DisplayName":"Cambodia","TwoLetterISORegionName":"KH","ThreeLetterISORegionName":"KHM"},{"Name":"CM","DisplayName":"Cameroon","TwoLetterISORegionName":"CM","ThreeLetterISORegionName":"CMR"},{"Name":"CA","DisplayName":"Canada","TwoLetterISORegionName":"CA","ThreeLetterISORegionName":"CAN"},{"Name":"029","DisplayName":"Caribbean","TwoLetterISORegionName":"029","ThreeLetterISORegionName":"029"},{"Name":"CL","DisplayName":"Chile","TwoLetterISORegionName":"CL","ThreeLetterISORegionName":"CHL"},{"Name":"CO","DisplayName":"Colombia","TwoLetterISORegionName":"CO","ThreeLetterISORegionName":"COL"},{"Name":"CD","DisplayName":"Congo [DRC]","TwoLetterISORegionName":"CD","ThreeLetterISORegionName":"COD"},{"Name":"CR","DisplayName":"Costa Rica","TwoLetterISORegionName":"CR","ThreeLetterISORegionName":"CRI"},{"Name":"HR","DisplayName":"Croatia","TwoLetterISORegionName":"HR","ThreeLetterISORegionName":"HRV"},{"Name":"CZ","DisplayName":"Czech Republic","TwoLetterISORegionName":"CZ","ThreeLetterISORegionName":"CZE"},{"Name":"DK","DisplayName":"Denmark","TwoLetterISORegionName":"DK","ThreeLetterISORegionName":"DNK"},{"Name":"DO","DisplayName":"Dominican Republic","TwoLetterISORegionName":"DO","ThreeLetterISORegionName":"DOM"},{"Name":"EC","DisplayName":"Ecuador","TwoLetterISORegionName":"EC","ThreeLetterISORegionName":"ECU"},{"Name":"EG","DisplayName":"Egypt","TwoLetterISORegionName":"EG","ThreeLetterISORegionName":"EGY"},{"Name":"SV","DisplayName":"El Salvador","TwoLetterISORegionName":"SV","ThreeLetterISORegionName":"SLV"},{"Name":"ER","DisplayName":"Eritrea","TwoLetterISORegionName":"ER","ThreeLetterISORegionName":"ERI"},{"Name":"EE","DisplayName":"Estonia","TwoLetterISORegionName":"EE","ThreeLetterISORegionName":"EST"},{"Name":"ET","DisplayName":"Ethiopia","TwoLetterISORegionName":"ET","ThreeLetterISORegionName":"ETH"},{"Name":"FO","DisplayName":"Faroe Islands","TwoLetterISORegionName":"FO","ThreeLetterISORegionName":"FRO"},{"Name":"FI","DisplayName":"Finland","TwoLetterISORegionName":"FI","ThreeLetterISORegionName":"FIN"},{"Name":"FR","DisplayName":"France","TwoLetterISORegionName":"FR","ThreeLetterISORegionName":"FRA"},{"Name":"GE","DisplayName":"Georgia","TwoLetterISORegionName":"GE","ThreeLetterISORegionName":"GEO"},{"Name":"DE","DisplayName":"Germany","TwoLetterISORegionName":"DE","ThreeLetterISORegionName":"DEU"},{"Name":"GR","DisplayName":"Greece","TwoLetterISORegionName":"GR","ThreeLetterISORegionName":"GRC"},{"Name":"GL","DisplayName":"Greenland","TwoLetterISORegionName":"GL","ThreeLetterISORegionName":"GRL"},{"Name":"GT","DisplayName":"Guatemala","TwoLetterISORegionName":"GT","ThreeLetterISORegionName":"GTM"},{"Name":"HT","DisplayName":"Haiti","TwoLetterISORegionName":"HT","ThreeLetterISORegionName":"HTI"},{"Name":"HN","DisplayName":"Honduras","TwoLetterISORegionName":"HN","ThreeLetterISORegionName":"HND"},{"Name":"HK","DisplayName":"Hong Kong S.A.R.","TwoLetterISORegionName":"HK","ThreeLetterISORegionName":"HKG"},{"Name":"HU","DisplayName":"Hungary","TwoLetterISORegionName":"HU","ThreeLetterISORegionName":"HUN"},{"Name":"IS","DisplayName":"Iceland","TwoLetterISORegionName":"IS","ThreeLetterISORegionName":"ISL"},{"Name":"IN","DisplayName":"India","TwoLetterISORegionName":"IN","ThreeLetterISORegionName":"IND"},{"Name":"ID","DisplayName":"Indonesia","TwoLetterISORegionName":"ID","ThreeLetterISORegionName":"IDN"},{"Name":"IR","DisplayName":"Iran","TwoLetterISORegionName":"IR","ThreeLetterISORegionName":"IRN"},{"Name":"IQ","DisplayName":"Iraq","TwoLetterISORegionName":"IQ","ThreeLetterISORegionName":"IRQ"},{"Name":"IE","DisplayName":"Ireland","TwoLetterISORegionName":"IE","ThreeLetterISORegionName":"IRL"},{"Name":"PK","DisplayName":"Islamic Republic of Pakistan","TwoLetterISORegionName":"PK","ThreeLetterISORegionName":"PAK"},{"Name":"IL","DisplayName":"Israel","TwoLetterISORegionName":"IL","ThreeLetterISORegionName":"ISR"},{"Name":"IT","DisplayName":"Italy","TwoLetterISORegionName":"IT","ThreeLetterISORegionName":"ITA"},{"Name":"CI","DisplayName":"Ivory Coast","TwoLetterISORegionName":"CI","ThreeLetterISORegionName":"CIV"},{"Name":"JM","DisplayName":"Jamaica","TwoLetterISORegionName":"JM","ThreeLetterISORegionName":"JAM"},{"Name":"JP","DisplayName":"Japan","TwoLetterISORegionName":"JP","ThreeLetterISORegionName":"JPN"},{"Name":"JO","DisplayName":"Jordan","TwoLetterISORegionName":"JO","ThreeLetterISORegionName":"JOR"},{"Name":"KZ","DisplayName":"Kazakhstan","TwoLetterISORegionName":"KZ","ThreeLetterISORegionName":"KAZ"},{"Name":"KE","DisplayName":"Kenya","TwoLetterISORegionName":"KE","ThreeLetterISORegionName":"KEN"},{"Name":"KR","DisplayName":"Korea","TwoLetterISORegionName":"KR","ThreeLetterISORegionName":"KOR"},{"Name":"KW","DisplayName":"Kuwait","TwoLetterISORegionName":"KW","ThreeLetterISORegionName":"KWT"},{"Name":"KG","DisplayName":"Kyrgyzstan","TwoLetterISORegionName":"KG","ThreeLetterISORegionName":"KGZ"},{"Name":"LA","DisplayName":"Lao P.D.R.","TwoLetterISORegionName":"LA","ThreeLetterISORegionName":"LAO"},{"Name":"419","DisplayName":"Latin America","TwoLetterISORegionName":"419","ThreeLetterISORegionName":"419"},{"Name":"LV","DisplayName":"Latvia","TwoLetterISORegionName":"LV","ThreeLetterISORegionName":"LVA"},{"Name":"LB","DisplayName":"Lebanon","TwoLetterISORegionName":"LB","ThreeLetterISORegionName":"LBN"},{"Name":"LY","DisplayName":"Libya","TwoLetterISORegionName":"LY","ThreeLetterISORegionName":"LBY"},{"Name":"LI","DisplayName":"Liechtenstein","TwoLetterISORegionName":"LI","ThreeLetterISORegionName":"LIE"},{"Name":"LT","DisplayName":"Lithuania","TwoLetterISORegionName":"LT","ThreeLetterISORegionName":"LTU"},{"Name":"LU","DisplayName":"Luxembourg","TwoLetterISORegionName":"LU","ThreeLetterISORegionName":"LUX"},{"Name":"MO","DisplayName":"Macao S.A.R.","TwoLetterISORegionName":"MO","ThreeLetterISORegionName":"MAC"},{"Name":"MK","DisplayName":"Macedonia (FYROM)","TwoLetterISORegionName":"MK","ThreeLetterISORegionName":"MKD"},{"Name":"MY","DisplayName":"Malaysia","TwoLetterISORegionName":"MY","ThreeLetterISORegionName":"MYS"},{"Name":"MV","DisplayName":"Maldives","TwoLetterISORegionName":"MV","ThreeLetterISORegionName":"MDV"},{"Name":"ML","DisplayName":"Mali","TwoLetterISORegionName":"ML","ThreeLetterISORegionName":"MLI"},{"Name":"MT","DisplayName":"Malta","TwoLetterISORegionName":"MT","ThreeLetterISORegionName":"MLT"},{"Name":"MX","DisplayName":"Mexico","TwoLetterISORegionName":"MX","ThreeLetterISORegionName":"MEX"},{"Name":"MN","DisplayName":"Mongolia","TwoLetterISORegionName":"MN","ThreeLetterISORegionName":"MNG"},{"Name":"ME","DisplayName":"Montenegro","TwoLetterISORegionName":"ME","ThreeLetterISORegionName":"MNE"},{"Name":"MA","DisplayName":"Morocco","TwoLetterISORegionName":"MA","ThreeLetterISORegionName":"MAR"},{"Name":"NP","DisplayName":"Nepal","TwoLetterISORegionName":"NP","ThreeLetterISORegionName":"NPL"},{"Name":"NL","DisplayName":"Netherlands","TwoLetterISORegionName":"NL","ThreeLetterISORegionName":"NLD"},{"Name":"NZ","DisplayName":"New Zealand","TwoLetterISORegionName":"NZ","ThreeLetterISORegionName":"NZL"},{"Name":"NI","DisplayName":"Nicaragua","TwoLetterISORegionName":"NI","ThreeLetterISORegionName":"NIC"},{"Name":"NG","DisplayName":"Nigeria","TwoLetterISORegionName":"NG","ThreeLetterISORegionName":"NGA"},{"Name":"NO","DisplayName":"Norway","TwoLetterISORegionName":"NO","ThreeLetterISORegionName":"NOR"},{"Name":"OM","DisplayName":"Oman","TwoLetterISORegionName":"OM","ThreeLetterISORegionName":"OMN"},{"Name":"PA","DisplayName":"Panama","TwoLetterISORegionName":"PA","ThreeLetterISORegionName":"PAN"},{"Name":"PY","DisplayName":"Paraguay","TwoLetterISORegionName":"PY","ThreeLetterISORegionName":"PRY"},{"Name":"CN","DisplayName":"People's Republic of China","TwoLetterISORegionName":"CN","ThreeLetterISORegionName":"CHN"},{"Name":"PE","DisplayName":"Peru","TwoLetterISORegionName":"PE","ThreeLetterISORegionName":"PER"},{"Name":"PH","DisplayName":"Philippines","TwoLetterISORegionName":"PH","ThreeLetterISORegionName":"PHL"},{"Name":"PL","DisplayName":"Poland","TwoLetterISORegionName":"PL","ThreeLetterISORegionName":"POL"},{"Name":"PT","DisplayName":"Portugal","TwoLetterISORegionName":"PT","ThreeLetterISORegionName":"PRT"},{"Name":"MC","DisplayName":"Principality of Monaco","TwoLetterISORegionName":"MC","ThreeLetterISORegionName":"MCO"},{"Name":"PR","DisplayName":"Puerto Rico","TwoLetterISORegionName":"PR","ThreeLetterISORegionName":"PRI"},{"Name":"QA","DisplayName":"Qatar","TwoLetterISORegionName":"QA","ThreeLetterISORegionName":"QAT"},{"Name":"MD","DisplayName":"Republica Moldova","TwoLetterISORegionName":"MD","ThreeLetterISORegionName":"MDA"},{"Name":"RE","DisplayName":"Réunion","TwoLetterISORegionName":"RE","ThreeLetterISORegionName":"REU"},{"Name":"RO","DisplayName":"Romania","TwoLetterISORegionName":"RO","ThreeLetterISORegionName":"ROU"},{"Name":"RU","DisplayName":"Russia","TwoLetterISORegionName":"RU","ThreeLetterISORegionName":"RUS"},{"Name":"RW","DisplayName":"Rwanda","TwoLetterISORegionName":"RW","ThreeLetterISORegionName":"RWA"},{"Name":"SA","DisplayName":"Saudi Arabia","TwoLetterISORegionName":"SA","ThreeLetterISORegionName":"SAU"},{"Name":"SN","DisplayName":"Senegal","TwoLetterISORegionName":"SN","ThreeLetterISORegionName":"SEN"},{"Name":"RS","DisplayName":"Serbia","TwoLetterISORegionName":"RS","ThreeLetterISORegionName":"SRB"},{"Name":"CS","DisplayName":"Serbia and Montenegro (Former)","TwoLetterISORegionName":"CS","ThreeLetterISORegionName":"SCG"},{"Name":"SG","DisplayName":"Singapore","TwoLetterISORegionName":"SG","ThreeLetterISORegionName":"SGP"},{"Name":"SK","DisplayName":"Slovakia","TwoLetterISORegionName":"SK","ThreeLetterISORegionName":"SVK"},{"Name":"SI","DisplayName":"Slovenia","TwoLetterISORegionName":"SI","ThreeLetterISORegionName":"SVN"},{"Name":"SO","DisplayName":"Soomaaliya","TwoLetterISORegionName":"SO","ThreeLetterISORegionName":"SOM"},{"Name":"ZA","DisplayName":"South Africa","TwoLetterISORegionName":"ZA","ThreeLetterISORegionName":"ZAF"},{"Name":"ES","DisplayName":"Spain","TwoLetterISORegionName":"ES","ThreeLetterISORegionName":"ESP"},{"Name":"LK","DisplayName":"Sri Lanka","TwoLetterISORegionName":"LK","ThreeLetterISORegionName":"LKA"},{"Name":"SE","DisplayName":"Sweden","TwoLetterISORegionName":"SE","ThreeLetterISORegionName":"SWE"},{"Name":"CH","DisplayName":"Switzerland","TwoLetterISORegionName":"CH","ThreeLetterISORegionName":"CHE"},{"Name":"SY","DisplayName":"Syria","TwoLetterISORegionName":"SY","ThreeLetterISORegionName":"SYR"},{"Name":"TW","DisplayName":"Taiwan","TwoLetterISORegionName":"TW","ThreeLetterISORegionName":"TWN"},{"Name":"TJ","DisplayName":"Tajikistan","TwoLetterISORegionName":"TJ","ThreeLetterISORegionName":"TAJ"},{"Name":"TH","DisplayName":"Thailand","TwoLetterISORegionName":"TH","ThreeLetterISORegionName":"THA"},{"Name":"TT","DisplayName":"Trinidad and Tobago","TwoLetterISORegionName":"TT","ThreeLetterISORegionName":"TTO"},{"Name":"TN","DisplayName":"Tunisia","TwoLetterISORegionName":"TN","ThreeLetterISORegionName":"TUN"},{"Name":"TR","DisplayName":"Turkey","TwoLetterISORegionName":"TR","ThreeLetterISORegionName":"TUR"},{"Name":"TM","DisplayName":"Turkmenistan","TwoLetterISORegionName":"TM","ThreeLetterISORegionName":"TKM"},{"Name":"AE","DisplayName":"U.A.E.","TwoLetterISORegionName":"AE","ThreeLetterISORegionName":"ARE"},{"Name":"UA","DisplayName":"Ukraine","TwoLetterISORegionName":"UA","ThreeLetterISORegionName":"UKR"},{"Name":"GB","DisplayName":"United Kingdom","TwoLetterISORegionName":"GB","ThreeLetterISORegionName":"GBR"},{"Name":"US","DisplayName":"United States","TwoLetterISORegionName":"US","ThreeLetterISORegionName":"USA"},{"Name":"UY","DisplayName":"Uruguay","TwoLetterISORegionName":"UY","ThreeLetterISORegionName":"URY"},{"Name":"UZ","DisplayName":"Uzbekistan","TwoLetterISORegionName":"UZ","ThreeLetterISORegionName":"UZB"},{"Name":"VN","DisplayName":"Vietnam","TwoLetterISORegionName":"VN","ThreeLetterISORegionName":"VNM"},{"Name":"YE","DisplayName":"Yemen","TwoLetterISORegionName":"YE","ThreeLetterISORegionName":"YEM"},{"Name":"ZW","DisplayName":"Zimbabwe","TwoLetterISORegionName":"ZW","ThreeLetterISORegionName":"ZWE"}]
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/iso6392.txt b/MediaBrowser.Server.Implementations/Localization/iso6392.txt
deleted file mode 100644
index 665a5375e..000000000
--- a/MediaBrowser.Server.Implementations/Localization/iso6392.txt
+++ /dev/null
@@ -1,487 +0,0 @@
-aar||aa|Afar|afar
-abk||ab|Abkhazian|abkhaze
-ace|||Achinese|aceh
-ach|||Acoli|acoli
-ada|||Adangme|adangme
-ady|||Adyghe; Adygei|adyghé
-afa|||Afro-Asiatic languages|afro-asiatiques, langues
-afh|||Afrihili|afrihili
-afr||af|Afrikaans|afrikaans
-ain|||Ainu|aïnou
-aka||ak|Akan|akan
-akk|||Akkadian|akkadien
-alb|sqi|sq|Albanian|albanais
-ale|||Aleut|aléoute
-alg|||Algonquian languages|algonquines, langues
-alt|||Southern Altai|altai du Sud
-amh||am|Amharic|amharique
-ang|||English, Old (ca.450-1100)|anglo-saxon (ca.450-1100)
-anp|||Angika|angika
-apa|||Apache languages|apaches, langues
-ara||ar|Arabic|arabe
-arc|||Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)|araméen d'empire (700-300 BCE)
-arg||an|Aragonese|aragonais
-arm|hye|hy|Armenian|arménien
-arn|||Mapudungun; Mapuche|mapudungun; mapuche; mapuce
-arp|||Arapaho|arapaho
-art|||Artificial languages|artificielles, langues
-arw|||Arawak|arawak
-asm||as|Assamese|assamais
-ast|||Asturian; Bable; Leonese; Asturleonese|asturien; bable; léonais; asturoléonais
-ath|||Athapascan languages|athapascanes, langues
-aus|||Australian languages|australiennes, langues
-ava||av|Avaric|avar
-ave||ae|Avestan|avestique
-awa|||Awadhi|awadhi
-aym||ay|Aymara|aymara
-aze||az|Azerbaijani|azéri
-bad|||Banda languages|banda, langues
-bai|||Bamileke languages|bamiléké, langues
-bak||ba|Bashkir|bachkir
-bal|||Baluchi|baloutchi
-bam||bm|Bambara|bambara
-ban|||Balinese|balinais
-baq|eus|eu|Basque|basque
-bas|||Basa|basa
-bat|||Baltic languages|baltes, langues
-bej|||Beja; Bedawiyet|bedja
-bel||be|Belarusian|biélorusse
-bem|||Bemba|bemba
-ben||bn|Bengali|bengali
-ber|||Berber languages|berbères, langues
-bho|||Bhojpuri|bhojpuri
-bih||bh|Bihari languages|langues biharis
-bik|||Bikol|bikol
-bin|||Bini; Edo|bini; edo
-bis||bi|Bislama|bichlamar
-bla|||Siksika|blackfoot
-bnt|||Bantu (Other)|bantoues, autres langues
-bos||bs|Bosnian|bosniaque
-bra|||Braj|braj
-bre||br|Breton|breton
-btk|||Batak languages|batak, langues
-bua|||Buriat|bouriate
-bug|||Buginese|bugi
-bul||bg|Bulgarian|bulgare
-bur|mya|my|Burmese|birman
-byn|||Blin; Bilin|blin; bilen
-cad|||Caddo|caddo
-cai|||Central American Indian languages|amérindiennes de L'Amérique centrale, langues
-car|||Galibi Carib|karib; galibi; carib
-cat||ca|Catalan; Valencian|catalan; valencien
-cau|||Caucasian languages|caucasiennes, langues
-ceb|||Cebuano|cebuano
-cel|||Celtic languages|celtiques, langues; celtes, langues
-cha||ch|Chamorro|chamorro
-chb|||Chibcha|chibcha
-che||ce|Chechen|tchétchène
-chg|||Chagatai|djaghataï
-chi|zho|zh|Chinese|chinois
-chk|||Chuukese|chuuk
-chm|||Mari|mari
-chn|||Chinook jargon|chinook, jargon
-cho|||Choctaw|choctaw
-chp|||Chipewyan; Dene Suline|chipewyan
-chr|||Cherokee|cherokee
-chu||cu|Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic|slavon d'église; vieux slave; slavon liturgique; vieux bulgare
-chv||cv|Chuvash|tchouvache
-chy|||Cheyenne|cheyenne
-cmc|||Chamic languages|chames, langues
-cop|||Coptic|copte
-cor||kw|Cornish|cornique
-cos||co|Corsican|corse
-cpe|||Creoles and pidgins, English based|créoles et pidgins basés sur l'anglais
-cpf|||Creoles and pidgins, French-based |créoles et pidgins basés sur le français
-cpp|||Creoles and pidgins, Portuguese-based |créoles et pidgins basés sur le portugais
-cre||cr|Cree|cree
-crh|||Crimean Tatar; Crimean Turkish|tatar de Crimé
-crp|||Creoles and pidgins |créoles et pidgins
-csb|||Kashubian|kachoube
-cus|||Cushitic languages|couchitiques, langues
-cze|ces|cs|Czech|tchèque
-dak|||Dakota|dakota
-dan||da|Danish|danois
-dar|||Dargwa|dargwa
-day|||Land Dayak languages|dayak, langues
-del|||Delaware|delaware
-den|||Slave (Athapascan)|esclave (athapascan)
-dgr|||Dogrib|dogrib
-din|||Dinka|dinka
-div||dv|Divehi; Dhivehi; Maldivian|maldivien
-doi|||Dogri|dogri
-dra|||Dravidian languages|dravidiennes, langues
-dsb|||Lower Sorbian|bas-sorabe
-dua|||Duala|douala
-dum|||Dutch, Middle (ca.1050-1350)|néerlandais moyen (ca. 1050-1350)
-dut|nld|nl|Dutch; Flemish|néerlandais; flamand
-dyu|||Dyula|dioula
-dzo||dz|Dzongkha|dzongkha
-efi|||Efik|efik
-egy|||Egyptian (Ancient)|égyptien
-eka|||Ekajuk|ekajuk
-elx|||Elamite|élamite
-eng||en|English|anglais
-enm|||English, Middle (1100-1500)|anglais moyen (1100-1500)
-epo||eo|Esperanto|espéranto
-est||et|Estonian|estonien
-ewe||ee|Ewe|éwé
-ewo|||Ewondo|éwondo
-fan|||Fang|fang
-fao||fo|Faroese|féroïen
-fat|||Fanti|fanti
-fij||fj|Fijian|fidjien
-fil|||Filipino; Pilipino|filipino; pilipino
-fin||fi|Finnish|finnois
-fiu|||Finno-Ugrian languages|finno-ougriennes, langues
-fon|||Fon|fon
-fre|fra|fr|French|français
-frm|||French, Middle (ca.1400-1600)|français moyen (1400-1600)
-fro|||French, Old (842-ca.1400)|français ancien (842-ca.1400)
-frr|||Northern Frisian|frison septentrional
-frs|||Eastern Frisian|frison oriental
-fry||fy|Western Frisian|frison occidental
-ful||ff|Fulah|peul
-fur|||Friulian|frioulan
-gaa|||Ga|ga
-gay|||Gayo|gayo
-gba|||Gbaya|gbaya
-gem|||Germanic languages|germaniques, langues
-geo|kat|ka|Georgian|géorgien
-ger|deu|de|German|allemand
-gez|||Geez|guèze
-gil|||Gilbertese|kiribati
-gla||gd|Gaelic; Scottish Gaelic|gaélique; gaélique écossais
-gle||ga|Irish|irlandais
-glg||gl|Galician|galicien
-glv||gv|Manx|manx; mannois
-gmh|||German, Middle High (ca.1050-1500)|allemand, moyen haut (ca. 1050-1500)
-goh|||German, Old High (ca.750-1050)|allemand, vieux haut (ca. 750-1050)
-gon|||Gondi|gond
-gor|||Gorontalo|gorontalo
-got|||Gothic|gothique
-grb|||Grebo|grebo
-grc|||Greek, Ancient (to 1453)|grec ancien (jusqu'à 1453)
-gre|ell|el|Greek, Modern (1453-)|grec moderne (après 1453)
-grn||gn|Guarani|guarani
-gsw|||Swiss German; Alemannic; Alsatian|suisse alémanique; alémanique; alsacien
-guj||gu|Gujarati|goudjrati
-gwi|||Gwich'in|gwich'in
-hai|||Haida|haida
-hat||ht|Haitian; Haitian Creole|haïtien; créole haïtien
-hau||ha|Hausa|haoussa
-haw|||Hawaiian|hawaïen
-heb||he|Hebrew|hébreu
-her||hz|Herero|herero
-hil|||Hiligaynon|hiligaynon
-him|||Himachali languages; Western Pahari languages|langues himachalis; langues paharis occidentales
-hin||hi|Hindi|hindi
-hit|||Hittite|hittite
-hmn|||Hmong; Mong|hmong
-hmo||ho|Hiri Motu|hiri motu
-hrv||hr|Croatian|croate
-hsb|||Upper Sorbian|haut-sorabe
-hun||hu|Hungarian|hongrois
-hup|||Hupa|hupa
-iba|||Iban|iban
-ibo||ig|Igbo|igbo
-ice|isl|is|Icelandic|islandais
-ido||io|Ido|ido
-iii||ii|Sichuan Yi; Nuosu|yi de Sichuan
-ijo|||Ijo languages|ijo, langues
-iku||iu|Inuktitut|inuktitut
-ile||ie|Interlingue; Occidental|interlingue
-ilo|||Iloko|ilocano
-ina||ia|Interlingua (International Auxiliary Language Association)|interlingua (langue auxiliaire internationale)
-inc|||Indic languages|indo-aryennes, langues
-ind||id|Indonesian|indonésien
-ine|||Indo-European languages|indo-européennes, langues
-inh|||Ingush|ingouche
-ipk||ik|Inupiaq|inupiaq
-ira|||Iranian languages|iraniennes, langues
-iro|||Iroquoian languages|iroquoises, langues
-ita||it|Italian|italien
-jav||jv|Javanese|javanais
-jbo|||Lojban|lojban
-jpn||ja|Japanese|japonais
-jpr|||Judeo-Persian|judéo-persan
-jrb|||Judeo-Arabic|judéo-arabe
-kaa|||Kara-Kalpak|karakalpak
-kab|||Kabyle|kabyle
-kac|||Kachin; Jingpho|kachin; jingpho
-kal||kl|Kalaallisut; Greenlandic|groenlandais
-kam|||Kamba|kamba
-kan||kn|Kannada|kannada
-kar|||Karen languages|karen, langues
-kas||ks|Kashmiri|kashmiri
-kau||kr|Kanuri|kanouri
-kaw|||Kawi|kawi
-kaz||kk|Kazakh|kazakh
-kbd|||Kabardian|kabardien
-kha|||Khasi|khasi
-khi|||Khoisan languages|khoïsan, langues
-khm||km|Central Khmer|khmer central
-kho|||Khotanese; Sakan|khotanais; sakan
-kik||ki|Kikuyu; Gikuyu|kikuyu
-kin||rw|Kinyarwanda|rwanda
-kir||ky|Kirghiz; Kyrgyz|kirghiz
-kmb|||Kimbundu|kimbundu
-kok|||Konkani|konkani
-kom||kv|Komi|kom
-kon||kg|Kongo|kongo
-kor||ko|Korean|coréen
-kos|||Kosraean|kosrae
-kpe|||Kpelle|kpellé
-krc|||Karachay-Balkar|karatchai balkar
-krl|||Karelian|carélien
-kro|||Kru languages|krou, langues
-kru|||Kurukh|kurukh
-kua||kj|Kuanyama; Kwanyama|kuanyama; kwanyama
-kum|||Kumyk|koumyk
-kur||ku|Kurdish|kurde
-kut|||Kutenai|kutenai
-lad|||Ladino|judéo-espagnol
-lah|||Lahnda|lahnda
-lam|||Lamba|lamba
-lao||lo|Lao|lao
-lat||la|Latin|latin
-lav||lv|Latvian|letton
-lez|||Lezghian|lezghien
-lim||li|Limburgan; Limburger; Limburgish|limbourgeois
-lin||ln|Lingala|lingala
-lit||lt|Lithuanian|lituanien
-lol|||Mongo|mongo
-loz|||Lozi|lozi
-ltz||lb|Luxembourgish; Letzeburgesch|luxembourgeois
-lua|||Luba-Lulua|luba-lulua
-lub||lu|Luba-Katanga|luba-katanga
-lug||lg|Ganda|ganda
-lui|||Luiseno|luiseno
-lun|||Lunda|lunda
-luo|||Luo (Kenya and Tanzania)|luo (Kenya et Tanzanie)
-lus|||Lushai|lushai
-mac|mkd|mk|Macedonian|macédonien
-mad|||Madurese|madourais
-mag|||Magahi|magahi
-mah||mh|Marshallese|marshall
-mai|||Maithili|maithili
-mak|||Makasar|makassar
-mal||ml|Malayalam|malayalam
-man|||Mandingo|mandingue
-mao|mri|mi|Maori|maori
-map|||Austronesian languages|austronésiennes, langues
-mar||mr|Marathi|marathe
-mas|||Masai|massaï
-may|msa|ms|Malay|malais
-mdf|||Moksha|moksa
-mdr|||Mandar|mandar
-men|||Mende|mendé
-mga|||Irish, Middle (900-1200)|irlandais moyen (900-1200)
-mic|||Mi'kmaq; Micmac|mi'kmaq; micmac
-min|||Minangkabau|minangkabau
-mis|||Uncoded languages|langues non codées
-mkh|||Mon-Khmer languages|môn-khmer, langues
-mlg||mg|Malagasy|malgache
-mlt||mt|Maltese|maltais
-mnc|||Manchu|mandchou
-mni|||Manipuri|manipuri
-mno|||Manobo languages|manobo, langues
-moh|||Mohawk|mohawk
-mon||mn|Mongolian|mongol
-mos|||Mossi|moré
-mul|||Multiple languages|multilingue
-mun|||Munda languages|mounda, langues
-mus|||Creek|muskogee
-mwl|||Mirandese|mirandais
-mwr|||Marwari|marvari
-myn|||Mayan languages|maya, langues
-myv|||Erzya|erza
-nah|||Nahuatl languages|nahuatl, langues
-nai|||North American Indian languages|nord-amérindiennes, langues
-nap|||Neapolitan|napolitain
-nau||na|Nauru|nauruan
-nav||nv|Navajo; Navaho|navaho
-nbl||nr|Ndebele, South; South Ndebele|ndébélé du Sud
-nde||nd|Ndebele, North; North Ndebele|ndébélé du Nord
-ndo||ng|Ndonga|ndonga
-nds|||Low German; Low Saxon; German, Low; Saxon, Low|bas allemand; bas saxon; allemand, bas; saxon, bas
-nep||ne|Nepali|népalais
-new|||Nepal Bhasa; Newari|nepal bhasa; newari
-nia|||Nias|nias
-nic|||Niger-Kordofanian languages|nigéro-kordofaniennes, langues
-niu|||Niuean|niué
-nno||nn|Norwegian Nynorsk; Nynorsk, Norwegian|norvégien nynorsk; nynorsk, norvégien
-nob||nb|Bokmål, Norwegian; Norwegian Bokmål|norvégien bokmål
-nog|||Nogai|nogaï; nogay
-non|||Norse, Old|norrois, vieux
-nor||no|Norwegian|norvégien
-nqo|||N'Ko|n'ko
-nso|||Pedi; Sepedi; Northern Sotho|pedi; sepedi; sotho du Nord
-nub|||Nubian languages|nubiennes, langues
-nwc|||Classical Newari; Old Newari; Classical Nepal Bhasa|newari classique
-nya||ny|Chichewa; Chewa; Nyanja|chichewa; chewa; nyanja
-nym|||Nyamwezi|nyamwezi
-nyn|||Nyankole|nyankolé
-nyo|||Nyoro|nyoro
-nzi|||Nzima|nzema
-oci||oc|Occitan (post 1500); Provençal|occitan (après 1500); provençal
-oji||oj|Ojibwa|ojibwa
-ori||or|Oriya|oriya
-orm||om|Oromo|galla
-osa|||Osage|osage
-oss||os|Ossetian; Ossetic|ossète
-ota|||Turkish, Ottoman (1500-1928)|turc ottoman (1500-1928)
-oto|||Otomian languages|otomi, langues
-paa|||Papuan languages|papoues, langues
-pag|||Pangasinan|pangasinan
-pal|||Pahlavi|pahlavi
-pam|||Pampanga; Kapampangan|pampangan
-pan||pa|Panjabi; Punjabi|pendjabi
-pap|||Papiamento|papiamento
-pau|||Palauan|palau
-peo|||Persian, Old (ca.600-400 B.C.)|perse, vieux (ca. 600-400 av. J.-C.)
-per|fas|fa|Persian|persan
-phi|||Philippine languages|philippines, langues
-phn|||Phoenician|phénicien
-pli||pi|Pali|pali
-pol||pl|Polish|polonais
-pon|||Pohnpeian|pohnpei
-por||pt|Portuguese|portugais
-pob||pt-br|Portuguese (Brazil)|portugais
-pra|||Prakrit languages|prâkrit, langues
-pro|||Provençal, Old (to 1500)|provençal ancien (jusqu'à 1500)
-pus||ps|Pushto; Pashto|pachto
-qaa-qtz|||Reserved for local use|réservée à l'usage local
-que||qu|Quechua|quechua
-raj|||Rajasthani|rajasthani
-rap|||Rapanui|rapanui
-rar|||Rarotongan; Cook Islands Maori|rarotonga; maori des îles Cook
-roa|||Romance languages|romanes, langues
-roh||rm|Romansh|romanche
-rom|||Romany|tsigane
-rum|ron|ro|Romanian; Moldavian; Moldovan|roumain; moldave
-run||rn|Rundi|rundi
-rup|||Aromanian; Arumanian; Macedo-Romanian|aroumain; macédo-roumain
-rus||ru|Russian|russe
-sad|||Sandawe|sandawe
-sag||sg|Sango|sango
-sah|||Yakut|iakoute
-sai|||South American Indian (Other)|indiennes d'Amérique du Sud, autres langues
-sal|||Salishan languages|salishennes, langues
-sam|||Samaritan Aramaic|samaritain
-san||sa|Sanskrit|sanskrit
-sas|||Sasak|sasak
-sat|||Santali|santal
-scn|||Sicilian|sicilien
-sco|||Scots|écossais
-sel|||Selkup|selkoupe
-sem|||Semitic languages|sémitiques, langues
-sga|||Irish, Old (to 900)|irlandais ancien (jusqu'à 900)
-sgn|||Sign Languages|langues des signes
-shn|||Shan|chan
-sid|||Sidamo|sidamo
-sin||si|Sinhala; Sinhalese|singhalais
-sio|||Siouan languages|sioux, langues
-sit|||Sino-Tibetan languages|sino-tibétaines, langues
-sla|||Slavic languages|slaves, langues
-slo|slk|sk|Slovak|slovaque
-slv||sl|Slovenian|slovène
-sma|||Southern Sami|sami du Sud
-sme||se|Northern Sami|sami du Nord
-smi|||Sami languages|sames, langues
-smj|||Lule Sami|sami de Lule
-smn|||Inari Sami|sami d'Inari
-smo||sm|Samoan|samoan
-sms|||Skolt Sami|sami skolt
-sna||sn|Shona|shona
-snd||sd|Sindhi|sindhi
-snk|||Soninke|soninké
-sog|||Sogdian|sogdien
-som||so|Somali|somali
-son|||Songhai languages|songhai, langues
-sot||st|Sotho, Southern|sotho du Sud
-spa||es|Spanish; Castilian|espagnol; castillan
-srd||sc|Sardinian|sarde
-srn|||Sranan Tongo|sranan tongo
-srp||sr|Serbian|serbe
-srr|||Serer|sérère
-ssa|||Nilo-Saharan languages|nilo-sahariennes, langues
-ssw||ss|Swati|swati
-suk|||Sukuma|sukuma
-sun||su|Sundanese|soundanais
-sus|||Susu|soussou
-sux|||Sumerian|sumérien
-swa||sw|Swahili|swahili
-swe||sv|Swedish|suédois
-syc|||Classical Syriac|syriaque classique
-syr|||Syriac|syriaque
-tah||ty|Tahitian|tahitien
-tai|||Tai languages|tai, langues
-tam||ta|Tamil|tamoul
-tat||tt|Tatar|tatar
-tel||te|Telugu|télougou
-tem|||Timne|temne
-ter|||Tereno|tereno
-tet|||Tetum|tetum
-tgk||tg|Tajik|tadjik
-tgl||tl|Tagalog|tagalog
-tha||th|Thai|thaï
-tib|bod|bo|Tibetan|tibétain
-tig|||Tigre|tigré
-tir||ti|Tigrinya|tigrigna
-tiv|||Tiv|tiv
-tkl|||Tokelau|tokelau
-tlh|||Klingon; tlhIngan-Hol|klingon
-tli|||Tlingit|tlingit
-tmh|||Tamashek|tamacheq
-tog|||Tonga (Nyasa)|tonga (Nyasa)
-ton||to|Tonga (Tonga Islands)|tongan (Îles Tonga)
-tpi|||Tok Pisin|tok pisin
-tsi|||Tsimshian|tsimshian
-tsn||tn|Tswana|tswana
-tso||ts|Tsonga|tsonga
-tuk||tk|Turkmen|turkmène
-tum|||Tumbuka|tumbuka
-tup|||Tupi languages|tupi, langues
-tur||tr|Turkish|turc
-tut|||Altaic languages|altaïques, langues
-tvl|||Tuvalu|tuvalu
-twi||tw|Twi|twi
-tyv|||Tuvinian|touva
-udm|||Udmurt|oudmourte
-uga|||Ugaritic|ougaritique
-uig||ug|Uighur; Uyghur|ouïgour
-ukr||uk|Ukrainian|ukrainien
-umb|||Umbundu|umbundu
-und|||Undetermined|indéterminée
-urd||ur|Urdu|ourdou
-uzb||uz|Uzbek|ouszbek
-vai|||Vai|vaï
-ven||ve|Venda|venda
-vie||vi|Vietnamese|vietnamien
-vol||vo|Volapük|volapük
-vot|||Votic|vote
-wak|||Wakashan languages|wakashanes, langues
-wal|||Walamo|walamo
-war|||Waray|waray
-was|||Washo|washo
-wel|cym|cy|Welsh|gallois
-wen|||Sorbian languages|sorabes, langues
-wln||wa|Walloon|wallon
-wol||wo|Wolof|wolof
-xal|||Kalmyk; Oirat|kalmouk; oïrat
-xho||xh|Xhosa|xhosa
-yao|||Yao|yao
-yap|||Yapese|yapois
-yid||yi|Yiddish|yiddish
-yor||yo|Yoruba|yoruba
-ypk|||Yupik languages|yupik, langues
-zap|||Zapotec|zapotèque
-zbl|||Blissymbols; Blissymbolics; Bliss|symboles Bliss; Bliss
-zen|||Zenaga|zenaga
-zgh|||Standard Moroccan Tamazight|amazighe standard marocain
-zha||za|Zhuang; Chuang|zhuang; chuang
-znd|||Zande languages|zandé, langues
-zul||zu|Zulu|zoulou
-zun|||Zuni|zuni
-zxx|||No linguistic content; Not applicable|pas de contenu linguistique; non applicable
-zza|||Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki|zaza; dimili; dimli; kirdki; kirmanjki; zazaki
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 066ee8e30..10ebe4ea6 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -117,7 +117,6 @@
     <Compile Include="Devices\CameraUploadsFolder.cs" />
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
     <Compile Include="HttpServer\ContainerAdapter.cs" />
-    <Compile Include="HttpServer\GetSwaggerResource.cs" />
     <Compile Include="HttpServer\HttpListenerHost.cs" />
     <Compile Include="HttpServer\HttpResultFactory.cs" />
     <Compile Include="HttpServer\LoggerUtils.cs" />
@@ -126,9 +125,7 @@
     <Compile Include="HttpServer\ServerFactory.cs" />
     <Compile Include="HttpServer\ServerLogFactory.cs" />
     <Compile Include="HttpServer\ServerLogger.cs" />
-    <Compile Include="HttpServer\SocketSharp\HttpUtility.cs" />
     <Compile Include="HttpServer\SocketSharp\SharpWebSocket.cs" />
-    <Compile Include="HttpServer\SwaggerService.cs" />
     <Compile Include="HttpServer\SocketSharp\Extensions.cs" />
     <Compile Include="HttpServer\SocketSharp\RequestMono.cs" />
     <Compile Include="HttpServer\SocketSharp\WebSocketSharpListener.cs" />
@@ -158,7 +155,6 @@
     <Compile Include="LiveTv\TunerHosts\SatIp\SatIpHost.cs" />
     <Compile Include="LiveTv\TunerHosts\SatIp\TransmissionMode.cs" />
     <Compile Include="LiveTv\TunerHosts\SatIp\Utils.cs" />
-    <Compile Include="Localization\LocalizationManager.cs" />
     <Compile Include="Persistence\BaseSqliteRepository.cs" />
     <Compile Include="Persistence\DataExtensions.cs" />
     <Compile Include="Persistence\IDbConnector.cs" />
@@ -202,162 +198,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\backbone-min.js">
-      <Link>swagger-ui\lib\backbone-min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\handlebars-2.0.0.js">
-      <Link>swagger-ui\lib\handlebars-2.0.0.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\highlight.7.3.pack.js">
-      <Link>swagger-ui\lib\highlight.7.3.pack.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery-1.8.0.min.js">
-      <Link>swagger-ui\lib\jquery-1.8.0.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.ba-bbq.min.js">
-      <Link>swagger-ui\lib\jquery.ba-bbq.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.slideto.min.js">
-      <Link>swagger-ui\lib\jquery.slideto.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.wiggle.min.js">
-      <Link>swagger-ui\lib\jquery.wiggle.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\marked.js">
-      <Link>swagger-ui\lib\marked.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\shred.bundle.js">
-      <Link>swagger-ui\lib\shred.bundle.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\swagger-client.js">
-      <Link>swagger-ui\lib\swagger-client.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\swagger-oauth.js">
-      <Link>swagger-ui\lib\swagger-oauth.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\underscore-min.js">
-      <Link>swagger-ui\lib\underscore-min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\o2c.html">
-      <Link>swagger-ui\o2c.html</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\patch.js">
-      <Link>swagger-ui\patch.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.js">
-      <Link>swagger-ui\swagger-ui.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.min.js">
-      <Link>swagger-ui\swagger-ui.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.eot">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.eot</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.ttf">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.ttf</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.woff">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.woff2">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff2</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.eot">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.eot</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.ttf">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.ttf</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff2">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff2</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="Localization\Ratings\us.txt" />
-    <EmbeddedResource Include="Localization\Ratings\ru.txt" />
-    <EmbeddedResource Include="Localization\Ratings\nz.txt" />
-    <EmbeddedResource Include="Localization\Ratings\nl.txt" />
-    <EmbeddedResource Include="Localization\Ratings\mx.txt" />
-    <EmbeddedResource Include="Localization\Ratings\kz.txt" />
-    <EmbeddedResource Include="Localization\Ratings\jp.txt" />
-    <EmbeddedResource Include="Localization\Ratings\ie.txt" />
-    <EmbeddedResource Include="Localization\Ratings\gb.txt" />
-    <EmbeddedResource Include="Localization\Ratings\fr.txt" />
-    <EmbeddedResource Include="Localization\Ratings\dk.txt" />
-    <EmbeddedResource Include="Localization\Ratings\de.txt" />
-    <EmbeddedResource Include="Localization\Ratings\co.txt" />
-    <EmbeddedResource Include="Localization\Ratings\ca.txt" />
-    <EmbeddedResource Include="Localization\Ratings\br.txt" />
-    <EmbeddedResource Include="Localization\Ratings\be.txt" />
-    <EmbeddedResource Include="Localization\Ratings\au.txt" />
-    <EmbeddedResource Include="Localization\iso6392.txt" />
     <None Include="app.config" />
-    <EmbeddedResource Include="Localization\Core\ar.json" />
-    <EmbeddedResource Include="Localization\Core\bg-BG.json" />
-    <EmbeddedResource Include="Localization\Core\ca.json" />
-    <EmbeddedResource Include="Localization\Core\core.json" />
-    <EmbeddedResource Include="Localization\Core\cs.json" />
-    <EmbeddedResource Include="Localization\Core\da.json" />
-    <EmbeddedResource Include="Localization\Core\de.json" />
-    <EmbeddedResource Include="Localization\Core\el.json" />
-    <EmbeddedResource Include="Localization\Core\en-GB.json" />
-    <EmbeddedResource Include="Localization\Core\en-US.json" />
-    <EmbeddedResource Include="Localization\Core\es-AR.json" />
-    <EmbeddedResource Include="Localization\Core\es-MX.json" />
-    <EmbeddedResource Include="Localization\Core\es.json" />
-    <EmbeddedResource Include="Localization\Core\fi.json" />
-    <EmbeddedResource Include="Localization\Core\fr-CA.json" />
-    <EmbeddedResource Include="Localization\Core\fr.json" />
-    <EmbeddedResource Include="Localization\Core\gsw.json" />
-    <EmbeddedResource Include="Localization\Core\he.json" />
-    <EmbeddedResource Include="Localization\Core\hr.json" />
-    <EmbeddedResource Include="Localization\Core\hu.json" />
-    <EmbeddedResource Include="Localization\Core\id.json" />
-    <EmbeddedResource Include="Localization\Core\it.json" />
-    <EmbeddedResource Include="Localization\Core\kk.json" />
-    <EmbeddedResource Include="Localization\Core\ko.json" />
-    <EmbeddedResource Include="Localization\Core\ms.json" />
-    <EmbeddedResource Include="Localization\Core\nb.json" />
-    <EmbeddedResource Include="Localization\Core\nl.json" />
-    <EmbeddedResource Include="Localization\Core\pl.json" />
-    <EmbeddedResource Include="Localization\Core\pt-BR.json" />
-    <EmbeddedResource Include="Localization\Core\pt-PT.json" />
-    <EmbeddedResource Include="Localization\Core\ro.json" />
-    <EmbeddedResource Include="Localization\Core\ru.json" />
-    <EmbeddedResource Include="Localization\Core\sl-SI.json" />
-    <EmbeddedResource Include="Localization\Core\sv.json" />
-    <EmbeddedResource Include="Localization\Core\tr.json" />
-    <EmbeddedResource Include="Localization\Core\uk.json" />
-    <EmbeddedResource Include="Localization\Core\vi.json" />
-    <EmbeddedResource Include="Localization\Core\zh-CN.json" />
-    <EmbeddedResource Include="Localization\Core\zh-HK.json" />
-    <EmbeddedResource Include="Localization\Core\zh-TW.json" />
-    <EmbeddedResource Include="Localization\countries.json" />
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0030.ini" />
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0049.ini" />
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0070.ini" />
@@ -529,56 +370,6 @@
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\reset.css">
-      <Link>swagger-ui\css\reset.css</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\screen.css">
-      <Link>swagger-ui\css\screen.css</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\typography.css">
-      <Link>swagger-ui\css\typography.css</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.svg">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.svg</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.svg">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.svg</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\images\explorer_icons.png">
-      <Link>swagger-ui\images\explorer_icons.png</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\images\logo_small.png">
-      <Link>swagger-ui\images\logo_small.png</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\images\pet_store_api.png">
-      <Link>swagger-ui\images\pet_store_api.png</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\images\throbber.gif">
-      <Link>swagger-ui\images\throbber.gif</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\images\wordnik_api.png">
-      <Link>swagger-ui\images\wordnik_api.png</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\index.html">
-      <Link>swagger-ui\index.html</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\shred\content.js">
-      <Link>swagger-ui\lib\shred\content.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index ba04338bb..fd84940dd 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -54,7 +54,6 @@ using MediaBrowser.Server.Implementations.Configuration;
 using MediaBrowser.Server.Implementations.Devices;
 using MediaBrowser.Server.Implementations.HttpServer;
 using MediaBrowser.Server.Implementations.IO;
-using MediaBrowser.Server.Implementations.Localization;
 using MediaBrowser.Server.Implementations.Notifications;
 using MediaBrowser.Server.Implementations.Persistence;
 using MediaBrowser.Server.Implementations.Security;
@@ -107,6 +106,7 @@ using Emby.Server.Implementations.FileOrganization;
 using Emby.Server.Implementations.HttpServer.Security;
 using Emby.Server.Implementations.Library;
 using Emby.Server.Implementations.LiveTv;
+using Emby.Server.Implementations.Localization;
 using Emby.Server.Implementations.MediaEncoder;
 using Emby.Server.Implementations.Notifications;
 using Emby.Server.Implementations.Persistence;
@@ -548,7 +548,10 @@ namespace MediaBrowser.Server.Startup.Common
 
             RegisterSingleInstance(ServerConfigurationManager);
 
-            LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager, JsonSerializer, LogManager.GetLogger("LocalizationManager"));
+            IAssemblyInfo assemblyInfo = new AssemblyInfo();
+            RegisterSingleInstance<IAssemblyInfo>(assemblyInfo);
+
+            LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager, JsonSerializer, LogManager.GetLogger("LocalizationManager"), assemblyInfo, new TextLocalizer());
             StringExtensions.LocalizationManager = LocalizationManager;
             RegisterSingleInstance(LocalizationManager);
 
@@ -558,8 +561,6 @@ namespace MediaBrowser.Server.Startup.Common
             RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer(FileSystemManager, textEncoding));
 
             RegisterSingleInstance<IXmlReaderSettingsFactory>(new XmlReaderSettingsFactory());
-            IAssemblyInfo assemblyInfo = new AssemblyInfo();
-            RegisterSingleInstance<IAssemblyInfo>(assemblyInfo);
 
             UserDataManager = new UserDataManager(LogManager, ServerConfigurationManager);
             RegisterSingleInstance(UserDataManager);
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index d30d892c9..aca30aa2c 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -89,6 +89,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StartupOptions.cs" />
     <Compile Include="SystemEvents.cs" />
+    <Compile Include="TextLocalizer.cs" />
     <Compile Include="Threading\PeriodicTimer.cs" />
     <Compile Include="UnhandledExceptionWriter.cs" />
   </ItemGroup>
diff --git a/MediaBrowser.Server.Startup.Common/TextLocalizer.cs b/MediaBrowser.Server.Startup.Common/TextLocalizer.cs
new file mode 100644
index 000000000..c578199a0
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/TextLocalizer.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Emby.Server.Implementations.Localization;
+
+namespace MediaBrowser.Server.Startup.Common
+{
+    public class TextLocalizer : ITextLocalizer
+    {
+        public string RemoveDiacritics(string text)
+        {
+            return String.Concat(
+                text.Normalize(NormalizationForm.FormD)
+                .Where(ch => CharUnicodeInfo.GetUnicodeCategory(ch) !=
+                                              UnicodeCategory.NonSpacingMark)
+              ).Normalize(NormalizationForm.FormC);
+        }
+
+        public string NormalizeFormKD(string text)
+        {
+            return text.Normalize(NormalizationForm.FormKD);
+        }
+    }
+}
-- 
cgit v1.2.3


From a8b340cbb29dbcf7fd5d101e640d66470c6d32bf Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 8 Nov 2016 13:44:23 -0500
Subject: update portable projects

---
 BDInfo/BDROM.cs                                    |   4 +-
 BDInfo/TSPlaylistFile.cs                           |  10 +-
 BDInfo/TSStreamClipFile.cs                         |  14 +-
 Emby.Common.Implementations/BaseApplicationHost.cs |  10 +-
 .../Cryptography/CryptographyProvider.cs           |  17 +-
 .../HttpClientManager/HttpClientManager.cs         |   4 +-
 Emby.Common.Implementations/Net/NetSocket.cs       |  85 +++++
 Emby.Common.Implementations/Net/SocketAcceptor.cs  | 111 ++++++
 Emby.Common.Implementations/Net/SocketFactory.cs   |  37 +-
 Emby.Common.Implementations/Net/UdpSocket.cs       |  12 +-
 .../Networking/BaseNetworkManager.cs               |  91 ++++-
 .../TextEncoding/TextEncoding.cs                   |  13 +-
 Emby.Dlna/Main/DlnaEntryPoint.cs                   |   6 +-
 Emby.Dlna/PlayTo/PlayToManager.cs                  |  11 +-
 .../Connect/ConnectEntryPoint.cs                   |   8 +-
 .../Connect/ConnectManager.cs                      |   2 +-
 .../Emby.Server.Implementations.csproj             |  10 +
 .../HttpServer/LoggerUtils.cs                      |  43 +++
 .../HttpServer/RangeRequestWriter.cs               | 224 +++++++++++++
 .../HttpServer/ResponseFilter.cs                   | 129 +++++++
 .../HttpServer/SocketSharp/Extensions.cs           |  12 +
 .../HttpServer/SocketSharp/SharpWebSocket.cs       | 166 +++++++++
 .../SocketSharp/WebSocketSharpListener.cs          | 203 +++++++++++
 .../SocketSharp/WebSocketSharpResponse.cs          | 204 +++++++++++
 Emby.Server.Implementations/Library/UserManager.cs |   6 +-
 .../Security/MBLicenseFile.cs                      |  10 +-
 .../Security/PluginSecurityManager.cs              |   4 +-
 .../ServerManager/ServerManager.cs                 |   8 +-
 .../ServerManager/WebSocketConnection.cs           |  10 +-
 Emby.Server.Implementations/Sync/MediaSync.cs      |   6 +-
 .../Sync/MultiProviderSync.cs                      |   4 +-
 .../Sync/ServerSyncScheduledTask.cs                |   4 +-
 Emby.Server.Implementations/Sync/SyncManager.cs    |   4 +-
 .../Sync/TargetDataProvider.cs                     |   4 +-
 .../Updates/InstallationManager.cs                 |   6 +-
 MediaBrowser.Api/Dlna/DlnaServerService.cs         |   4 +-
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   1 +
 MediaBrowser.Common/Extensions/BaseExtensions.cs   |   2 +-
 MediaBrowser.Common/Net/INetworkManager.cs         |   5 +
 MediaBrowser.Controller/IServerApplicationHost.cs  |   2 +-
 .../MediaEncoding/MediaStreamSelector.cs           |   3 +-
 .../Net/AuthenticatedAttribute.cs                  |  14 +-
 .../BdInfo/BdInfoExaminer.cs                       |   6 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |   4 +-
 .../Probing/ProbeResultNormalizer.cs               |   4 +-
 .../Subtitles/SubtitleEncoder.cs                   |   8 +-
 MediaBrowser.Model/Cryptography/ICryptoProvider.cs |  13 +
 .../Cryptography/ICryptographyProvider.cs          |  14 -
 MediaBrowser.Model/IO/IMemoryStreamFactory.cs      |  12 +
 MediaBrowser.Model/IO/IMemoryStreamProvider.cs     |  11 -
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   8 +-
 MediaBrowser.Model/Net/ISocket.cs                  |  16 +
 MediaBrowser.Model/Net/ISocketFactory.cs           |  14 +-
 MediaBrowser.Model/Net/IpAddressInfo.cs            |  29 +-
 MediaBrowser.Model/Net/IpEndPointInfo.cs           |  14 +-
 MediaBrowser.Model/Services/IHasRequestFilter.cs   |  13 +-
 MediaBrowser.Model/Services/IHttpResult.cs         |  47 +++
 MediaBrowser.Model/Services/IRequest.cs            |  10 -
 .../Services/QueryParamCollection.cs               |  31 +-
 MediaBrowser.Model/Text/ITextEncoding.cs           |  10 +
 MediaBrowser.Model/TextEncoding/IEncoding.cs       |  12 -
 MediaBrowser.Providers/Manager/ImageSaver.cs       |   4 +-
 MediaBrowser.Providers/Manager/ProviderManager.cs  |   4 +-
 .../MediaInfo/SubtitleResolver.cs                  |  13 +-
 .../TV/TheTVDB/TvdbSeriesProvider.cs               |   4 +-
 .../HttpServer/ContainerAdapter.cs                 |  11 +-
 .../HttpServer/HttpListenerHost.cs                 | 371 ++++++++++++---------
 .../HttpServer/HttpResultFactory.cs                |   1 +
 .../HttpServer/LoggerUtils.cs                      |  43 ---
 .../HttpServer/RangeRequestWriter.cs               | 230 -------------
 .../HttpServer/ResponseFilter.cs                   | 127 -------
 .../HttpServer/ServerFactory.cs                    |  15 +-
 .../HttpServer/ServerLogFactory.cs                 |  46 ---
 .../HttpServer/ServerLogger.cs                     | 194 -----------
 .../HttpServer/SocketSharp/Extensions.cs           |  28 --
 .../HttpServer/SocketSharp/RequestMono.cs          |  13 +-
 .../HttpServer/SocketSharp/SharpWebSocket.cs       | 172 ----------
 .../SocketSharp/WebSocketSharpListener.cs          | 216 ------------
 .../SocketSharp/WebSocketSharpRequest.cs           | 100 ++----
 .../SocketSharp/WebSocketSharpResponse.cs          | 152 ---------
 .../IO/MemoryStreamProvider.cs                     |  16 +-
 .../MediaBrowser.Server.Implementations.csproj     |  18 +-
 .../Persistence/DataExtensions.cs                  |   4 +-
 .../SqliteDisplayPreferencesRepository.cs          |   4 +-
 .../Persistence/SqliteItemRepository.cs            |   4 +-
 .../Persistence/SqliteUserRepository.cs            |   4 +-
 .../packages.config                                |   1 -
 .../ApplicationHost.cs                             |  54 ++-
 Nuget/MediaBrowser.Common.nuspec                   |   2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |   4 +-
 OpenSubtitlesHandler/Utilities.cs                  |  10 +-
 91 files changed, 1899 insertions(+), 1765 deletions(-)
 create mode 100644 Emby.Common.Implementations/Net/NetSocket.cs
 create mode 100644 Emby.Common.Implementations/Net/SocketAcceptor.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/LoggerUtils.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/ResponseFilter.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/SocketSharp/Extensions.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
 create mode 100644 MediaBrowser.Model/Cryptography/ICryptoProvider.cs
 delete mode 100644 MediaBrowser.Model/Cryptography/ICryptographyProvider.cs
 create mode 100644 MediaBrowser.Model/IO/IMemoryStreamFactory.cs
 delete mode 100644 MediaBrowser.Model/IO/IMemoryStreamProvider.cs
 create mode 100644 MediaBrowser.Model/Net/ISocket.cs
 create mode 100644 MediaBrowser.Model/Services/IHttpResult.cs
 create mode 100644 MediaBrowser.Model/Text/ITextEncoding.cs
 delete mode 100644 MediaBrowser.Model/TextEncoding/IEncoding.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/Extensions.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/BDInfo/BDROM.cs b/BDInfo/BDROM.cs
index 2a23645b1..97dbfbf3b 100644
--- a/BDInfo/BDROM.cs
+++ b/BDInfo/BDROM.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 
 namespace BDInfo
 {
@@ -75,7 +75,7 @@ namespace BDInfo
         public event OnPlaylistFileScanError PlaylistFileScanError;
 
         public BDROM(
-            string path, IFileSystem fileSystem, IEncoding textEncoding)
+            string path, IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             _fileSystem = fileSystem;
             //
diff --git a/BDInfo/TSPlaylistFile.cs b/BDInfo/TSPlaylistFile.cs
index 2826b3c80..46d66f513 100644
--- a/BDInfo/TSPlaylistFile.cs
+++ b/BDInfo/TSPlaylistFile.cs
@@ -23,14 +23,14 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 
 namespace BDInfo
 {
     public class TSPlaylistFile
     {
         private readonly IFileSystem _fileSystem;
-        private readonly IEncoding _textEncoding;
+        private readonly ITextEncoding _textEncoding;
         private FileSystemMetadata FileInfo = null;
         public string FileType = null;
         public bool IsInitialized = false;
@@ -67,7 +67,7 @@ namespace BDInfo
 
         public TSPlaylistFile(
             BDROM bdrom,
-            FileSystemMetadata fileInfo, IFileSystem fileSystem, IEncoding textEncoding)
+            FileSystemMetadata fileInfo, IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             BDROM = bdrom;
             FileInfo = fileInfo;
@@ -79,7 +79,7 @@ namespace BDInfo
         public TSPlaylistFile(
             BDROM bdrom,
             string name,
-            List<TSStreamClip> clips, IFileSystem fileSystem, IEncoding textEncoding)
+            List<TSStreamClip> clips, IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             BDROM = bdrom;
             Name = name;
@@ -1247,7 +1247,7 @@ namespace BDInfo
             ref int pos)
         {
             string val =
-                _textEncoding.GetASCIIString(data, pos, count);
+                _textEncoding.GetASCIIEncoding().GetString(data, pos, count);
 
             pos += count;
 
diff --git a/BDInfo/TSStreamClipFile.cs b/BDInfo/TSStreamClipFile.cs
index 118e3b5fc..f2accb88d 100644
--- a/BDInfo/TSStreamClipFile.cs
+++ b/BDInfo/TSStreamClipFile.cs
@@ -23,14 +23,14 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 
 namespace BDInfo
 {
     public class TSStreamClipFile
     {
         private readonly IFileSystem _fileSystem;
-        private readonly IEncoding _textEncoding;
+        private readonly ITextEncoding _textEncoding;
         public FileSystemMetadata FileInfo = null;
         public string FileType = null;
         public bool IsValid = false;
@@ -40,7 +40,7 @@ namespace BDInfo
             new Dictionary<ushort,TSStream>();
 
         public TSStreamClipFile(
-            FileSystemMetadata fileInfo, IFileSystem fileSystem, IEncoding textEncoding)
+            FileSystemMetadata fileInfo, IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             FileInfo = fileInfo;
             _fileSystem = fileSystem;
@@ -70,7 +70,7 @@ namespace BDInfo
                 byte[] fileType = new byte[8];
                 Array.Copy(data, 0, fileType, 0, fileType.Length);
                 
-                FileType = _textEncoding.GetASCIIString(fileType, 0, fileType.Length);
+                FileType = _textEncoding.GetASCIIEncoding().GetString(fileType, 0, fileType.Length);
                 if (FileType != "HDMV0100" &&
                     FileType != "HDMV0200")
                 {
@@ -167,7 +167,7 @@ namespace BDInfo
                             Array.Copy(clipData, streamOffset + 3,
                                 languageBytes, 0, languageBytes.Length);
                             string languageCode =
-                                _textEncoding.GetASCIIString(languageBytes, 0, languageBytes.Length);
+                                _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
 
                             TSChannelLayout channelLayout = (TSChannelLayout)
                                 (clipData[streamOffset + 2] >> 4);
@@ -198,7 +198,7 @@ namespace BDInfo
                             Array.Copy(clipData, streamOffset + 2,
                                 languageBytes, 0, languageBytes.Length);
                             string languageCode =
-                                _textEncoding.GetASCIIString(languageBytes, 0, languageBytes.Length);
+                                _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
 
                                 stream = new TSGraphicsStream();
                             stream.LanguageCode = languageCode;
@@ -218,7 +218,7 @@ namespace BDInfo
                             Array.Copy(clipData, streamOffset + 3,
                                 languageBytes, 0, languageBytes.Length);
                             string languageCode =
-                                _textEncoding.GetASCIIString(languageBytes, 0, languageBytes.Length);
+                                _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
 #if DEBUG
                             Debug.WriteLine(string.Format(
                                 "\t{0} {1} {2}",
diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs
index 9585abb2a..0cf11e825 100644
--- a/Emby.Common.Implementations/BaseApplicationHost.cs
+++ b/Emby.Common.Implementations/BaseApplicationHost.cs
@@ -170,7 +170,7 @@ namespace Emby.Common.Implementations
         /// <value><c>true</c> if this instance is running as service; otherwise, <c>false</c>.</value>
         public abstract bool IsRunningAsService { get; }
 
-        protected ICryptographyProvider CryptographyProvider = new CryptographyProvider();
+        protected ICryptoProvider CryptographyProvider = new CryptographyProvider();
 
         protected IEnvironmentInfo EnvironmentInfo = new Emby.Common.Implementations.EnvironmentInfo.EnvironmentInfo();
 
@@ -183,7 +183,7 @@ namespace Emby.Common.Implementations
                 {
                     _deviceId = new DeviceId(ApplicationPaths, LogManager.GetLogger("SystemId"), FileSystemManager);
                 }
-
+             
                 return _deviceId.Value;
             }
         }
@@ -193,7 +193,7 @@ namespace Emby.Common.Implementations
             get { return EnvironmentInfo.OperatingSystemName; }
         }
 
-        public IMemoryStreamProvider MemoryStreamProvider { get; set; }
+        public IMemoryStreamFactory MemoryStreamProvider { get; set; }
 
         /// <summary>
         /// The container
@@ -209,7 +209,7 @@ namespace Emby.Common.Implementations
         {
             // hack alert, until common can target .net core
             BaseExtensions.CryptographyProvider = CryptographyProvider;
-
+            
             XmlSerializer = new MyXmlSerializer(fileSystem, logManager.GetLogger("XmlSerializer"));
             FailedAssemblies = new List<string>();
 
@@ -267,7 +267,7 @@ namespace Emby.Common.Implementations
             progress.Report(100);
         }
 
-        protected abstract IMemoryStreamProvider CreateMemoryStreamProvider();
+        protected abstract IMemoryStreamFactory CreateMemoryStreamProvider();
         protected abstract ISystemEvents CreateSystemEvents();
 
         protected virtual void OnLoggerLoaded(bool isFirstLoad)
diff --git a/Emby.Common.Implementations/Cryptography/CryptographyProvider.cs b/Emby.Common.Implementations/Cryptography/CryptographyProvider.cs
index 7b8d95b96..01a31bcc0 100644
--- a/Emby.Common.Implementations/Cryptography/CryptographyProvider.cs
+++ b/Emby.Common.Implementations/Cryptography/CryptographyProvider.cs
@@ -6,21 +6,14 @@ using MediaBrowser.Model.Cryptography;
 
 namespace Emby.Common.Implementations.Cryptography
 {
-    public class CryptographyProvider : ICryptographyProvider
+    public class CryptographyProvider : ICryptoProvider
     {
         public Guid GetMD5(string str)
         {
-            return new Guid(GetMD5Bytes(str));
-        }
-        public byte[] GetMD5Bytes(string str)
-        {
-            using (var provider = MD5.Create())
-            {
-                return provider.ComputeHash(Encoding.Unicode.GetBytes(str));
-            }
+            return new Guid(ComputeMD5(Encoding.Unicode.GetBytes(str)));
         }
 
-        public byte[] GetSHA1Bytes(byte[] bytes)
+        public byte[] ComputeSHA1(byte[] bytes)
         {
             using (var provider = SHA1.Create())
             {
@@ -28,7 +21,7 @@ namespace Emby.Common.Implementations.Cryptography
             }
         }
 
-        public byte[] GetMD5Bytes(Stream str)
+        public byte[] ComputeMD5(Stream str)
         {
             using (var provider = MD5.Create())
             {
@@ -36,7 +29,7 @@ namespace Emby.Common.Implementations.Cryptography
             }
         }
 
-        public byte[] GetMD5Bytes(byte[] bytes)
+        public byte[] ComputeMD5(byte[] bytes)
         {
             using (var provider = MD5.Create())
             {
diff --git a/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
index 85fcb556f..06af5af53 100644
--- a/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
@@ -42,7 +42,7 @@ namespace Emby.Common.Implementations.HttpClientManager
         private readonly IApplicationPaths _appPaths;
 
         private readonly IFileSystem _fileSystem;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpClientManager" /> class.
@@ -53,7 +53,7 @@ namespace Emby.Common.Implementations.HttpClientManager
         /// <exception cref="System.ArgumentNullException">appPaths
         /// or
         /// logger</exception>
-        public HttpClientManager(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem, IMemoryStreamProvider memoryStreamProvider)
+        public HttpClientManager(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem, IMemoryStreamFactory memoryStreamProvider)
         {
             if (appPaths == null)
             {
diff --git a/Emby.Common.Implementations/Net/NetSocket.cs b/Emby.Common.Implementations/Net/NetSocket.cs
new file mode 100644
index 000000000..72faa41a9
--- /dev/null
+++ b/Emby.Common.Implementations/Net/NetSocket.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using Emby.Common.Implementations.Networking;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Logging;
+
+namespace Emby.Common.Implementations.Net
+{
+    public class NetSocket : ISocket
+    {
+        public Socket Socket { get; private set; }
+        private readonly ILogger _logger;
+
+        public NetSocket(Socket socket, ILogger logger)
+        {
+            Socket = socket;
+            _logger = logger;
+        }
+
+        public IpEndPointInfo LocalEndPoint
+        {
+            get
+            {
+                return BaseNetworkManager.ToIpEndPointInfo((IPEndPoint)Socket.LocalEndPoint);
+            }
+        }
+
+        public IpEndPointInfo RemoteEndPoint
+        {
+            get
+            {
+                return BaseNetworkManager.ToIpEndPointInfo((IPEndPoint)Socket.RemoteEndPoint);
+            }
+        }
+
+        public void Close()
+        {
+#if NET46
+            Socket.Close();
+#else
+                        Socket.Dispose();
+#endif
+        }
+
+        public void Shutdown(bool both)
+        {
+            if (both)
+            {
+                Socket.Shutdown(SocketShutdown.Both);
+            }
+            else
+            {
+                // Change interface if ever needed
+                throw new NotImplementedException();
+            }
+        }
+
+        public void Listen(int backlog)
+        {
+            Socket.Listen(backlog);
+        }
+
+        public void Bind(IpEndPointInfo endpoint)
+        {
+            var nativeEndpoint = BaseNetworkManager.ToIPEndPoint(endpoint);
+
+            Socket.Bind(nativeEndpoint);
+        }
+
+        private SocketAcceptor _acceptor;
+        public void StartAccept(Action<ISocket> onAccept, Func<bool> isClosed)
+        {
+            _acceptor = new SocketAcceptor(_logger, Socket, onAccept, isClosed);
+
+            _acceptor.StartAccept();
+        }
+
+        public void Dispose()
+        {
+            Socket.Dispose();
+        }
+    }
+}
diff --git a/Emby.Common.Implementations/Net/SocketAcceptor.cs b/Emby.Common.Implementations/Net/SocketAcceptor.cs
new file mode 100644
index 000000000..fd65e9fbc
--- /dev/null
+++ b/Emby.Common.Implementations/Net/SocketAcceptor.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Net.Sockets;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+
+namespace Emby.Common.Implementations.Net
+{
+    public class SocketAcceptor
+    {
+        private readonly ILogger _logger;
+        private readonly Socket _originalSocket;
+        private readonly Func<bool> _isClosed;
+        private readonly Action<ISocket> _onAccept;
+
+        public SocketAcceptor(ILogger logger, Socket originalSocket, Action<ISocket> onAccept, Func<bool> isClosed)
+        {
+            _logger = logger;
+            _originalSocket = originalSocket;
+            _isClosed = isClosed;
+            _onAccept = onAccept;
+        }
+
+        public void StartAccept()
+        {
+            Socket dummy = null;
+            StartAccept(null, ref dummy);
+        }
+
+        public void StartAccept(SocketAsyncEventArgs acceptEventArg, ref Socket accepted)
+        {
+            if (acceptEventArg == null)
+            {
+                acceptEventArg = new SocketAsyncEventArgs();
+                acceptEventArg.Completed += new EventHandler<SocketAsyncEventArgs>(AcceptEventArg_Completed);
+            }
+            else
+            {
+                // socket must be cleared since the context object is being reused
+                acceptEventArg.AcceptSocket = null;
+            }
+
+            try
+            {
+                bool willRaiseEvent = _originalSocket.AcceptAsync(acceptEventArg);
+
+                if (!willRaiseEvent)
+                {
+                    ProcessAccept(acceptEventArg);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (accepted != null)
+                {
+                    try
+                    {
+#if NET46
+                        accepted.Close();
+#else
+                        accepted.Dispose();
+#endif
+                    }
+                    catch
+                    {
+                    }
+                    accepted = null;
+                }
+            }
+        }
+
+        // This method is the callback method associated with Socket.AcceptAsync  
+        // operations and is invoked when an accept operation is complete 
+        // 
+        void AcceptEventArg_Completed(object sender, SocketAsyncEventArgs e)
+        {
+            ProcessAccept(e);
+        }
+
+        private void ProcessAccept(SocketAsyncEventArgs e)
+        {
+            if (_isClosed())
+            {
+                return;
+            }
+
+            // http://msdn.microsoft.com/en-us/library/system.net.sockets.socket.acceptasync%28v=vs.110%29.aspx
+            // Under certain conditions ConnectionReset can occur
+            // Need to attept to re-accept
+            if (e.SocketError == SocketError.ConnectionReset)
+            {
+                _logger.Error("SocketError.ConnectionReset reported. Attempting to re-accept.");
+                Socket dummy = null;
+                StartAccept(e, ref dummy);
+                return;
+            }
+
+            var acceptSocket = e.AcceptSocket;
+            if (acceptSocket != null)
+            {
+                //ProcessAccept(acceptSocket);
+                _onAccept(new NetSocket(acceptSocket, _logger));
+            }
+
+            if (_originalSocket != null)
+            {
+                // Accept the next connection request
+                StartAccept(e, ref acceptSocket);
+            }
+        }
+    }
+}
diff --git a/Emby.Common.Implementations/Net/SocketFactory.cs b/Emby.Common.Implementations/Net/SocketFactory.cs
index bb38c72da..922b0f3cc 100644
--- a/Emby.Common.Implementations/Net/SocketFactory.cs
+++ b/Emby.Common.Implementations/Net/SocketFactory.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 
 namespace Emby.Common.Implementations.Net
@@ -22,16 +23,28 @@ namespace Emby.Common.Implementations.Net
         /// </summary>
         private IPAddress _LocalIP;
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="localIP">A string containing the IP address of the local network adapter to bind sockets to. Null or empty string will use <see cref="IPAddress.Any"/>.</param>
-        public SocketFactory(string localIP)
+        private ILogger _logger;
+
+        public SocketFactory(ILogger logger)
+        {
+            _logger = logger;
+            _LocalIP = IPAddress.Any;
+        }
+
+        public ISocket CreateSocket(IpAddressFamily family, MediaBrowser.Model.Net.SocketType socketType, MediaBrowser.Model.Net.ProtocolType protocolType, bool dualMode)
         {
-            if (String.IsNullOrEmpty(localIP))
-                _LocalIP = IPAddress.Any;
-            else
-                _LocalIP = IPAddress.Parse(localIP);
+            var addressFamily = family == IpAddressFamily.InterNetwork
+                ? AddressFamily.InterNetwork
+                : AddressFamily.InterNetworkV6;
+
+            var socket = new Socket(addressFamily, System.Net.Sockets.SocketType.Stream, System.Net.Sockets.ProtocolType.Tcp);
+
+            if (dualMode)
+            {
+                socket.DualMode = true;
+            }
+
+            return new NetSocket(socket, _logger);
         }
 
         #region ISocketFactory Members
@@ -44,7 +57,7 @@ namespace Emby.Common.Implementations.Net
         {
             if (localPort < 0) throw new ArgumentException("localPort cannot be less than zero.", "localPort");
 
-            var retVal = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            var retVal = new Socket(AddressFamily.InterNetwork, System.Net.Sockets.SocketType.Dgram, System.Net.Sockets.ProtocolType.Udp);
             try
             {
                 retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
@@ -68,7 +81,7 @@ namespace Emby.Common.Implementations.Net
         {
             if (localPort < 0) throw new ArgumentException("localPort cannot be less than zero.", "localPort");
 
-            var retVal = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            var retVal = new Socket(AddressFamily.InterNetwork, System.Net.Sockets.SocketType.Dgram, System.Net.Sockets.ProtocolType.Udp);
             try
             {
                 retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
@@ -99,7 +112,7 @@ namespace Emby.Common.Implementations.Net
             if (multicastTimeToLive <= 0) throw new ArgumentException("multicastTimeToLive cannot be zero or less.", "multicastTimeToLive");
             if (localPort < 0) throw new ArgumentException("localPort cannot be less than zero.", "localPort");
 
-            var retVal = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            var retVal = new Socket(AddressFamily.InterNetwork, System.Net.Sockets.SocketType.Dgram, System.Net.Sockets.ProtocolType.Udp);
 
             try
             {
diff --git a/Emby.Common.Implementations/Net/UdpSocket.cs b/Emby.Common.Implementations/Net/UdpSocket.cs
index d999d3fe8..244b37bb4 100644
--- a/Emby.Common.Implementations/Net/UdpSocket.cs
+++ b/Emby.Common.Implementations/Net/UdpSocket.cs
@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Security;
 using System.Threading.Tasks;
+using Emby.Common.Implementations.Networking;
 using MediaBrowser.Model.Net;
 
 namespace Emby.Common.Implementations.Net
@@ -174,16 +175,7 @@ namespace Emby.Common.Implementations.Net
                 return null;
             }
 
-            return new IpEndPointInfo
-            {
-                IpAddress = new IpAddressInfo
-                {
-                    Address = endpoint.Address.ToString(),
-                    IsIpv6 = endpoint.AddressFamily == AddressFamily.InterNetworkV6
-                },
-
-                Port = endpoint.Port
-            };
+            return BaseNetworkManager.ToIpEndPointInfo(endpoint);
         }
 
         private void ProcessResponse(IAsyncResult asyncResult)
diff --git a/Emby.Common.Implementations/Networking/BaseNetworkManager.cs b/Emby.Common.Implementations/Networking/BaseNetworkManager.cs
index 10d0db968..f1ac8413b 100644
--- a/Emby.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/Emby.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -22,14 +22,10 @@ namespace Emby.Common.Implementations.Networking
             Logger = logger;
         }
 
-        private List<IPAddress> _localIpAddresses;
+        private List<IpAddressInfo> _localIpAddresses;
         private readonly object _localIpAddressSyncLock = new object();
 
-        /// <summary>
-        /// Gets the machine's local ip address
-        /// </summary>
-        /// <returns>IPAddress.</returns>
-		public IEnumerable<IPAddress> GetLocalIpAddresses()
+        public IEnumerable<IpAddressInfo> GetLocalIpAddresses()
         {
             const int cacheMinutes = 5;
 
@@ -39,7 +35,7 @@ namespace Emby.Common.Implementations.Networking
 
                 if (_localIpAddresses == null || forceRefresh)
                 {
-                    var addresses = GetLocalIpAddressesInternal().ToList();
+                    var addresses = GetLocalIpAddressesInternal().Select(ToIpAddressInfo).ToList();
 
                     _localIpAddresses = addresses;
                     _lastRefresh = DateTime.UtcNow;
@@ -405,18 +401,85 @@ namespace Emby.Common.Implementations.Networking
             IPAddress address;
             if (IPAddress.TryParse(ipAddress, out address))
             {
-
-                ipAddressInfo = new IpAddressInfo
-                {
-                    Address = address.ToString(),
-                    IsIpv6 = address.AddressFamily == AddressFamily.InterNetworkV6
-                };
-
+                ipAddressInfo = ToIpAddressInfo(address);
                 return true;
             }
 
             ipAddressInfo = null;
             return false;
         }
+
+        public static IpEndPointInfo ToIpEndPointInfo(IPEndPoint endpoint)
+        {
+            if (endpoint == null)
+            {
+                return null;
+            }
+
+            return new IpEndPointInfo(ToIpAddressInfo(endpoint.Address), endpoint.Port);
+        }
+
+        public static IPEndPoint ToIPEndPoint(IpEndPointInfo endpoint)
+        {
+            if (endpoint == null)
+            {
+                return null;
+            }
+
+            return new IPEndPoint(ToIPAddress(endpoint.IpAddress), endpoint.Port);
+        }
+
+        public static IPAddress ToIPAddress(IpAddressInfo address)
+        {
+            if (address.Equals(IpAddressInfo.Any))
+            {
+                return IPAddress.Any;
+            }
+            if (address.Equals(IpAddressInfo.IPv6Any))
+            {
+                return IPAddress.IPv6Any;
+            }
+            if (address.Equals(IpAddressInfo.Loopback))
+            {
+                return IPAddress.Loopback;
+            }
+            if (address.Equals(IpAddressInfo.IPv6Loopback))
+            {
+                return IPAddress.IPv6Loopback;
+            }
+
+            return IPAddress.Parse(address.Address);
+        }
+
+        public static IpAddressInfo ToIpAddressInfo(IPAddress address)
+        {
+            if (address.Equals(IPAddress.Any))
+            {
+                return IpAddressInfo.Any;
+            }
+            if (address.Equals(IPAddress.IPv6Any))
+            {
+                return IpAddressInfo.IPv6Any;
+            }
+            if (address.Equals(IPAddress.Loopback))
+            {
+                return IpAddressInfo.Loopback;
+            }
+            if (address.Equals(IPAddress.IPv6Loopback))
+            {
+                return IpAddressInfo.IPv6Loopback;
+            }
+            return new IpAddressInfo
+            {
+                Address = address.ToString(),
+                AddressFamily = address.AddressFamily == AddressFamily.InterNetworkV6 ? IpAddressFamily.InterNetworkV6 : IpAddressFamily.InterNetwork
+            };
+        }
+
+        public async Task<IpAddressInfo[]> GetHostAddressesAsync(string host)
+        {
+            var addresses = await Dns.GetHostAddressesAsync(host).ConfigureAwait(false);
+            return addresses.Select(ToIpAddressInfo).ToArray();
+        }
     }
 }
diff --git a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs
index 35b869e43..254d35222 100644
--- a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs
+++ b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs
@@ -1,10 +1,10 @@
 using System.Text;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 
 namespace Emby.Common.Implementations.TextEncoding
 {
-    public class TextEncoding : IEncoding
+    public class TextEncoding : ITextEncoding
     {
         private readonly IFileSystem _fileSystem;
 
@@ -13,14 +13,9 @@ namespace Emby.Common.Implementations.TextEncoding
             _fileSystem = fileSystem;
         }
 
-        public byte[] GetASCIIBytes(string text)
+        public Encoding GetASCIIEncoding()
         {
-            return Encoding.ASCII.GetBytes(text);
-        }
-
-        public string GetASCIIString(byte[] bytes, int startIndex, int length)
-        {
-            return Encoding.ASCII.GetString(bytes, 0, bytes.Length);
+            return Encoding.ASCII;
         }
 
         public Encoding GetFileEncoding(string srcFile)
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index 142b9f96e..ef27c029d 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -250,14 +250,12 @@ namespace Emby.Dlna.Main
                 //    continue;
                 //}
 
-                var addressString = address.ToString();
-
                 var fullService = "urn:schemas-upnp-org:device:MediaServer:1";
 
-                _logger.Info("Registering publisher for {0} on {1}", fullService, addressString);
+                _logger.Info("Registering publisher for {0} on {1}", fullService, address.ToString());
 
                 var descriptorUri = "/dlna/" + udn + "/description.xml";
-                var uri = new Uri(_appHost.GetLocalApiUrl(addressString, address.IsIpv6) + descriptorUri);
+                var uri = new Uri(_appHost.GetLocalApiUrl(address) + descriptorUri);
 
                 var device = new SsdpRootDevice
                 {
diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs
index b714f4ac0..a93f7da14 100644
--- a/Emby.Dlna/PlayTo/PlayToManager.cs
+++ b/Emby.Dlna/PlayTo/PlayToManager.cs
@@ -16,6 +16,7 @@ using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Threading;
 
 namespace Emby.Dlna.PlayTo
@@ -131,11 +132,11 @@ namespace Emby.Dlna.PlayTo
                     string serverAddress;
                     if (info.LocalIpAddress == null)
                     {
-                        serverAddress = await GetServerAddress(null, false).ConfigureAwait(false);
+                        serverAddress = await GetServerAddress(null).ConfigureAwait(false);
                     }
                     else
                     {
-                        serverAddress = await GetServerAddress(info.LocalIpAddress.Address, info.LocalIpAddress.IsIpv6).ConfigureAwait(false);
+                        serverAddress = await GetServerAddress(info.LocalIpAddress).ConfigureAwait(false);
                     }
 
                     string accessToken = null;
@@ -189,14 +190,14 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private Task<string> GetServerAddress(string ipAddress, bool isIpv6)
+        private Task<string> GetServerAddress(IpAddressInfo address)
         {
-            if (string.IsNullOrWhiteSpace(ipAddress))
+            if (address == null)
             {
                 return _appHost.GetLocalApiUrl();
             }
 
-            return Task.FromResult(_appHost.GetLocalApiUrl(ipAddress, isIpv6));
+            return Task.FromResult(_appHost.GetLocalApiUrl(address));
         }
 
         public void Dispose()
diff --git a/Emby.Server.Implementations/Connect/ConnectEntryPoint.cs b/Emby.Server.Implementations/Connect/ConnectEntryPoint.cs
index d7574d466..170ef07f3 100644
--- a/Emby.Server.Implementations/Connect/ConnectEntryPoint.cs
+++ b/Emby.Server.Implementations/Connect/ConnectEntryPoint.cs
@@ -64,7 +64,7 @@ namespace Emby.Server.Implementations.Connect
                     validIpAddress = await GetIpAddress(ipLookupUrl).ConfigureAwait(false);
 
                     // Try to find the ipv4 address, if present
-                    if (!validIpAddress.IsIpv6)
+                    if (validIpAddress.AddressFamily != IpAddressFamily.InterNetworkV6)
                     {
                         break;
                     }
@@ -77,9 +77,9 @@ namespace Emby.Server.Implementations.Connect
                     _logger.ErrorException("Error getting connection info", ex);
                 }
             }
-
+           
             // If this produced an ipv6 address, try again
-            if (validIpAddress != null && validIpAddress.IsIpv6)
+            if (validIpAddress != null && validIpAddress.AddressFamily == IpAddressFamily.InterNetworkV6)
             {
                 foreach (var ipLookupUrl in _ipLookups)
                 {
@@ -88,7 +88,7 @@ namespace Emby.Server.Implementations.Connect
                         var newAddress = await GetIpAddress(ipLookupUrl, true).ConfigureAwait(false);
 
                         // Try to find the ipv4 address, if present
-                        if (!newAddress.IsIpv6)
+                        if (newAddress.AddressFamily != IpAddressFamily.InterNetworkV6)
                         {
                             validIpAddress = newAddress;
                             break;
diff --git a/Emby.Server.Implementations/Connect/ConnectManager.cs b/Emby.Server.Implementations/Connect/ConnectManager.cs
index 6c2ac40c3..079bfe868 100644
--- a/Emby.Server.Implementations/Connect/ConnectManager.cs
+++ b/Emby.Server.Implementations/Connect/ConnectManager.cs
@@ -74,7 +74,7 @@ namespace Emby.Server.Implementations.Connect
 
                 if (string.IsNullOrWhiteSpace(address) && DiscoveredWanIpAddress != null)
                 {
-                    if (DiscoveredWanIpAddress.IsIpv6)
+                    if (DiscoveredWanIpAddress.AddressFamily == IpAddressFamily.InterNetworkV6)
                     {
                         address = "[" + DiscoveredWanIpAddress + "]";
                     }
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 894ba334d..806702dfd 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -68,11 +68,18 @@
     <Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
     <Compile Include="FileOrganization\TvFolderOrganizer.cs" />
     <Compile Include="HttpServer\GetSwaggerResource.cs" />
+    <Compile Include="HttpServer\LoggerUtils.cs" />
+    <Compile Include="HttpServer\RangeRequestWriter.cs" />
+    <Compile Include="HttpServer\ResponseFilter.cs" />
+    <Compile Include="HttpServer\SocketSharp\Extensions.cs" />
     <Compile Include="HttpServer\SocketSharp\HttpUtility.cs" />
     <Compile Include="HttpServer\IHttpListener.cs" />
     <Compile Include="HttpServer\Security\AuthorizationContext.cs" />
     <Compile Include="HttpServer\Security\AuthService.cs" />
     <Compile Include="HttpServer\Security\SessionContext.cs" />
+    <Compile Include="HttpServer\SocketSharp\SharpWebSocket.cs" />
+    <Compile Include="HttpServer\SocketSharp\WebSocketSharpListener.cs" />
+    <Compile Include="HttpServer\SocketSharp\WebSocketSharpResponse.cs" />
     <Compile Include="HttpServer\StreamWriter.cs" />
     <Compile Include="HttpServer\SwaggerService.cs" />
     <Compile Include="Images\BaseDynamicImageProvider.cs" />
@@ -254,6 +261,9 @@
       <Project>{442b5058-dcaf-4263-bb6a-f21e31120a1b}</Project>
       <Name>MediaBrowser.Providers</Name>
     </ProjectReference>
+    <Reference Include="SocketHttpListener.Portable">
+      <HintPath>..\ThirdParty\emby\SocketHttpListener.Portable.dll</HintPath>
+    </Reference>
     <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UniversalDetector.1.0.1\lib\portable-net45+sl4+wp71+win8+wpa81\UniversalDetector.dll</HintPath>
       <Private>True</Private>
diff --git a/Emby.Server.Implementations/HttpServer/LoggerUtils.cs b/Emby.Server.Implementations/HttpServer/LoggerUtils.cs
new file mode 100644
index 000000000..8fc92a09a
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/LoggerUtils.cs
@@ -0,0 +1,43 @@
+using MediaBrowser.Model.Logging;
+using System;
+using System.Globalization;
+using SocketHttpListener.Net;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    public static class LoggerUtils
+    {
+        /// <summary>
+        /// Logs the request.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="request">The request.</param>
+        public static void LogRequest(ILogger logger, HttpListenerRequest request)
+        {
+            var url = request.Url.ToString();
+
+            logger.Info("{0} {1}. UserAgent: {2}", request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod, url, request.UserAgent ?? string.Empty);
+        }
+
+        public static void LogRequest(ILogger logger, string url, string method, string userAgent)
+        {
+            logger.Info("{0} {1}. UserAgent: {2}", "HTTP " + method, url, userAgent ?? string.Empty);
+        }
+
+        /// <summary>
+        /// Logs the response.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="statusCode">The status code.</param>
+        /// <param name="url">The URL.</param>
+        /// <param name="endPoint">The end point.</param>
+        /// <param name="duration">The duration.</param>
+        public static void LogResponse(ILogger logger, int statusCode, string url, string endPoint, TimeSpan duration)
+        {
+            var durationMs = duration.TotalMilliseconds;
+            var logSuffix = durationMs >= 1000 && durationMs < 60000 ? "ms (slow)" : "ms";
+
+            logger.Info("HTTP Response {0} to {1}. Time: {2}{3}. {4}", statusCode, endPoint, Convert.ToInt32(durationMs).ToString(CultureInfo.InvariantCulture), logSuffix, url);
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs b/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
new file mode 100644
index 000000000..e88994bec
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
@@ -0,0 +1,224 @@
+using MediaBrowser.Model.Logging;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    public class RangeRequestWriter : IAsyncStreamWriter, IHttpResult
+    {
+        /// <summary>
+        /// Gets or sets the source stream.
+        /// </summary>
+        /// <value>The source stream.</value>
+        private Stream SourceStream { get; set; }
+        private string RangeHeader { get; set; }
+        private bool IsHeadRequest { get; set; }
+
+        private long RangeStart { get; set; }
+        private long RangeEnd { get; set; }
+        private long RangeLength { get; set; }
+        private long TotalContentLength { get; set; }
+
+        public Action OnComplete { get; set; }
+        private readonly ILogger _logger;
+
+        private const int BufferSize = 81920;
+
+        /// <summary>
+        /// The _options
+        /// </summary>
+        private readonly Dictionary<string, string> _options = new Dictionary<string, string>();
+
+        /// <summary>
+        /// The us culture
+        /// </summary>
+        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
+        public List<Cookie> Cookies { get; private set; }
+
+        /// <summary>
+        /// Additional HTTP Headers
+        /// </summary>
+        /// <value>The headers.</value>
+        public IDictionary<string, string> Headers
+        {
+            get { return _options; }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamWriter" /> class.
+        /// </summary>
+        /// <param name="rangeHeader">The range header.</param>
+        /// <param name="source">The source.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <param name="isHeadRequest">if set to <c>true</c> [is head request].</param>
+        public RangeRequestWriter(string rangeHeader, Stream source, string contentType, bool isHeadRequest, ILogger logger)
+        {
+            if (string.IsNullOrEmpty(contentType))
+            {
+                throw new ArgumentNullException("contentType");
+            }
+
+            RangeHeader = rangeHeader;
+            SourceStream = source;
+            IsHeadRequest = isHeadRequest;
+            this._logger = logger;
+
+            ContentType = contentType;
+            Headers["Content-Type"] = contentType;
+            Headers["Accept-Ranges"] = "bytes";
+            StatusCode = HttpStatusCode.PartialContent;
+
+            Cookies = new List<Cookie>();
+            SetRangeValues();
+        }
+
+        /// <summary>
+        /// Sets the range values.
+        /// </summary>
+        private void SetRangeValues()
+        {
+            var requestedRange = RequestedRanges[0];
+
+            TotalContentLength = SourceStream.Length;
+
+            // If the requested range is "0-", we can optimize by just doing a stream copy
+            if (!requestedRange.Value.HasValue)
+            {
+                RangeEnd = TotalContentLength - 1;
+            }
+            else
+            {
+                RangeEnd = requestedRange.Value.Value;
+            }
+
+            RangeStart = requestedRange.Key;
+            RangeLength = 1 + RangeEnd - RangeStart;
+
+            // Content-Length is the length of what we're serving, not the original content
+            Headers["Content-Length"] = RangeLength.ToString(UsCulture);
+            Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", RangeStart, RangeEnd, TotalContentLength);
+
+            if (RangeStart > 0)
+            {
+                SourceStream.Position = RangeStart;
+            }
+        }
+
+        /// <summary>
+        /// The _requested ranges
+        /// </summary>
+        private List<KeyValuePair<long, long?>> _requestedRanges;
+        /// <summary>
+        /// Gets the requested ranges.
+        /// </summary>
+        /// <value>The requested ranges.</value>
+        protected List<KeyValuePair<long, long?>> RequestedRanges
+        {
+            get
+            {
+                if (_requestedRanges == null)
+                {
+                    _requestedRanges = new List<KeyValuePair<long, long?>>();
+
+                    // Example: bytes=0-,32-63
+                    var ranges = RangeHeader.Split('=')[1].Split(',');
+
+                    foreach (var range in ranges)
+                    {
+                        var vals = range.Split('-');
+
+                        long start = 0;
+                        long? end = null;
+
+                        if (!string.IsNullOrEmpty(vals[0]))
+                        {
+                            start = long.Parse(vals[0], UsCulture);
+                        }
+                        if (!string.IsNullOrEmpty(vals[1]))
+                        {
+                            end = long.Parse(vals[1], UsCulture);
+                        }
+
+                        _requestedRanges.Add(new KeyValuePair<long, long?>(start, end));
+                    }
+                }
+
+                return _requestedRanges;
+            }
+        }
+
+        public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
+        {
+            try
+            {
+                // Headers only
+                if (IsHeadRequest)
+                {
+                    return;
+                }
+
+                using (var source = SourceStream)
+                {
+                    // If the requested range is "0-", we can optimize by just doing a stream copy
+                    if (RangeEnd >= TotalContentLength - 1)
+                    {
+                        await source.CopyToAsync(responseStream, BufferSize).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        await CopyToInternalAsync(source, responseStream, RangeLength).ConfigureAwait(false);
+                    }
+                }
+            }
+            finally
+            {
+                if (OnComplete != null)
+                {
+                    OnComplete();
+                }
+            }
+        }
+
+        private async Task CopyToInternalAsync(Stream source, Stream destination, long copyLength)
+        {
+            var array = new byte[BufferSize];
+            int count;
+            while ((count = await source.ReadAsync(array, 0, array.Length).ConfigureAwait(false)) != 0)
+            {
+                var bytesToCopy = Math.Min(count, copyLength);
+
+                await destination.WriteAsync(array, 0, Convert.ToInt32(bytesToCopy)).ConfigureAwait(false);
+
+                copyLength -= bytesToCopy;
+
+                if (copyLength <= 0)
+                {
+                    break;
+                }
+            }
+        }
+
+        public string ContentType { get; set; }
+
+        public IRequest RequestContext { get; set; }
+
+        public object Response { get; set; }
+
+        public int Status { get; set; }
+
+        public HttpStatusCode StatusCode
+        {
+            get { return (HttpStatusCode)Status; }
+            set { Status = (int)value; }
+        }
+
+        public string StatusDescription { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
new file mode 100644
index 000000000..6d9d7d921
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -0,0 +1,129 @@
+using MediaBrowser.Model.Logging;
+using System;
+using System.Globalization;
+using System.Text;
+using Emby.Server.Implementations.HttpServer.SocketSharp;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    public class ResponseFilter
+    {
+        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+        private readonly ILogger _logger;
+
+        public ResponseFilter(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Filters the response.
+        /// </summary>
+        /// <param name="req">The req.</param>
+        /// <param name="res">The res.</param>
+        /// <param name="dto">The dto.</param>
+        public void FilterResponse(IRequest req, IResponse res, object dto)
+        {
+            // Try to prevent compatibility view
+            res.AddHeader("X-UA-Compatible", "IE=Edge");
+            res.AddHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
+            res.AddHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
+            res.AddHeader("Access-Control-Allow-Origin", "*");
+
+            var exception = dto as Exception;
+
+            if (exception != null)
+            {
+                _logger.ErrorException("Error processing request for {0}", exception, req.RawUrl);
+
+                if (!string.IsNullOrEmpty(exception.Message))
+                {
+                    var error = exception.Message.Replace(Environment.NewLine, " ");
+                    error = RemoveControlCharacters(error);
+
+                    res.AddHeader("X-Application-Error-Code", error);
+                }
+            }
+
+            var vary = "Accept-Encoding";
+
+            var hasHeaders = dto as IHasHeaders;
+            var sharpResponse = res as WebSocketSharpResponse;
+
+            if (hasHeaders != null)
+            {
+                if (!hasHeaders.Headers.ContainsKey("Server"))
+                {
+                    hasHeaders.Headers["Server"] = "Mono-HTTPAPI/1.1, UPnP/1.0 DLNADOC/1.50";
+                    //hasHeaders.Headers["Server"] = "Mono-HTTPAPI/1.1";
+                }
+
+                // Content length has to be explicitly set on on HttpListenerResponse or it won't be happy
+                string contentLength;
+
+                if (hasHeaders.Headers.TryGetValue("Content-Length", out contentLength) && !string.IsNullOrEmpty(contentLength))
+                {
+                    var length = long.Parse(contentLength, UsCulture);
+
+                    if (length > 0)
+                    {
+                        res.SetContentLength(length);
+                        
+                        //var listenerResponse = res.OriginalResponse as HttpListenerResponse;
+
+                        //if (listenerResponse != null)
+                        //{
+                        //    // Disable chunked encoding. Technically this is only needed when using Content-Range, but
+                        //    // anytime we know the content length there's no need for it
+                        //    listenerResponse.SendChunked = false;
+                        //    return;
+                        //}
+
+                        if (sharpResponse != null)
+                        {
+                            sharpResponse.SendChunked = false;
+                        }
+                    }
+                }
+
+                string hasHeadersVary;
+                if (hasHeaders.Headers.TryGetValue("Vary", out hasHeadersVary))
+                {
+                    vary = hasHeadersVary;
+                }
+
+                hasHeaders.Headers["Vary"] = vary;
+            }
+
+            //res.KeepAlive = false;
+
+            // Per Google PageSpeed
+            // This instructs the proxies to cache two versions of the resource: one compressed, and one uncompressed. 
+            // The correct version of the resource is delivered based on the client request header. 
+            // This is a good choice for applications that are singly homed and depend on public proxies for user locality.                        
+            res.AddHeader("Vary", vary);
+        }
+
+        /// <summary>
+        /// Removes the control characters.
+        /// </summary>
+        /// <param name="inString">The in string.</param>
+        /// <returns>System.String.</returns>
+        public static string RemoveControlCharacters(string inString)
+        {
+            if (inString == null) return null;
+
+            var newString = new StringBuilder();
+
+            foreach (var ch in inString)
+            {
+                if (!char.IsControl(ch))
+                {
+                    newString.Append(ch);
+                }
+            }
+            return newString.ToString();
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/Extensions.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/Extensions.cs
new file mode 100644
index 000000000..07a338f19
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/Extensions.cs
@@ -0,0 +1,12 @@
+using SocketHttpListener.Net;
+
+namespace Emby.Server.Implementations.HttpServer.SocketSharp
+{
+    public static class Extensions
+    {
+        public static string GetOperationName(this HttpListenerRequest request)
+        {
+            return request.Url.Segments[request.Url.Segments.Length - 1];
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
new file mode 100644
index 000000000..0a312f7b9
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -0,0 +1,166 @@
+using MediaBrowser.Common.Events;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Logging;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using WebSocketState = MediaBrowser.Model.Net.WebSocketState;
+
+namespace Emby.Server.Implementations.HttpServer.SocketSharp
+{
+    public class SharpWebSocket : IWebSocket
+    {
+        /// <summary>
+        /// The logger
+        /// </summary>
+        private readonly ILogger _logger;
+
+        public event EventHandler<EventArgs> Closed;
+
+        /// <summary>
+        /// Gets or sets the web socket.
+        /// </summary>
+        /// <value>The web socket.</value>
+        private SocketHttpListener.WebSocket WebSocket { get; set; }
+
+        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
+
+        public SharpWebSocket(SocketHttpListener.WebSocket socket, ILogger logger)
+        {
+            if (socket == null)
+            {
+                throw new ArgumentNullException("socket");
+            }
+
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+
+            _logger = logger;
+            WebSocket = socket;
+
+            socket.OnMessage += socket_OnMessage;
+            socket.OnClose += socket_OnClose;
+            socket.OnError += socket_OnError;
+
+            WebSocket.ConnectAsServer();
+        }
+
+        void socket_OnError(object sender, SocketHttpListener.ErrorEventArgs e)
+        {
+            _logger.Error("Error in SharpWebSocket: {0}", e.Message ?? string.Empty);
+            //EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
+        }
+
+        void socket_OnClose(object sender, SocketHttpListener.CloseEventArgs e)
+        {
+            EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
+        }
+
+        void socket_OnMessage(object sender, SocketHttpListener.MessageEventArgs e)
+        {
+            //if (!string.IsNullOrWhiteSpace(e.Data))
+            //{
+            //    if (OnReceive != null)
+            //    {
+            //        OnReceive(e.Data);
+            //    }
+            //    return;
+            //}
+            if (OnReceiveBytes != null)
+            {
+                OnReceiveBytes(e.RawData);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public WebSocketState State
+        {
+            get
+            {
+                WebSocketState commonState;
+
+                if (!Enum.TryParse(WebSocket.ReadyState.ToString(), true, out commonState))
+                {
+                    _logger.Warn("Unrecognized WebSocketState: {0}", WebSocket.ReadyState.ToString());
+                }
+
+                return commonState;
+            }
+        }
+
+        /// <summary>
+        /// Sends the async.
+        /// </summary>
+        /// <param name="bytes">The bytes.</param>
+        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        public Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken)
+        {
+            var completionSource = new TaskCompletionSource<bool>();
+
+            WebSocket.SendAsync(bytes, res => completionSource.TrySetResult(true));
+
+            return completionSource.Task;
+        }
+
+        /// <summary>
+        /// Sends the asynchronous.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        public Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken)
+        {
+            var completionSource = new TaskCompletionSource<bool>();
+
+            WebSocket.SendAsync(text, res => completionSource.TrySetResult(true));
+
+            return completionSource.Task;
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                WebSocket.OnMessage -= socket_OnMessage;
+                WebSocket.OnClose -= socket_OnClose;
+                WebSocket.OnError -= socket_OnError;
+
+                _cancellationTokenSource.Cancel();
+
+                WebSocket.Close();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receive action.
+        /// </summary>
+        /// <value>The receive action.</value>
+        public Action<byte[]> OnReceiveBytes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the on receive.
+        /// </summary>
+        /// <value>The on receive.</value>
+        public Action<string> OnReceive { get; set; }
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
new file mode 100644
index 000000000..0cb4d428b
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -0,0 +1,203 @@
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Logging;
+using SocketHttpListener.Net;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Emby.Server.Implementations.Logging;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Primitives;
+
+namespace Emby.Server.Implementations.HttpServer.SocketSharp
+{
+    public class WebSocketSharpListener : IHttpListener
+    {
+        private HttpListener _listener;
+
+        private readonly ILogger _logger;
+        private readonly ICertificate _certificate;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
+        private readonly ITextEncoding _textEncoding;
+        private readonly INetworkManager _networkManager;
+        private readonly ISocketFactory _socketFactory;
+        private readonly ICryptoProvider _cryptoProvider;
+        private readonly IStreamFactory _streamFactory;
+        private readonly Func<HttpListenerContext, IHttpRequest> _httpRequestFactory;
+
+        public WebSocketSharpListener(ILogger logger, ICertificate certificate, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, INetworkManager networkManager, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, Func<HttpListenerContext, IHttpRequest> httpRequestFactory)
+        {
+            _logger = logger;
+            _certificate = certificate;
+            _memoryStreamProvider = memoryStreamProvider;
+            _textEncoding = textEncoding;
+            _networkManager = networkManager;
+            _socketFactory = socketFactory;
+            _cryptoProvider = cryptoProvider;
+            _streamFactory = streamFactory;
+            _httpRequestFactory = httpRequestFactory;
+        }
+
+        public Action<Exception, IRequest> ErrorHandler { get; set; }
+        public Func<IHttpRequest, Uri, Task> RequestHandler { get; set; }
+
+        public Action<WebSocketConnectingEventArgs> WebSocketConnecting { get; set; }
+
+        public Action<WebSocketConnectEventArgs> WebSocketConnected { get; set; }
+
+        public void Start(IEnumerable<string> urlPrefixes)
+        {
+            if (_listener == null)
+                _listener = new HttpListener(new PatternsLogger(_logger), _cryptoProvider, _streamFactory, _socketFactory, _networkManager, _textEncoding, _memoryStreamProvider);
+
+            if (_certificate != null)
+            {
+                _listener.LoadCert(_certificate);
+            }
+
+            foreach (var prefix in urlPrefixes)
+            {
+                _logger.Info("Adding HttpListener prefix " + prefix);
+                _listener.Prefixes.Add(prefix);
+            }
+
+            _listener.OnContext = ProcessContext;
+
+            _listener.Start();
+        }
+
+        private void ProcessContext(HttpListenerContext context)
+        {
+            Task.Factory.StartNew(() => InitTask(context));
+        }
+
+        private Task InitTask(HttpListenerContext context)
+        {
+            IHttpRequest httpReq = null;
+            var request = context.Request;
+
+            try
+            {
+                if (request.IsWebSocketRequest)
+                {
+                    LoggerUtils.LogRequest(_logger, request);
+
+                    ProcessWebSocketRequest(context);
+                    return Task.FromResult(true);
+                }
+
+                httpReq = GetRequest(context);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error processing request", ex);
+
+                httpReq = httpReq ?? GetRequest(context);
+                ErrorHandler(ex, httpReq);
+                return Task.FromResult(true);
+            }
+
+            return RequestHandler(httpReq, request.Url);
+        }
+
+        private void ProcessWebSocketRequest(HttpListenerContext ctx)
+        {
+            try
+            {
+                var endpoint = ctx.Request.RemoteEndPoint.ToString();
+                var url = ctx.Request.RawUrl;
+
+                var connectingArgs = new WebSocketConnectingEventArgs
+                {
+                    Url = url,
+                    QueryString = ctx.Request.QueryString,
+                    Endpoint = endpoint
+                };
+
+                if (WebSocketConnecting != null)
+                {
+                    WebSocketConnecting(connectingArgs);
+                }
+
+                if (connectingArgs.AllowConnection)
+                {
+                    _logger.Debug("Web socket connection allowed");
+
+                    var webSocketContext = ctx.AcceptWebSocket(null);
+
+                    if (WebSocketConnected != null)
+                    {
+                        WebSocketConnected(new WebSocketConnectEventArgs
+                        {
+                            Url = url,
+                            QueryString = ctx.Request.QueryString,
+                            WebSocket = new SharpWebSocket(webSocketContext.WebSocket, _logger),
+                            Endpoint = endpoint
+                        });
+                    }
+                }
+                else
+                {
+                    _logger.Warn("Web socket connection not allowed");
+                    ctx.Response.StatusCode = 401;
+                    ctx.Response.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("AcceptWebSocketAsync error", ex);
+                ctx.Response.StatusCode = 500;
+                ctx.Response.Close();
+            }
+        }
+
+        private IHttpRequest GetRequest(HttpListenerContext httpContext)
+        {
+            return _httpRequestFactory(httpContext);
+        }
+
+        public void Stop()
+        {
+            if (_listener != null)
+            {
+                foreach (var prefix in _listener.Prefixes.ToList())
+                {
+                    _listener.Prefixes.Remove(prefix);
+                }
+
+                _listener.Close();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        private bool _disposed;
+        private readonly object _disposeLock = new object();
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed) return;
+
+            lock (_disposeLock)
+            {
+                if (_disposed) return;
+
+                if (disposing)
+                {
+                    Stop();
+                }
+
+                //release unmanaged resources here...
+                _disposed = true;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
new file mode 100644
index 000000000..de0b33fe3
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
@@ -0,0 +1,204 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using MediaBrowser.Model.Logging;
+using HttpListenerResponse = SocketHttpListener.Net.HttpListenerResponse;
+using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse;
+using IRequest = MediaBrowser.Model.Services.IRequest;
+
+namespace Emby.Server.Implementations.HttpServer.SocketSharp
+{
+    public class WebSocketSharpResponse : IHttpResponse
+    {
+        private readonly ILogger _logger;
+        private readonly HttpListenerResponse _response;
+
+        public WebSocketSharpResponse(ILogger logger, HttpListenerResponse response, IRequest request)
+        {
+            _logger = logger;
+            this._response = response;
+            Items = new Dictionary<string, object>();
+            Request = request;
+        }
+
+        public IRequest Request { get; private set; }
+        public bool UseBufferedStream { get; set; }
+        public Dictionary<string, object> Items { get; private set; }
+        public object OriginalResponse
+        {
+            get { return _response; }
+        }
+
+        public int StatusCode
+        {
+            get { return this._response.StatusCode; }
+            set { this._response.StatusCode = value; }
+        }
+
+        public string StatusDescription
+        {
+            get { return this._response.StatusDescription; }
+            set { this._response.StatusDescription = value; }
+        }
+
+        public string ContentType
+        {
+            get { return _response.ContentType; }
+            set { _response.ContentType = value; }
+        }
+
+        //public ICookies Cookies { get; set; }
+
+        public void AddHeader(string name, string value)
+        {
+            if (string.Equals(name, "Content-Type", StringComparison.OrdinalIgnoreCase))
+            {
+                ContentType = value;
+                return;
+            }
+
+            _response.AddHeader(name, value);
+        }
+
+        public string GetHeader(string name)
+        {
+            return _response.Headers[name];
+        }
+
+        public void Redirect(string url)
+        {
+            _response.Redirect(url);
+        }
+
+        public Stream OutputStream
+        {
+            get { return _response.OutputStream; }
+        }
+
+        public object Dto { get; set; }
+
+        public void Write(string text)
+        {
+            var bOutput = System.Text.Encoding.UTF8.GetBytes(text);
+            _response.ContentLength64 = bOutput.Length;
+
+            var outputStream = _response.OutputStream;
+            outputStream.Write(bOutput, 0, bOutput.Length);
+            Close();
+        }
+
+        public void Close()
+        {
+            if (!this.IsClosed)
+            {
+                this.IsClosed = true;
+
+                try
+                {
+                    CloseOutputStream(this._response);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error closing HttpListener output stream", ex);
+                }
+            }
+        }
+
+        public void CloseOutputStream(HttpListenerResponse response)
+        {
+            try
+            {
+                response.OutputStream.Flush();
+                response.OutputStream.Dispose();
+                response.Close();
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error in HttpListenerResponseWrapper: " + ex.Message, ex);
+            }
+        }
+
+        public void End()
+        {
+            Close();
+        }
+
+        public void Flush()
+        {
+            _response.OutputStream.Flush();
+        }
+
+        public bool IsClosed
+        {
+            get;
+            private set;
+        }
+
+        public void SetContentLength(long contentLength)
+        {
+            //you can happily set the Content-Length header in Asp.Net
+            //but HttpListener will complain if you do - you have to set ContentLength64 on the response.
+            //workaround: HttpListener throws "The parameter is incorrect" exceptions when we try to set the Content-Length header
+            _response.ContentLength64 = contentLength;
+        }
+
+        public void SetCookie(Cookie cookie)
+        {
+            var cookieStr = AsHeaderValue(cookie);
+            _response.Headers.Add("Set-Cookie", cookieStr);
+        }
+
+        public static string AsHeaderValue(Cookie cookie)
+        {
+            var defaultExpires = DateTime.MinValue;
+
+            var path = cookie.Expires == defaultExpires
+                ? "/"
+                : cookie.Path ?? "/";
+
+            var sb = new StringBuilder();
+
+            sb.Append($"{cookie.Name}={cookie.Value};path={path}");
+
+            if (cookie.Expires != defaultExpires)
+            {
+                sb.Append($";expires={cookie.Expires:R}");
+            }
+
+            if (!string.IsNullOrEmpty(cookie.Domain))
+            {
+                sb.Append($";domain={cookie.Domain}");
+            }
+            //else if (restrictAllCookiesToDomain != null)
+            //{
+            //    sb.Append($";domain={restrictAllCookiesToDomain}");
+            //}
+
+            if (cookie.Secure)
+            {
+                sb.Append(";Secure");
+            }
+            if (cookie.HttpOnly)
+            {
+                sb.Append(";HttpOnly");
+            }
+
+            return sb.ToString();
+        }
+
+
+        public bool SendChunked
+        {
+            get { return _response.SendChunked; }
+            set { _response.SendChunked = value; }
+        }
+
+        public bool KeepAlive { get; set; }
+
+        public void ClearCookies()
+        {
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 9c1d7fdf1..2a5706b3b 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -70,10 +70,10 @@ namespace Emby.Server.Implementations.Library
         private readonly Func<IConnectManager> _connectFactory;
         private readonly IServerApplicationHost _appHost;
         private readonly IFileSystem _fileSystem;
-        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly ICryptoProvider _cryptographyProvider;
         private readonly string _defaultUserName;
 
-        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository, IXmlSerializer xmlSerializer, INetworkManager networkManager, Func<IImageProcessor> imageProcessorFactory, Func<IDtoService> dtoServiceFactory, Func<IConnectManager> connectFactory, IServerApplicationHost appHost, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ICryptographyProvider cryptographyProvider, string defaultUserName)
+        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository, IXmlSerializer xmlSerializer, INetworkManager networkManager, Func<IImageProcessor> imageProcessorFactory, Func<IDtoService> dtoServiceFactory, Func<IConnectManager> connectFactory, IServerApplicationHost appHost, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ICryptoProvider cryptographyProvider, string defaultUserName)
         {
             _logger = logger;
             UserRepository = userRepository;
@@ -334,7 +334,7 @@ namespace Emby.Server.Implementations.Library
         /// <returns>System.String.</returns>
         private string GetSha1String(string str)
         {
-            return BitConverter.ToString(_cryptographyProvider.GetSHA1Bytes(Encoding.UTF8.GetBytes(str))).Replace("-", string.Empty);
+            return BitConverter.ToString(_cryptographyProvider.ComputeSHA1(Encoding.UTF8.GetBytes(str))).Replace("-", string.Empty);
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Security/MBLicenseFile.cs b/Emby.Server.Implementations/Security/MBLicenseFile.cs
index 7cb6165a5..4b6a82b6c 100644
--- a/Emby.Server.Implementations/Security/MBLicenseFile.cs
+++ b/Emby.Server.Implementations/Security/MBLicenseFile.cs
@@ -15,7 +15,7 @@ namespace Emby.Server.Implementations.Security
     {
         private readonly IApplicationPaths _appPaths;
         private readonly IFileSystem _fileSystem;
-        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly ICryptoProvider _cryptographyProvider;
 
         public string RegKey
         {
@@ -43,7 +43,7 @@ namespace Emby.Server.Implementations.Security
         private readonly object _fileLock = new object();
         private string _regKey;
 
-        public MBLicenseFile(IApplicationPaths appPaths, IFileSystem fileSystem, ICryptographyProvider cryptographyProvider)
+        public MBLicenseFile(IApplicationPaths appPaths, IFileSystem fileSystem, ICryptoProvider cryptographyProvider)
         {
             _appPaths = appPaths;
             _fileSystem = fileSystem;
@@ -59,7 +59,7 @@ namespace Emby.Server.Implementations.Security
 
         public void AddRegCheck(string featureId)
         {
-            var key = new Guid(_cryptographyProvider.GetMD5Bytes(Encoding.Unicode.GetBytes(featureId)));
+            var key = new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId)));
             var value = DateTime.UtcNow;
 
             SetUpdateRecord(key, value);
@@ -68,7 +68,7 @@ namespace Emby.Server.Implementations.Security
 
         public void RemoveRegCheck(string featureId)
         {
-            var key = new Guid(_cryptographyProvider.GetMD5Bytes(Encoding.Unicode.GetBytes(featureId)));
+            var key = new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId)));
             DateTime val;
 
             _updateRecords.TryRemove(key, out val);
@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Security
         public DateTime LastChecked(string featureId)
         {
             DateTime last;
-            _updateRecords.TryGetValue(new Guid(_cryptographyProvider.GetMD5Bytes(Encoding.Unicode.GetBytes(featureId))), out last);
+            _updateRecords.TryGetValue(new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId))), out last);
 
             // guard agains people just putting a large number in the file
             return last < DateTime.UtcNow ? last : DateTime.MinValue;
diff --git a/Emby.Server.Implementations/Security/PluginSecurityManager.cs b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
index c3a7e9450..61d4f5252 100644
--- a/Emby.Server.Implementations/Security/PluginSecurityManager.cs
+++ b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
@@ -64,7 +64,7 @@ namespace Emby.Server.Implementations.Security
         private readonly ILogger _logger;
         private readonly IApplicationPaths _appPaths;
         private readonly IFileSystem _fileSystem;
-        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly ICryptoProvider _cryptographyProvider;
 
         private IEnumerable<IRequiresRegistration> _registeredEntities;
         protected IEnumerable<IRequiresRegistration> RegisteredEntities
@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Security
         /// Initializes a new instance of the <see cref="PluginSecurityManager" /> class.
         /// </summary>
         public PluginSecurityManager(IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer,
-            IApplicationPaths appPaths, ILogManager logManager, IFileSystem fileSystem, ICryptographyProvider cryptographyProvider)
+            IApplicationPaths appPaths, ILogManager logManager, IFileSystem fileSystem, ICryptoProvider cryptographyProvider)
         {
             if (httpClient == null)
             {
diff --git a/Emby.Server.Implementations/ServerManager/ServerManager.cs b/Emby.Server.Implementations/ServerManager/ServerManager.cs
index 83ce0b6a3..f660d01ec 100644
--- a/Emby.Server.Implementations/ServerManager/ServerManager.cs
+++ b/Emby.Server.Implementations/ServerManager/ServerManager.cs
@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 
 namespace Emby.Server.Implementations.ServerManager
 {
@@ -75,8 +75,8 @@ namespace Emby.Server.Implementations.ServerManager
         private readonly List<IWebSocketListener> _webSocketListeners = new List<IWebSocketListener>();
 
         private bool _disposed;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
-        private readonly IEncoding _textEncoding;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
+        private readonly ITextEncoding _textEncoding;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerManager" /> class.
@@ -86,7 +86,7 @@ namespace Emby.Server.Implementations.ServerManager
         /// <param name="logger">The logger.</param>
         /// <param name="configurationManager">The configuration manager.</param>
         /// <exception cref="System.ArgumentNullException">applicationHost</exception>
-        public ServerManager(IServerApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager, IMemoryStreamProvider memoryStreamProvider, IEncoding textEncoding)
+        public ServerManager(IServerApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding)
         {
             if (applicationHost == null)
             {
diff --git a/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs b/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs
index dd17edea5..4608a13e6 100644
--- a/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 using UniversalDetector;
 
 namespace Emby.Server.Implementations.ServerManager
@@ -77,8 +77,8 @@ namespace Emby.Server.Implementations.ServerManager
         /// </summary>
         /// <value>The query string.</value>
         public QueryParamCollection QueryString { get; set; }
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
-        private readonly IEncoding _textEncoding;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
+        private readonly ITextEncoding _textEncoding;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WebSocketConnection" /> class.
@@ -88,7 +88,7 @@ namespace Emby.Server.Implementations.ServerManager
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logger">The logger.</param>
         /// <exception cref="System.ArgumentNullException">socket</exception>
-        public WebSocketConnection(IWebSocket socket, string remoteEndPoint, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamProvider memoryStreamProvider, IEncoding textEncoding)
+        public WebSocketConnection(IWebSocket socket, string remoteEndPoint, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding)
         {
             if (socket == null)
             {
@@ -145,7 +145,7 @@ namespace Emby.Server.Implementations.ServerManager
             }
             else
             {
-                OnReceiveInternal(_textEncoding.GetASCIIString(bytes, 0, bytes.Length));
+                OnReceiveInternal(_textEncoding.GetASCIIEncoding().GetString(bytes, 0, bytes.Length));
             }
         }
         private string DetectCharset(byte[] bytes)
diff --git a/Emby.Server.Implementations/Sync/MediaSync.cs b/Emby.Server.Implementations/Sync/MediaSync.cs
index b420a3df4..fa8388b6c 100644
--- a/Emby.Server.Implementations/Sync/MediaSync.cs
+++ b/Emby.Server.Implementations/Sync/MediaSync.cs
@@ -29,12 +29,12 @@ namespace Emby.Server.Implementations.Sync
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
         private readonly IConfigurationManager _config;
-        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly ICryptoProvider _cryptographyProvider;
 
         public const string PathSeparatorString = "/";
         public const char PathSeparatorChar = '/';
 
-        public MediaSync(ILogger logger, ISyncManager syncManager, IServerApplicationHost appHost, IFileSystem fileSystem, IConfigurationManager config, ICryptographyProvider cryptographyProvider)
+        public MediaSync(ILogger logger, ISyncManager syncManager, IServerApplicationHost appHost, IFileSystem fileSystem, IConfigurationManager config, ICryptoProvider cryptographyProvider)
         {
             _logger = logger;
             _syncManager = syncManager;
@@ -370,7 +370,7 @@ namespace Emby.Server.Implementations.Sync
 
         private byte[] CreateMd5(byte[] value)
         {
-            return _cryptographyProvider.GetMD5Bytes(value);
+            return _cryptographyProvider.ComputeMD5(value);
         }
 
         public LocalItem CreateLocalItem(IServerSyncProvider provider, SyncedItem syncedItem, SyncJob job, SyncTarget target, BaseItemDto libraryItem, string serverId, string serverName, string originalFileName)
diff --git a/Emby.Server.Implementations/Sync/MultiProviderSync.cs b/Emby.Server.Implementations/Sync/MultiProviderSync.cs
index db6cfcbd6..8189b8550 100644
--- a/Emby.Server.Implementations/Sync/MultiProviderSync.cs
+++ b/Emby.Server.Implementations/Sync/MultiProviderSync.cs
@@ -23,9 +23,9 @@ namespace Emby.Server.Implementations.Sync
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
         private readonly IConfigurationManager _config;
-        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly ICryptoProvider _cryptographyProvider;
 
-        public MultiProviderSync(SyncManager syncManager, IServerApplicationHost appHost, ILogger logger, IFileSystem fileSystem, IConfigurationManager config, ICryptographyProvider cryptographyProvider)
+        public MultiProviderSync(SyncManager syncManager, IServerApplicationHost appHost, ILogger logger, IFileSystem fileSystem, IConfigurationManager config, ICryptoProvider cryptographyProvider)
         {
             _syncManager = syncManager;
             _appHost = appHost;
diff --git a/Emby.Server.Implementations/Sync/ServerSyncScheduledTask.cs b/Emby.Server.Implementations/Sync/ServerSyncScheduledTask.cs
index 17171633e..09a0bfde4 100644
--- a/Emby.Server.Implementations/Sync/ServerSyncScheduledTask.cs
+++ b/Emby.Server.Implementations/Sync/ServerSyncScheduledTask.cs
@@ -20,9 +20,9 @@ namespace Emby.Server.Implementations.Sync
         private readonly IFileSystem _fileSystem;
         private readonly IServerApplicationHost _appHost;
         private readonly IConfigurationManager _config;
-        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly ICryptoProvider _cryptographyProvider;
 
-        public ServerSyncScheduledTask(ISyncManager syncManager, ILogger logger, IFileSystem fileSystem, IServerApplicationHost appHost, IConfigurationManager config, ICryptographyProvider cryptographyProvider)
+        public ServerSyncScheduledTask(ISyncManager syncManager, ILogger logger, IFileSystem fileSystem, IServerApplicationHost appHost, IConfigurationManager config, ICryptoProvider cryptographyProvider)
         {
             _syncManager = syncManager;
             _logger = logger;
diff --git a/Emby.Server.Implementations/Sync/SyncManager.cs b/Emby.Server.Implementations/Sync/SyncManager.cs
index d06ed49fd..13f60f5ee 100644
--- a/Emby.Server.Implementations/Sync/SyncManager.cs
+++ b/Emby.Server.Implementations/Sync/SyncManager.cs
@@ -51,7 +51,7 @@ namespace Emby.Server.Implementations.Sync
         private readonly Func<IMediaSourceManager> _mediaSourceManager;
         private readonly IJsonSerializer _json;
         private readonly ITaskManager _taskManager;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
         private ISyncProvider[] _providers = { };
 
@@ -61,7 +61,7 @@ namespace Emby.Server.Implementations.Sync
         public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemUpdated;
         public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemCreated;
 
-        public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger, IUserManager userManager, Func<IDtoService> dtoService, IServerApplicationHost appHost, ITVSeriesManager tvSeriesManager, Func<IMediaEncoder> mediaEncoder, IFileSystem fileSystem, Func<ISubtitleEncoder> subtitleEncoder, IConfigurationManager config, IUserDataManager userDataManager, Func<IMediaSourceManager> mediaSourceManager, IJsonSerializer json, ITaskManager taskManager, IMemoryStreamProvider memoryStreamProvider)
+        public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger, IUserManager userManager, Func<IDtoService> dtoService, IServerApplicationHost appHost, ITVSeriesManager tvSeriesManager, Func<IMediaEncoder> mediaEncoder, IFileSystem fileSystem, Func<ISubtitleEncoder> subtitleEncoder, IConfigurationManager config, IUserDataManager userDataManager, Func<IMediaSourceManager> mediaSourceManager, IJsonSerializer json, ITaskManager taskManager, IMemoryStreamFactory memoryStreamProvider)
         {
             _libraryManager = libraryManager;
             _repo = repo;
diff --git a/Emby.Server.Implementations/Sync/TargetDataProvider.cs b/Emby.Server.Implementations/Sync/TargetDataProvider.cs
index a0e0f4313..fbd82aa7a 100644
--- a/Emby.Server.Implementations/Sync/TargetDataProvider.cs
+++ b/Emby.Server.Implementations/Sync/TargetDataProvider.cs
@@ -26,9 +26,9 @@ namespace Emby.Server.Implementations.Sync
         private readonly IFileSystem _fileSystem;
         private readonly IApplicationPaths _appPaths;
         private readonly IServerApplicationHost _appHost;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
-        public TargetDataProvider(IServerSyncProvider provider, SyncTarget target, IServerApplicationHost appHost, ILogger logger, IJsonSerializer json, IFileSystem fileSystem, IApplicationPaths appPaths, IMemoryStreamProvider memoryStreamProvider)
+        public TargetDataProvider(IServerSyncProvider provider, SyncTarget target, IServerApplicationHost appHost, ILogger logger, IJsonSerializer json, IFileSystem fileSystem, IApplicationPaths appPaths, IMemoryStreamFactory memoryStreamProvider)
         {
             _logger = logger;
             _json = json;
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 3c7a8242c..52bf09284 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -119,9 +119,9 @@ namespace Emby.Server.Implementations.Updates
         /// <value>The application host.</value>
         private readonly IApplicationHost _applicationHost;
 
-        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly ICryptoProvider _cryptographyProvider;
 
-        public InstallationManager(ILogger logger, IApplicationHost appHost, IApplicationPaths appPaths, IHttpClient httpClient, IJsonSerializer jsonSerializer, ISecurityManager securityManager, IConfigurationManager config, IFileSystem fileSystem, ICryptographyProvider cryptographyProvider)
+        public InstallationManager(ILogger logger, IApplicationHost appHost, IApplicationPaths appPaths, IHttpClient httpClient, IJsonSerializer jsonSerializer, ISecurityManager securityManager, IConfigurationManager config, IFileSystem fileSystem, ICryptoProvider cryptographyProvider)
         {
             if (logger == null)
             {
@@ -606,7 +606,7 @@ namespace Emby.Server.Implementations.Updates
             {
                 using (var stream = _fileSystem.OpenRead(tempFile))
                 {
-                    var check = Guid.Parse(BitConverter.ToString(_cryptographyProvider.GetMD5Bytes(stream)).Replace("-", String.Empty));
+                    var check = Guid.Parse(BitConverter.ToString(_cryptographyProvider.ComputeMD5(stream)).Replace("-", String.Empty));
                     if (check != packageChecksum)
                     {
                         throw new Exception(string.Format("Download validation failed for {0}.  Probably corrupted during transfer.", package.name));
diff --git a/MediaBrowser.Api/Dlna/DlnaServerService.cs b/MediaBrowser.Api/Dlna/DlnaServerService.cs
index 93d0b3d55..8125951b5 100644
--- a/MediaBrowser.Api/Dlna/DlnaServerService.cs
+++ b/MediaBrowser.Api/Dlna/DlnaServerService.cs
@@ -111,9 +111,9 @@ namespace MediaBrowser.Api.Dlna
         private readonly IMediaReceiverRegistrar _mediaReceiverRegistrar;
 
         private const string XMLContentType = "text/xml; charset=UTF-8";
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
-        public DlnaServerService(IDlnaManager dlnaManager, IContentDirectory contentDirectory, IConnectionManager connectionManager, IMediaReceiverRegistrar mediaReceiverRegistrar, IMemoryStreamProvider memoryStreamProvider)
+        public DlnaServerService(IDlnaManager dlnaManager, IContentDirectory contentDirectory, IConnectionManager connectionManager, IMediaReceiverRegistrar mediaReceiverRegistrar, IMemoryStreamFactory memoryStreamProvider)
         {
             _dlnaManager = dlnaManager;
             _contentDirectory = contentDirectory;
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index c62889214..4fa663b19 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1263,6 +1263,7 @@ namespace MediaBrowser.Api.Playback
 
         private bool EnableThrottling(StreamState state)
         {
+            return false;
             // do not use throttling with hardware encoders
             return state.InputProtocol == MediaProtocol.File &&
                 state.RunTimeTicks.HasValue &&
diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs
index 09f6e8706..d7f4424fa 100644
--- a/MediaBrowser.Common/Extensions/BaseExtensions.cs
+++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Common.Extensions
     /// </summary>
     public static class BaseExtensions
     {
-        public static ICryptographyProvider CryptographyProvider { get; set; }
+        public static ICryptoProvider CryptographyProvider { get; set; }
 
         /// <summary>
         /// Strips the HTML.
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index fe60c7ebf..779db0a82 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -2,6 +2,7 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using System.Collections.Generic;
 using System.Net;
+using System.Threading.Tasks;
 
 namespace MediaBrowser.Common.Net
 {
@@ -46,10 +47,14 @@ namespace MediaBrowser.Common.Net
         /// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
         bool IsInLocalNetwork(string endpoint);
 
+        IEnumerable<IpAddressInfo> GetLocalIpAddresses();
+
         IpAddressInfo ParseIpAddress(string ipAddress);
 
         bool TryParseIpAddress(string ipAddress, out IpAddressInfo ipAddressInfo);
 
+        Task<IpAddressInfo[]> GetHostAddressesAsync(string host);
+
         /// <summary>
         /// Generates a self signed certificate at the locatation specified by <paramref name="certificatePath"/>.
         /// </summary>
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 2fd96577a..d2cf23f43 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -85,7 +85,7 @@ namespace MediaBrowser.Controller
         /// <summary>
         /// Gets the local API URL.
         /// </summary>
-        string GetLocalApiUrl(string ipAddress, bool isIpv6);
+        string GetLocalApiUrl(IpAddressInfo address);
 
         void LaunchUrl(string url);
 
diff --git a/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs b/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs
index 52199c5a2..8169cc7d9 100644
--- a/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs
+++ b/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs
@@ -69,7 +69,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // if the audio language is not understood by the user, load their preferred subs, if there are any
                 if (!ContainsOrdinal(preferredLanguages, audioTrackLanguage))
                 {
-                    stream = streams.Where(s => !s.IsForced).FirstOrDefault(s => ContainsOrdinal(preferredLanguages, s.Language));
+                    stream = streams.Where(s => !s.IsForced).FirstOrDefault(s => ContainsOrdinal(preferredLanguages, s.Language)) ??
+                        streams.FirstOrDefault(s => ContainsOrdinal(preferredLanguages, s.Language));
                 }
             }
             else if (mode == SubtitlePlaybackMode.Always)
diff --git a/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs b/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs
index d45416f53..b025011d7 100644
--- a/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs
+++ b/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.Net
 {
     public class AuthenticatedAttribute : Attribute, IHasRequestFilter, IAuthenticationAttributes
     {
-        public IAuthService AuthService { get; set; }
+        public static IAuthService AuthService { get; set; }
 
         /// <summary>
         /// Gets or sets the roles.
@@ -26,7 +26,7 @@ namespace MediaBrowser.Controller.Net
         /// </summary>
         /// <value><c>true</c> if [allow before startup wizard]; otherwise, <c>false</c>.</value>
         public bool AllowBeforeStartupWizard { get; set; }
-        
+
         /// <summary>
         /// The request filter is executed before the service.
         /// </summary>
@@ -40,15 +40,6 @@ namespace MediaBrowser.Controller.Net
             AuthService.Authenticate(serviceRequest, this);
         }
 
-        /// <summary>
-        /// A new shallow copy of this filter is used on every request.
-        /// </summary>
-        /// <returns>IHasRequestFilter.</returns>
-        public IHasRequestFilter Copy()
-        {
-            return this;
-        }
-
         /// <summary>
         /// Order in which Request Filters are executed.
         /// &lt;0 Executed before global request filters
@@ -60,7 +51,6 @@ namespace MediaBrowser.Controller.Net
             get { return 0; }
         }
 
-
         public IEnumerable<string> GetRoles()
         {
             return (Roles ?? string.Empty).Split(',')
diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
index ee7cb9dda..bf7343f3d 100644
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 
 namespace MediaBrowser.MediaEncoding.BdInfo
 {
@@ -15,9 +15,9 @@ namespace MediaBrowser.MediaEncoding.BdInfo
     public class BdInfoExaminer : IBlurayExaminer
     {
         private readonly IFileSystem _fileSystem;
-        private readonly IEncoding _textEncoding;
+        private readonly ITextEncoding _textEncoding;
 
-        public BdInfoExaminer(IFileSystem fileSystem, IEncoding textEncoding)
+        public BdInfoExaminer(IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             _fileSystem = fileSystem;
             _textEncoding = textEncoding;
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 098cd14db..0d7a7912a 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -79,7 +79,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         private readonly IHttpClient _httpClient;
         private readonly IZipClient _zipClient;
         private readonly IProcessFactory _processFactory;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
         private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>();
         private readonly bool _hasExternalEncoder;
@@ -88,7 +88,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         private readonly int DefaultImageExtractionTimeoutMs;
         private readonly bool EnableEncoderFontFile;
 
-        public MediaEncoder(ILogger logger, IJsonSerializer jsonSerializer, string ffMpegPath, string ffProbePath, bool hasExternalEncoder, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILiveTvManager liveTvManager, IIsoManager isoManager, ILibraryManager libraryManager, IChannelManager channelManager, ISessionManager sessionManager, Func<ISubtitleEncoder> subtitleEncoder, Func<IMediaSourceManager> mediaSourceManager, IHttpClient httpClient, IZipClient zipClient, IMemoryStreamProvider memoryStreamProvider, IProcessFactory processFactory, 
+        public MediaEncoder(ILogger logger, IJsonSerializer jsonSerializer, string ffMpegPath, string ffProbePath, bool hasExternalEncoder, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILiveTvManager liveTvManager, IIsoManager isoManager, ILibraryManager libraryManager, IChannelManager channelManager, ISessionManager sessionManager, Func<ISubtitleEncoder> subtitleEncoder, Func<IMediaSourceManager> mediaSourceManager, IHttpClient httpClient, IZipClient zipClient, IMemoryStreamFactory memoryStreamProvider, IProcessFactory processFactory, 
             int defaultImageExtractionTimeoutMs, 
             bool enableEncoderFontFile)
         {
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index f0c4c465d..6a1583094 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -23,9 +23,9 @@ namespace MediaBrowser.MediaEncoding.Probing
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
-        public ProbeResultNormalizer(ILogger logger, IFileSystem fileSystem, IMemoryStreamProvider memoryStreamProvider)
+        public ProbeResultNormalizer(ILogger logger, IFileSystem fileSystem, IMemoryStreamFactory memoryStreamProvider)
         {
             _logger = logger;
             _fileSystem = fileSystem;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 0baee67ea..5d065f528 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -19,7 +19,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Diagnostics;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 using UniversalDetector;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
@@ -34,11 +34,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         private readonly IJsonSerializer _json;
         private readonly IHttpClient _httpClient;
         private readonly IMediaSourceManager _mediaSourceManager;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
         private readonly IProcessFactory _processFactory;
-        private readonly IEncoding _textEncoding;
+        private readonly ITextEncoding _textEncoding;
 
-        public SubtitleEncoder(ILibraryManager libraryManager, ILogger logger, IApplicationPaths appPaths, IFileSystem fileSystem, IMediaEncoder mediaEncoder, IJsonSerializer json, IHttpClient httpClient, IMediaSourceManager mediaSourceManager, IMemoryStreamProvider memoryStreamProvider, IProcessFactory processFactory, IEncoding textEncoding)
+        public SubtitleEncoder(ILibraryManager libraryManager, ILogger logger, IApplicationPaths appPaths, IFileSystem fileSystem, IMediaEncoder mediaEncoder, IJsonSerializer json, IHttpClient httpClient, IMediaSourceManager mediaSourceManager, IMemoryStreamFactory memoryStreamProvider, IProcessFactory processFactory, ITextEncoding textEncoding)
         {
             _libraryManager = libraryManager;
             _logger = logger;
diff --git a/MediaBrowser.Model/Cryptography/ICryptoProvider.cs b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
new file mode 100644
index 000000000..7a82dee52
--- /dev/null
+++ b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
@@ -0,0 +1,13 @@
+using System;
+using System.IO;
+
+namespace MediaBrowser.Model.Cryptography
+{
+    public interface ICryptoProvider
+    {
+        Guid GetMD5(string str);
+        byte[] ComputeMD5(Stream str);
+        byte[] ComputeMD5(byte[] bytes);
+        byte[] ComputeSHA1(byte[] bytes);
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Cryptography/ICryptographyProvider.cs b/MediaBrowser.Model/Cryptography/ICryptographyProvider.cs
deleted file mode 100644
index a3f86f9e2..000000000
--- a/MediaBrowser.Model/Cryptography/ICryptographyProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.IO;
-
-namespace MediaBrowser.Model.Cryptography
-{
-    public interface ICryptographyProvider
-    {
-        Guid GetMD5(string str);
-        byte[] GetMD5Bytes(string str);
-        byte[] GetSHA1Bytes(byte[] bytes);
-        byte[] GetMD5Bytes(Stream str);
-        byte[] GetMD5Bytes(byte[] bytes);
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/IO/IMemoryStreamFactory.cs b/MediaBrowser.Model/IO/IMemoryStreamFactory.cs
new file mode 100644
index 000000000..f4f174643
--- /dev/null
+++ b/MediaBrowser.Model/IO/IMemoryStreamFactory.cs
@@ -0,0 +1,12 @@
+using System.IO;
+
+namespace MediaBrowser.Model.IO
+{
+    public interface IMemoryStreamFactory
+    {
+        MemoryStream CreateNew();
+        MemoryStream CreateNew(int capacity);
+        MemoryStream CreateNew(byte[] buffer);
+        bool TryGetBuffer(MemoryStream stream, out byte[] buffer);
+    }
+}
diff --git a/MediaBrowser.Model/IO/IMemoryStreamProvider.cs b/MediaBrowser.Model/IO/IMemoryStreamProvider.cs
deleted file mode 100644
index 82a758d9a..000000000
--- a/MediaBrowser.Model/IO/IMemoryStreamProvider.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.IO;
-
-namespace MediaBrowser.Model.IO
-{
-    public interface IMemoryStreamProvider
-    {
-        MemoryStream CreateNew();
-        MemoryStream CreateNew(int capacity);
-        MemoryStream CreateNew(byte[] buffer);
-    }
-}
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 52e477b1a..ee7582619 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -100,7 +100,7 @@
     <Compile Include="Connect\PinExchangeResult.cs" />
     <Compile Include="Connect\PinStatusResult.cs" />
     <Compile Include="Connect\UserLinkType.cs" />
-    <Compile Include="Cryptography\ICryptographyProvider.cs" />
+    <Compile Include="Cryptography\ICryptoProvider.cs" />
     <Compile Include="Devices\DeviceOptions.cs" />
     <Compile Include="Devices\DeviceQuery.cs" />
     <Compile Include="Devices\LocalFileInfo.cs" />
@@ -138,17 +138,19 @@
     <Compile Include="Dto\NameIdPair.cs" />
     <Compile Include="Dto\NameValuePair.cs" />
     <Compile Include="Net\IpEndPointInfo.cs" />
+    <Compile Include="Net\ISocket.cs" />
     <Compile Include="Net\ISocketFactory.cs" />
     <Compile Include="Net\IUdpSocket.cs" />
     <Compile Include="Net\SocketReceiveResult.cs" />
+    <Compile Include="Services\IHttpResult.cs" />
     <Compile Include="System\IEnvironmentInfo.cs" />
-    <Compile Include="TextEncoding\IEncoding.cs" />
+    <Compile Include="Text\ITextEncoding.cs" />
     <Compile Include="Extensions\LinqExtensions.cs" />
     <Compile Include="FileOrganization\SmartMatchInfo.cs" />
     <Compile Include="Health\IHealthMonitor.cs" />
     <Compile Include="IO\FileSystemMetadata.cs" />
     <Compile Include="IO\IFileSystem.cs" />
-    <Compile Include="IO\IMemoryStreamProvider.cs" />
+    <Compile Include="IO\IMemoryStreamFactory.cs" />
     <Compile Include="IO\IShortcutHandler.cs" />
     <Compile Include="IO\StreamDefaults.cs" />
     <Compile Include="Globalization\ILocalizationManager.cs" />
diff --git a/MediaBrowser.Model/Net/ISocket.cs b/MediaBrowser.Model/Net/ISocket.cs
new file mode 100644
index 000000000..371fbc567
--- /dev/null
+++ b/MediaBrowser.Model/Net/ISocket.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace MediaBrowser.Model.Net
+{
+    public interface ISocket : IDisposable
+    {
+        IpEndPointInfo LocalEndPoint { get; }
+        IpEndPointInfo RemoteEndPoint { get; }
+        void Close();
+        void Shutdown(bool both);
+        void Listen(int backlog);
+        void Bind(IpEndPointInfo endpoint);
+
+        void StartAccept(Action<ISocket> onAccept, Func<bool> isClosed);
+    }
+}
diff --git a/MediaBrowser.Model/Net/ISocketFactory.cs b/MediaBrowser.Model/Net/ISocketFactory.cs
index 3f1ddf84f..599292ddf 100644
--- a/MediaBrowser.Model/Net/ISocketFactory.cs
+++ b/MediaBrowser.Model/Net/ISocketFactory.cs
@@ -27,5 +27,17 @@ namespace MediaBrowser.Model.Net
         /// <param name="localPort">The local port to bind to.</param>
         /// <returns>A <see cref="IUdpSocket"/> implementation.</returns>
         IUdpSocket CreateUdpMulticastSocket(string ipAddress, int multicastTimeToLive, int localPort);
-	}
+
+        ISocket CreateSocket(IpAddressFamily family, SocketType socketType, ProtocolType protocolType, bool dualMode);
+    }
+
+    public enum SocketType
+    {
+        Stream
+    }
+
+    public enum ProtocolType
+    {
+        Tcp
+    }
 }
diff --git a/MediaBrowser.Model/Net/IpAddressInfo.cs b/MediaBrowser.Model/Net/IpAddressInfo.cs
index b48347d1d..47ffe5118 100644
--- a/MediaBrowser.Model/Net/IpAddressInfo.cs
+++ b/MediaBrowser.Model/Net/IpAddressInfo.cs
@@ -4,12 +4,39 @@ namespace MediaBrowser.Model.Net
 {
     public class IpAddressInfo
     {
+        public static IpAddressInfo Any = new IpAddressInfo("0.0.0.0", IpAddressFamily.InterNetwork);
+        public static IpAddressInfo IPv6Any = new IpAddressInfo("00000000000000000000", IpAddressFamily.InterNetworkV6);
+        public static IpAddressInfo Loopback = new IpAddressInfo("127.0.0.1", IpAddressFamily.InterNetwork);
+        public static IpAddressInfo IPv6Loopback = new IpAddressInfo("IPv6Loopback", IpAddressFamily.InterNetworkV6);
+
         public string Address { get; set; }
-        public bool IsIpv6 { get; set; }
+        public IpAddressFamily AddressFamily { get; set; }
+
+        public IpAddressInfo()
+        {
+
+        }
+
+        public IpAddressInfo(string address, IpAddressFamily addressFamily)
+        {
+            Address = address;
+            AddressFamily = addressFamily;
+        }
+
+        public bool Equals(IpAddressInfo address)
+        {
+            return string.Equals(address.Address, Address, StringComparison.OrdinalIgnoreCase);
+        }
 
         public override String ToString()
         {
             return Address;
         }
     }
+
+    public enum IpAddressFamily
+    {
+        InterNetwork,
+        InterNetworkV6
+    }
 }
diff --git a/MediaBrowser.Model/Net/IpEndPointInfo.cs b/MediaBrowser.Model/Net/IpEndPointInfo.cs
index 5fd331a16..b5cadc429 100644
--- a/MediaBrowser.Model/Net/IpEndPointInfo.cs
+++ b/MediaBrowser.Model/Net/IpEndPointInfo.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 
 namespace MediaBrowser.Model.Net
 {
@@ -8,11 +9,22 @@ namespace MediaBrowser.Model.Net
 
         public int Port { get; set; }
 
+        public IpEndPointInfo()
+        {
+
+        }
+
+        public IpEndPointInfo(IpAddressInfo address, int port)
+        {
+            IpAddress = address;
+            Port = port;
+        }
+
         public override string ToString()
         {
             var ipAddresString = IpAddress == null ? string.Empty : IpAddress.ToString();
 
-            return ipAddresString + ":" + this.Port.ToString();
+            return ipAddresString + ":" + Port.ToString(CultureInfo.InvariantCulture);
         }
     }
 }
diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
index c5c6ccf59..2164179d5 100644
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ b/MediaBrowser.Model/Services/IHasRequestFilter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace MediaBrowser.Model.Services
 {
     public interface IHasRequestFilter
@@ -22,11 +17,5 @@ namespace MediaBrowser.Model.Services
         /// <param name="res">The http response wrapper</param>
         /// <param name="requestDto">The request DTO</param>
         void RequestFilter(IRequest req, IResponse res, object requestDto);
-
-        /// <summary>
-        /// A new shallow copy of this filter is used on every request.
-        /// </summary>
-        /// <returns></returns>
-        IHasRequestFilter Copy();
     }
 }
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
new file mode 100644
index 000000000..36ffeb284
--- /dev/null
+++ b/MediaBrowser.Model/Services/IHttpResult.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Model.Services
+{
+    public interface IHttpResult : IHasHeaders
+    {
+        /// <summary>
+        /// The HTTP Response Status
+        /// </summary>
+        int Status { get; set; }
+
+        /// <summary>
+        /// The HTTP Response Status Code
+        /// </summary>
+        HttpStatusCode StatusCode { get; set; }
+
+        /// <summary>
+        /// The HTTP Status Description
+        /// </summary>
+        string StatusDescription { get; set; }
+
+        /// <summary>
+        /// The HTTP Response ContentType
+        /// </summary>
+        string ContentType { get; set; }
+
+        /// <summary>
+        /// Additional HTTP Cookies
+        /// </summary>
+        List<Cookie> Cookies { get; }
+
+        /// <summary>
+        /// Response DTO
+        /// </summary>
+        object Response { get; set; }
+
+        /// <summary>
+        /// Holds the request call context
+        /// </summary>
+        IRequest RequestContext { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 45dc97b76..5dc995b06 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -60,16 +60,6 @@ namespace MediaBrowser.Model.Services
         QueryParamCollection QueryString { get; }
 
         QueryParamCollection FormData { get; }
-        /// <summary>
-        /// Buffer the Request InputStream so it can be re-read
-        /// </summary>
-        bool UseBufferedStream { get; set; }
-
-        /// <summary>
-        /// The entire string contents of Request.InputStream
-        /// </summary>
-        /// <returns></returns>
-        string GetRawBody();
 
         string RawUrl { get; }
 
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
index 1ab3f0bfb..dfea62821 100644
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ b/MediaBrowser.Model/Services/QueryParamCollection.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Model.Services
     {
         public QueryParamCollection()
         {
-            
+
         }
 
         public QueryParamCollection(IDictionary<string, string> headers)
@@ -30,15 +30,30 @@ namespace MediaBrowser.Model.Services
             return StringComparer.OrdinalIgnoreCase;
         }
 
+        public string GetKey(int index)
+        {
+            return this[index].Name;
+        }
+
+        public string Get(int index)
+        {
+            return this[index].Value;
+        }
+
+        public virtual string[] GetValues(int index)
+        {
+            return new[] { Get(index) };
+        }
+
         /// <summary>
         /// Adds a new query parameter.
         /// </summary>
-        public void Add(string key, string value)
+        public virtual void Add(string key, string value)
         {
             Add(new NameValuePair(key, value));
         }
 
-        public void Set(string key, string value)
+        public virtual void Set(string key, string value)
         {
             if (string.IsNullOrWhiteSpace(value))
             {
@@ -81,17 +96,21 @@ namespace MediaBrowser.Model.Services
         /// </summary>
         /// <returns>The number of parameters that were removed</returns>
         /// <exception cref="ArgumentNullException"><paramref name="name" /> is null.</exception>
-        public int Remove(string name)
+        public virtual int Remove(string name)
         {
             return RemoveAll(p => p.Name == name);
         }
 
         public string Get(string name)
         {
-            return GetValues(name).FirstOrDefault();
+            var stringComparison = GetStringComparison();
+
+            return this.Where(p => string.Equals(p.Name, name, stringComparison))
+                .Select(p => p.Value)
+                .FirstOrDefault();
         }
 
-        public string[] GetValues(string name)
+        public virtual string[] GetValues(string name)
         {
             var stringComparison = GetStringComparison();
 
diff --git a/MediaBrowser.Model/Text/ITextEncoding.cs b/MediaBrowser.Model/Text/ITextEncoding.cs
new file mode 100644
index 000000000..6901f1f94
--- /dev/null
+++ b/MediaBrowser.Model/Text/ITextEncoding.cs
@@ -0,0 +1,10 @@
+using System.Text;
+
+namespace MediaBrowser.Model.Text
+{
+    public interface ITextEncoding
+    {
+        Encoding GetASCIIEncoding();
+        Encoding GetFileEncoding(string path);
+    }
+}
diff --git a/MediaBrowser.Model/TextEncoding/IEncoding.cs b/MediaBrowser.Model/TextEncoding/IEncoding.cs
deleted file mode 100644
index 3d884c9d2..000000000
--- a/MediaBrowser.Model/TextEncoding/IEncoding.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Text;
-
-namespace MediaBrowser.Model.TextEncoding
-{
-    public interface IEncoding
-    {
-        byte[] GetASCIIBytes(string text);
-        string GetASCIIString(byte[] bytes, int startIndex, int length);
-
-        Encoding GetFileEncoding(string path);
-    }
-}
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index d4bfad174..59d67740d 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -40,7 +40,7 @@ namespace MediaBrowser.Providers.Manager
         private readonly ILibraryMonitor _libraryMonitor;
         private readonly IFileSystem _fileSystem;
         private readonly ILogger _logger;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageSaver" /> class.
@@ -49,7 +49,7 @@ namespace MediaBrowser.Providers.Manager
         /// <param name="libraryMonitor">The directory watchers.</param>
         /// <param name="fileSystem">The file system.</param>
         /// <param name="logger">The logger.</param>
-        public ImageSaver(IServerConfigurationManager config, ILibraryMonitor libraryMonitor, IFileSystem fileSystem, ILogger logger, IMemoryStreamProvider memoryStreamProvider)
+        public ImageSaver(IServerConfigurationManager config, ILibraryMonitor libraryMonitor, IFileSystem fileSystem, ILogger logger, IMemoryStreamFactory memoryStreamProvider)
         {
             _config = config;
             _libraryMonitor = libraryMonitor;
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 67ad21dbb..5e00b356a 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Providers.Manager
         private IExternalId[] _externalIds;
 
         private readonly Func<ILibraryManager> _libraryManagerFactory;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ProviderManager" /> class.
@@ -76,7 +76,7 @@ namespace MediaBrowser.Providers.Manager
         /// <param name="libraryMonitor">The directory watchers.</param>
         /// <param name="logManager">The log manager.</param>
         /// <param name="fileSystem">The file system.</param>
-        public ProviderManager(IHttpClient httpClient, IServerConfigurationManager configurationManager, ILibraryMonitor libraryMonitor, ILogManager logManager, IFileSystem fileSystem, IServerApplicationPaths appPaths, Func<ILibraryManager> libraryManagerFactory, IJsonSerializer json, IMemoryStreamProvider memoryStreamProvider)
+        public ProviderManager(IHttpClient httpClient, IServerConfigurationManager configurationManager, ILibraryMonitor libraryMonitor, ILogManager logManager, IFileSystem fileSystem, IServerApplicationPaths appPaths, Func<ILibraryManager> libraryManagerFactory, IJsonSerializer json, IMemoryStreamFactory memoryStreamProvider)
         {
             _logger = logManager.GetLogger("ProviderManager");
             _httpClient = httpClient;
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
index e4becec56..313feda52 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
@@ -45,6 +45,11 @@ namespace MediaBrowser.Providers.MediaInfo
 
                 var codec = Path.GetExtension(fullName).ToLower().TrimStart('.');
 
+                if (string.Equals(codec, "txt", StringComparison.OrdinalIgnoreCase))
+                {
+                    codec = "srt";
+                }
+
                 // If the subtitle file matches the video file name
                 if (string.Equals(videoFileNameWithoutExtension, fileNameWithoutExtension, StringComparison.OrdinalIgnoreCase))
                 {
@@ -74,9 +79,9 @@ namespace MediaBrowser.Providers.MediaInfo
                     // Try to translate to three character code
                     // Be flexible and check against both the full and three character versions
                     var culture = _localization.GetCultures()
-                        .FirstOrDefault(i => string.Equals(i.DisplayName, language, StringComparison.OrdinalIgnoreCase) || 
-                        string.Equals(i.Name, language, StringComparison.OrdinalIgnoreCase) || 
-                        string.Equals(i.ThreeLetterISOLanguageName, language, StringComparison.OrdinalIgnoreCase) || 
+                        .FirstOrDefault(i => string.Equals(i.DisplayName, language, StringComparison.OrdinalIgnoreCase) ||
+                        string.Equals(i.Name, language, StringComparison.OrdinalIgnoreCase) ||
+                        string.Equals(i.ThreeLetterISOLanguageName, language, StringComparison.OrdinalIgnoreCase) ||
                         string.Equals(i.TwoLetterISOLanguageName, language, StringComparison.OrdinalIgnoreCase));
 
                     if (culture != null)
@@ -119,7 +124,7 @@ namespace MediaBrowser.Providers.MediaInfo
         {
             get
             {
-                return new[] { ".srt", ".ssa", ".ass", ".sub", ".smi", ".sami" };
+                return new[] { ".srt", ".ssa", ".ass", ".sub", ".smi", ".sami", ".txt" };
             }
         }
 
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
index 66adf6c8a..5147e9d10 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
@@ -40,10 +40,10 @@ namespace MediaBrowser.Providers.TV
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
         private readonly ILogger _logger;
         private readonly ILibraryManager _libraryManager;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
         private readonly ILocalizationManager _localizationManager;
 
-        public TvdbSeriesProvider(IZipClient zipClient, IHttpClient httpClient, IFileSystem fileSystem, IServerConfigurationManager config, ILogger logger, ILibraryManager libraryManager, IMemoryStreamProvider memoryStreamProvider, IXmlReaderSettingsFactory xmlSettings, ILocalizationManager localizationManager)
+        public TvdbSeriesProvider(IZipClient zipClient, IHttpClient httpClient, IFileSystem fileSystem, IServerConfigurationManager config, ILogger logger, ILibraryManager libraryManager, IMemoryStreamFactory memoryStreamProvider, IXmlReaderSettingsFactory xmlSettings, ILocalizationManager localizationManager)
         {
             _zipClient = zipClient;
             _httpClient = httpClient;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs b/MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs
index 93d224b8d..235b62f69 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs
@@ -6,7 +6,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
     /// <summary>
     /// Class ContainerAdapter
     /// </summary>
-    class ContainerAdapter : IContainerAdapter, IRelease
+    class ContainerAdapter : IContainerAdapter
     {
         /// <summary>
         /// The _app host
@@ -40,14 +40,5 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         {
             return _appHost.TryResolve<T>();
         }
-
-        /// <summary>
-        /// Releases the specified instance.
-        /// </summary>
-        /// <param name="instance">The instance.</param>
-        public void Release(object instance)
-        {
-            // Leave this empty so SS doesn't try to dispose our objects
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 805cb0353..ebb282503 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -8,24 +8,31 @@ using MediaBrowser.Server.Implementations.HttpServer.SocketSharp;
 using ServiceStack;
 using ServiceStack.Host;
 using ServiceStack.Host.Handlers;
-using ServiceStack.Logging;
 using ServiceStack.Web;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Security;
+using System.Net.Sockets;
 using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Common.Implementations.Net;
 using Emby.Server.Implementations.HttpServer;
 using Emby.Server.Implementations.HttpServer.SocketSharp;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Controller;
+using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Services;
-using ServiceStack.Api.Swagger;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Net;
+using SocketHttpListener.Primitives;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
 {
@@ -49,21 +56,28 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private readonly IServerConfigurationManager _config;
         private readonly INetworkManager _networkManager;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
         private readonly IServerApplicationHost _appHost;
 
+        private readonly ITextEncoding _textEncoding;
+        private readonly ISocketFactory _socketFactory;
+        private readonly ICryptoProvider _cryptoProvider;
+
         public HttpListenerHost(IServerApplicationHost applicationHost,
             ILogManager logManager,
             IServerConfigurationManager config,
             string serviceName,
-            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamProvider memoryStreamProvider, params Assembly[] assembliesWithServices)
-            : base(serviceName, assembliesWithServices)
+            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider)
+            : base(serviceName, new Assembly[] { })
         {
             _appHost = applicationHost;
             DefaultRedirectPath = defaultRedirectPath;
             _networkManager = networkManager;
             _memoryStreamProvider = memoryStreamProvider;
+            _textEncoding = textEncoding;
+            _socketFactory = socketFactory;
+            _cryptoProvider = cryptoProvider;
             _config = config;
 
             _logger = logManager.GetLogger("HttpServer");
@@ -73,10 +87,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         public string GlobalResponse { get; set; }
 
-        public override void Configure(Container container)
+        public override void Configure()
         {
             HostConfig.Instance.DefaultRedirectPath = DefaultRedirectPath;
-            HostConfig.Instance.LogUnobservedTaskExceptions = false;
 
             HostConfig.Instance.MapExceptionToStatusCode = new Dictionary<Type, int>
             {
@@ -94,19 +107,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             };
 
             HostConfig.Instance.GlobalResponseHeaders = new Dictionary<string, string>();
-            HostConfig.Instance.DebugMode = false;
-
-            HostConfig.Instance.LogFactory = LogManager.LogFactory;
-            HostConfig.Instance.AllowJsonpRequests = false;
 
             // The Markdown feature causes slow startup times (5 mins+) on cold boots for some users
             // Custom format allows images
             HostConfig.Instance.EnableFeatures = Feature.Html | Feature.Json | Feature.Xml | Feature.CustomFormat;
 
-            container.Adapter = _containerAdapter;
-
-            Plugins.Add(new SwaggerFeature());
-            Plugins.Add(new CorsFeature(allowedHeaders: "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization"));
+            Container.Adapter = _containerAdapter;
 
             //Plugins.Add(new AuthFeature(() => new AuthUserSession(), new IAuthProvider[] {
             //    new SessionAuthProvider(_containerAdapter.Resolve<ISessionContext>()),
@@ -130,6 +136,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             HostContext.GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
         }
 
+        protected override ILogger Logger
+        {
+            get
+            {
+                return _logger;
+            }
+        }
+
         public override void OnAfterInit()
         {
             SetAppDomainData();
@@ -207,7 +221,33 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private IHttpListener GetListener()
         {
-            return new WebSocketSharpListener(_logger, CertificatePath, _memoryStreamProvider);
+            var cert = !string.IsNullOrWhiteSpace(CertificatePath) && File.Exists(CertificatePath)
+                ? GetCert(CertificatePath) :
+                null;
+
+            return new WebSocketSharpListener(_logger, cert, _memoryStreamProvider, _textEncoding, _networkManager, _socketFactory, _cryptoProvider, new StreamFactory(), GetRequest);
+        }
+
+        public static ICertificate GetCert(string certificateLocation)
+        {
+            X509Certificate2 localCert = new X509Certificate2(certificateLocation);
+            //localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
+            if (localCert.PrivateKey == null)
+            {
+                //throw new FileNotFoundException("Secure requested, no private key included", certificateLocation);
+                return null;
+            }
+
+            return new Certificate(localCert);
+        }
+
+        private IHttpRequest GetRequest(HttpListenerContext httpContext)
+        {
+            var operationName = httpContext.Request.GetOperationName();
+
+            var req = new WebSocketSharpRequest(httpContext, operationName, _logger, _memoryStreamProvider);
+
+            return req;
         }
 
         private void OnWebSocketConnecting(WebSocketConnectingEventArgs args)
@@ -259,11 +299,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
                 var contentType = httpReq.ResponseContentType;
 
-                var serializer = HostContext.ContentTypes.GetResponseSerializer(contentType);
+                var serializer = ContentTypes.Instance.GetResponseSerializer(contentType);
                 if (serializer == null)
                 {
                     contentType = HostContext.Config.DefaultContentType;
-                    serializer = HostContext.ContentTypes.GetResponseSerializer(contentType);
+                    serializer = ContentTypes.Instance.GetResponseSerializer(contentType);
                 }
 
                 var httpError = ex as IHttpError;
@@ -411,171 +451,170 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         protected async Task RequestHandler(IHttpRequest httpReq, Uri url)
         {
             var date = DateTime.Now;
-
             var httpRes = httpReq.Response;
+            bool enableLog = false;
+            string urlToLog = null;
+            string remoteIp = null;
 
-            if (_disposed)
+            try
             {
-                httpRes.StatusCode = 503;
-                httpRes.Close();
-                return ;
-            }
+                if (_disposed)
+                {
+                    httpRes.StatusCode = 503;
+                    return;
+                }
 
-            if (!ValidateHost(url))
-            {
-                httpRes.StatusCode = 400;
-                httpRes.ContentType = "text/plain";
-                httpRes.Write("Invalid host");
+                if (!ValidateHost(url))
+                {
+                    httpRes.StatusCode = 400;
+                    httpRes.ContentType = "text/plain";
+                    httpRes.Write("Invalid host");
+                    return;
+                }
 
-                httpRes.Close();
-                return;
-            }
+                if (string.Equals(httpReq.Verb, "OPTIONS", StringComparison.OrdinalIgnoreCase))
+                {
+                    httpRes.StatusCode = 200;
+                    httpRes.AddHeader("Access-Control-Allow-Origin", "*");
+                    httpRes.AddHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
+                    httpRes.AddHeader("Access-Control-Allow-Headers",
+                        "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
+                    httpRes.ContentType = "text/html";
+                    return;
+                }
 
-            if (string.Equals(httpReq.Verb, "OPTIONS", StringComparison.OrdinalIgnoreCase))
-            {
-                httpRes.StatusCode = 200;
-                httpRes.AddHeader("Access-Control-Allow-Origin", "*");
-                httpRes.AddHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
-                httpRes.AddHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
-                httpRes.ContentType = "text/html";
+                var operationName = httpReq.OperationName;
+                var localPath = url.LocalPath;
 
-                httpRes.Close();
-            }
+                var urlString = url.OriginalString;
+                enableLog = EnableLogging(urlString, localPath);
+                urlToLog = urlString;
 
-            var operationName = httpReq.OperationName;
-            var localPath = url.LocalPath;
+                if (enableLog)
+                {
+                    urlToLog = GetUrlToLog(urlString);
+                    remoteIp = httpReq.RemoteIp;
 
-            var urlString = url.OriginalString;
-            var enableLog = EnableLogging(urlString, localPath);
-            var urlToLog = urlString;
+                    LoggerUtils.LogRequest(_logger, urlToLog, httpReq.HttpMethod, httpReq.UserAgent);
+                }
 
-            if (enableLog)
-            {
-                urlToLog = GetUrlToLog(urlString);
-                LoggerUtils.LogRequest(_logger, urlToLog, httpReq.HttpMethod, httpReq.UserAgent);
-            }
+                if (string.Equals(localPath, "/emby/", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, DefaultRedirectPath);
+                    return;
+                }
+                if (string.Equals(localPath, "/emby", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, "emby/" + DefaultRedirectPath);
+                    return;
+                }
 
-            if (string.Equals(localPath, "/emby/", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase))
-            {
-                httpRes.RedirectToUrl(DefaultRedirectPath);
-                return;
-            }
-            if (string.Equals(localPath, "/emby", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase))
-            {
-                httpRes.RedirectToUrl("emby/" + DefaultRedirectPath);
-                return;
-            }
+                if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase) ||
+                    localPath.IndexOf("mediabrowser/web", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    httpRes.StatusCode = 200;
+                    httpRes.ContentType = "text/html";
+                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
+                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
 
-            if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase) ||
-                localPath.IndexOf("mediabrowser/web", StringComparison.OrdinalIgnoreCase) != -1)
-            {
-                httpRes.StatusCode = 200;
-                httpRes.ContentType = "text/html";
-                var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
-                    .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
+                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
+                    {
+                        httpRes.Write(
+                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
+                            newUrl + "\">" + newUrl + "</a></body></html>");
+                        return;
+                    }
+                }
 
-                if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
+                if (localPath.IndexOf("dashboard/", StringComparison.OrdinalIgnoreCase) != -1 &&
+                    localPath.IndexOf("web/dashboard", StringComparison.OrdinalIgnoreCase) == -1)
                 {
-                    httpRes.Write("<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" + newUrl + "\">" + newUrl + "</a></body></html>");
+                    httpRes.StatusCode = 200;
+                    httpRes.ContentType = "text/html";
+                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
+                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
 
-                    httpRes.Close();
-                    return;
+                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
+                    {
+                        httpRes.Write(
+                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
+                            newUrl + "\">" + newUrl + "</a></body></html>");
+                        return;
+                    }
                 }
-            }
 
-            if (localPath.IndexOf("dashboard/", StringComparison.OrdinalIgnoreCase) != -1 && 
-                localPath.IndexOf("web/dashboard", StringComparison.OrdinalIgnoreCase) == -1)
-            {
-                httpRes.StatusCode = 200;
-                httpRes.ContentType = "text/html";
-                var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
-                    .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
+                if (string.Equals(localPath, "/web", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, DefaultRedirectPath);
+                    return;
+                }
+                if (string.Equals(localPath, "/web/", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, "../" + DefaultRedirectPath);
+                    return;
+                }
+                if (string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, DefaultRedirectPath);
+                    return;
+                }
+                if (string.IsNullOrEmpty(localPath))
+                {
+                    RedirectToUrl(httpRes, "/" + DefaultRedirectPath);
+                    return;
+                }
 
-                if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(localPath, "/emby/pin", StringComparison.OrdinalIgnoreCase))
                 {
-                    httpRes.Write("<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" + newUrl + "\">" + newUrl + "</a></body></html>");
+                    RedirectToUrl(httpRes, "web/pin.html");
+                    return;
+                }
 
-                    httpRes.Close();
+                if (!string.IsNullOrWhiteSpace(GlobalResponse))
+                {
+                    httpRes.StatusCode = 503;
+                    httpRes.ContentType = "text/html";
+                    httpRes.Write(GlobalResponse);
                     return;
                 }
-            }
 
-            if (string.Equals(localPath, "/web", StringComparison.OrdinalIgnoreCase))
-            {
-                httpRes.RedirectToUrl(DefaultRedirectPath);
-                return;
-            }
-            if (string.Equals(localPath, "/web/", StringComparison.OrdinalIgnoreCase))
-            {
-                httpRes.RedirectToUrl("../" + DefaultRedirectPath);
-                return;
-            }
-            if (string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase))
-            {
-                httpRes.RedirectToUrl(DefaultRedirectPath);
-                return;
-            }
-            if (string.IsNullOrEmpty(localPath))
-            {
-                httpRes.RedirectToUrl("/" + DefaultRedirectPath);
-                return;
-            }
+                var handler = HttpHandlerFactory.GetHandler(httpReq);
 
-            if (string.Equals(localPath, "/emby/pin", StringComparison.OrdinalIgnoreCase))
-            {
-                httpRes.RedirectToUrl("web/pin.html");
-                return;
+                if (handler != null)
+                {
+                    await handler.ProcessRequestAsync(httpReq, httpRes, operationName).ConfigureAwait(false);
+                }
             }
-
-            if (!string.IsNullOrWhiteSpace(GlobalResponse))
+            catch (Exception ex)
             {
-                httpRes.StatusCode = 503;
-                httpRes.ContentType = "text/html";
-                httpRes.Write(GlobalResponse);
-
-                httpRes.Close();
-                return;
+                ErrorHandler(ex, httpReq);
             }
-
-            var handler = HttpHandlerFactory.GetHandler(httpReq);
-
-            var remoteIp = httpReq.RemoteIp;
-
-            var serviceStackHandler = handler as IServiceStackHandler;
-            if (serviceStackHandler != null)
+            finally
             {
-                var restHandler = serviceStackHandler as RestHandler;
-                if (restHandler != null)
-                {
-                    httpReq.OperationName = operationName = restHandler.RestPath.RequestType.GetOperationName();
-                }
+                httpRes.Close();
 
-                try
-                {
-                    await serviceStackHandler.ProcessRequestAsync(httpReq, httpRes, operationName).ConfigureAwait(false);
-                }
-                finally
+                if (enableLog)
                 {
-                    httpRes.Close();
                     var statusCode = httpRes.StatusCode;
 
                     var duration = DateTime.Now - date;
 
-                    if (enableLog)
-                    {
-                        LoggerUtils.LogResponse(_logger, statusCode, urlToLog, remoteIp, duration);
-                    }
+                    LoggerUtils.LogResponse(_logger, statusCode, urlToLog, remoteIp, duration);
                 }
             }
-            else
-            {
-                httpRes.Close();
-            }
         }
 
+        public static void RedirectToUrl(IResponse httpRes, string url)
+        {
+            httpRes.StatusCode = 302;
+            httpRes.AddHeader(HttpHeaders.Location, url);
+            httpRes.EndRequest();
+        }
+
+
         /// <summary>
         /// Adds the rest handlers.
         /// </summary>
@@ -653,15 +692,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return "mediabrowser/" + path;
         }
 
-        /// <summary>
-        /// Releases the specified instance.
-        /// </summary>
-        /// <param name="instance">The instance.</param>
-        public override void Release(object instance)
-        {
-            // Leave this empty so SS doesn't try to dispose our objects
-        }
-
         private bool _disposed;
         private readonly object _disposeLock = new object();
         protected virtual void Dispose(bool disposing)
@@ -696,4 +726,37 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             Start(UrlPrefixes.First());
         }
     }
+
+    public class StreamFactory : IStreamFactory
+    {
+        public Stream CreateNetworkStream(ISocket socket, bool ownsSocket)
+        {
+            var netSocket = (NetSocket)socket;
+
+            return new NetworkStream(netSocket.Socket, ownsSocket);
+        }
+
+        public Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate)
+        {
+            var sslStream = (SslStream)stream;
+            var cert = (Certificate)certificate;
+
+            return sslStream.AuthenticateAsServerAsync(cert.X509Certificate);
+        }
+
+        public Stream CreateSslStream(Stream innerStream, bool leaveInnerStreamOpen)
+        {
+            return new SslStream(innerStream, leaveInnerStreamOpen);
+        }
+    }
+
+    public class Certificate : ICertificate
+    {
+        public Certificate(X509Certificate x509Certificate)
+        {
+            X509Certificate = x509Certificate;
+        }
+
+        public X509Certificate X509Certificate { get; private set; }
+    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 95e1a35e6..4c251ba24 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -9,6 +9,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+using Emby.Server.Implementations.HttpServer;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 using ServiceStack;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs b/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
deleted file mode 100644
index bfbb228ed..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using MediaBrowser.Model.Logging;
-using System;
-using System.Globalization;
-using SocketHttpListener.Net;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    public static class LoggerUtils
-    {
-        /// <summary>
-        /// Logs the request.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="request">The request.</param>
-        public static void LogRequest(ILogger logger, HttpListenerRequest request)
-        {
-            var url = request.Url.ToString();
-
-            logger.Info("{0} {1}. UserAgent: {2}", request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod, url, request.UserAgent ?? string.Empty);
-        }
-
-        public static void LogRequest(ILogger logger, string url, string method, string userAgent)
-        {
-            logger.Info("{0} {1}. UserAgent: {2}", "HTTP " + method, url, userAgent ?? string.Empty);
-        }
-
-        /// <summary>
-        /// Logs the response.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="statusCode">The status code.</param>
-        /// <param name="url">The URL.</param>
-        /// <param name="endPoint">The end point.</param>
-        /// <param name="duration">The duration.</param>
-        public static void LogResponse(ILogger logger, int statusCode, string url, string endPoint, TimeSpan duration)
-        {
-            var durationMs = duration.TotalMilliseconds;
-            var logSuffix = durationMs >= 1000 && durationMs < 60000 ? "ms (slow)" : "ms";
-
-            logger.Info("HTTP Response {0} to {1}. Time: {2}{3}. {4}", statusCode, endPoint, Convert.ToInt32(durationMs).ToString(CultureInfo.InvariantCulture), logSuffix, url);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
deleted file mode 100644
index 7d4cd3b4d..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using MediaBrowser.Model.Logging;
-using ServiceStack.Web;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    public class RangeRequestWriter : IAsyncStreamWriter, IHttpResult
-    {
-        /// <summary>
-        /// Gets or sets the source stream.
-        /// </summary>
-        /// <value>The source stream.</value>
-        private Stream SourceStream { get; set; }
-        private string RangeHeader { get; set; }
-        private bool IsHeadRequest { get; set; }
-
-        private long RangeStart { get; set; }
-        private long RangeEnd { get; set; }
-        private long RangeLength { get; set; }
-        private long TotalContentLength { get; set; }
-
-        public Action OnComplete { get; set; }
-        private readonly ILogger _logger;
-
-        private const int BufferSize = 81920;
-
-        /// <summary>
-        /// The _options
-        /// </summary>
-        private readonly Dictionary<string, string> _options = new Dictionary<string, string>();
-
-        /// <summary>
-        /// The us culture
-        /// </summary>
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
-        public Func<IDisposable> ResultScope { get; set; }
-        public List<Cookie> Cookies { get; private set; }
-
-        /// <summary>
-        /// Additional HTTP Headers
-        /// </summary>
-        /// <value>The headers.</value>
-        public IDictionary<string, string> Headers
-        {
-            get { return _options; }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StreamWriter" /> class.
-        /// </summary>
-        /// <param name="rangeHeader">The range header.</param>
-        /// <param name="source">The source.</param>
-        /// <param name="contentType">Type of the content.</param>
-        /// <param name="isHeadRequest">if set to <c>true</c> [is head request].</param>
-        public RangeRequestWriter(string rangeHeader, Stream source, string contentType, bool isHeadRequest, ILogger logger)
-        {
-            if (string.IsNullOrEmpty(contentType))
-            {
-                throw new ArgumentNullException("contentType");
-            }
-
-            RangeHeader = rangeHeader;
-            SourceStream = source;
-            IsHeadRequest = isHeadRequest;
-            this._logger = logger;
-
-            ContentType = contentType;
-            Headers["Content-Type"] = contentType;
-            Headers["Accept-Ranges"] = "bytes";
-            StatusCode = HttpStatusCode.PartialContent;
-
-            Cookies = new List<Cookie>();
-            SetRangeValues();
-        }
-
-        /// <summary>
-        /// Sets the range values.
-        /// </summary>
-        private void SetRangeValues()
-        {
-            var requestedRange = RequestedRanges[0];
-
-            TotalContentLength = SourceStream.Length;
-
-            // If the requested range is "0-", we can optimize by just doing a stream copy
-            if (!requestedRange.Value.HasValue)
-            {
-                RangeEnd = TotalContentLength - 1;
-            }
-            else
-            {
-                RangeEnd = requestedRange.Value.Value;
-            }
-
-            RangeStart = requestedRange.Key;
-            RangeLength = 1 + RangeEnd - RangeStart;
-
-            // Content-Length is the length of what we're serving, not the original content
-            Headers["Content-Length"] = RangeLength.ToString(UsCulture);
-            Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", RangeStart, RangeEnd, TotalContentLength);
-
-            if (RangeStart > 0)
-            {
-                SourceStream.Position = RangeStart;
-            }
-        }
-
-        /// <summary>
-        /// The _requested ranges
-        /// </summary>
-        private List<KeyValuePair<long, long?>> _requestedRanges;
-        /// <summary>
-        /// Gets the requested ranges.
-        /// </summary>
-        /// <value>The requested ranges.</value>
-        protected List<KeyValuePair<long, long?>> RequestedRanges
-        {
-            get
-            {
-                if (_requestedRanges == null)
-                {
-                    _requestedRanges = new List<KeyValuePair<long, long?>>();
-
-                    // Example: bytes=0-,32-63
-                    var ranges = RangeHeader.Split('=')[1].Split(',');
-
-                    foreach (var range in ranges)
-                    {
-                        var vals = range.Split('-');
-
-                        long start = 0;
-                        long? end = null;
-
-                        if (!string.IsNullOrEmpty(vals[0]))
-                        {
-                            start = long.Parse(vals[0], UsCulture);
-                        }
-                        if (!string.IsNullOrEmpty(vals[1]))
-                        {
-                            end = long.Parse(vals[1], UsCulture);
-                        }
-
-                        _requestedRanges.Add(new KeyValuePair<long, long?>(start, end));
-                    }
-                }
-
-                return _requestedRanges;
-            }
-        }
-
-        public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
-        {
-            try
-            {
-                // Headers only
-                if (IsHeadRequest)
-                {
-                    return;
-                }
-
-                using (var source = SourceStream)
-                {
-                    // If the requested range is "0-", we can optimize by just doing a stream copy
-                    if (RangeEnd >= TotalContentLength - 1)
-                    {
-                        await source.CopyToAsync(responseStream, BufferSize).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        await CopyToInternalAsync(source, responseStream, RangeLength).ConfigureAwait(false);
-                    }
-                }
-            }
-            finally
-            {
-                if (OnComplete != null)
-                {
-                    OnComplete();
-                }
-            }
-        }
-
-        private async Task CopyToInternalAsync(Stream source, Stream destination, long copyLength)
-        {
-            var array = new byte[BufferSize];
-            int count;
-            while ((count = await source.ReadAsync(array, 0, array.Length).ConfigureAwait(false)) != 0)
-            {
-                var bytesToCopy = Math.Min(count, copyLength);
-
-                await destination.WriteAsync(array, 0, Convert.ToInt32(bytesToCopy)).ConfigureAwait(false);
-
-                copyLength -= bytesToCopy;
-
-                if (copyLength <= 0)
-                {
-                    break;
-                }
-            }
-        }
-
-        public string ContentType { get; set; }
-
-        public IRequest RequestContext { get; set; }
-
-        public object Response { get; set; }
-
-        public IContentTypeWriter ResponseFilter { get; set; }
-
-        public int Status { get; set; }
-
-        public HttpStatusCode StatusCode
-        {
-            get { return (HttpStatusCode)Status; }
-            set { Status = (int)value; }
-        }
-
-        public string StatusDescription { get; set; }
-
-        public int PaddingLength { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
deleted file mode 100644
index 6247e4c17..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Implementations.HttpServer.SocketSharp;
-using System;
-using System.Globalization;
-using System.Net;
-using System.Text;
-using MediaBrowser.Model.Services;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    public class ResponseFilter
-    {
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
-        private readonly ILogger _logger;
-
-        public ResponseFilter(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Filters the response.
-        /// </summary>
-        /// <param name="req">The req.</param>
-        /// <param name="res">The res.</param>
-        /// <param name="dto">The dto.</param>
-        public void FilterResponse(IRequest req, IResponse res, object dto)
-        {
-            // Try to prevent compatibility view
-            res.AddHeader("X-UA-Compatible", "IE=Edge");
-
-            var exception = dto as Exception;
-
-            if (exception != null)
-            {
-                _logger.ErrorException("Error processing request for {0}", exception, req.RawUrl);
-
-                if (!string.IsNullOrEmpty(exception.Message))
-                {
-                    var error = exception.Message.Replace(Environment.NewLine, " ");
-                    error = RemoveControlCharacters(error);
-
-                    res.AddHeader("X-Application-Error-Code", error);
-                }
-            }
-
-            var vary = "Accept-Encoding";
-
-            var hasHeaders = dto as IHasHeaders;
-            var sharpResponse = res as WebSocketSharpResponse;
-
-            if (hasHeaders != null)
-            {
-                if (!hasHeaders.Headers.ContainsKey("Server"))
-                {
-                    hasHeaders.Headers["Server"] = "Mono-HTTPAPI/1.1, UPnP/1.0 DLNADOC/1.50";
-                    //hasHeaders.Headers["Server"] = "Mono-HTTPAPI/1.1";
-                }
-
-                // Content length has to be explicitly set on on HttpListenerResponse or it won't be happy
-                string contentLength;
-
-                if (hasHeaders.Headers.TryGetValue("Content-Length", out contentLength) && !string.IsNullOrEmpty(contentLength))
-                {
-                    var length = long.Parse(contentLength, UsCulture);
-
-                    if (length > 0)
-                    {
-                        res.SetContentLength(length);
-                        
-                        var listenerResponse = res.OriginalResponse as HttpListenerResponse;
-
-                        if (listenerResponse != null)
-                        {
-                            // Disable chunked encoding. Technically this is only needed when using Content-Range, but
-                            // anytime we know the content length there's no need for it
-                            listenerResponse.SendChunked = false;
-                            return;
-                        }
-
-                        if (sharpResponse != null)
-                        {
-                            sharpResponse.SendChunked = false;
-                        }
-                    }
-                }
-
-                string hasHeadersVary;
-                if (hasHeaders.Headers.TryGetValue("Vary", out hasHeadersVary))
-                {
-                    vary = hasHeadersVary;
-                }
-
-                hasHeaders.Headers["Vary"] = vary;
-            }
-
-            //res.KeepAlive = false;
-
-            // Per Google PageSpeed
-            // This instructs the proxies to cache two versions of the resource: one compressed, and one uncompressed. 
-            // The correct version of the resource is delivered based on the client request header. 
-            // This is a good choice for applications that are singly homed and depend on public proxies for user locality.                        
-            res.AddHeader("Vary", vary);
-        }
-
-        /// <summary>
-        /// Removes the control characters.
-        /// </summary>
-        /// <param name="inString">The in string.</param>
-        /// <returns>System.String.</returns>
-        public static string RemoveControlCharacters(string inString)
-        {
-            if (inString == null) return null;
-
-            var newString = new StringBuilder();
-
-            foreach (var ch in inString)
-            {
-                if (!char.IsControl(ch))
-                {
-                    newString.Append(ch);
-                }
-            }
-            return newString.ToString();
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
index 4dff2d5a3..5da515900 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
@@ -2,9 +2,11 @@
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
-using ServiceStack.Logging;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Text;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
 {
@@ -21,13 +23,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             ILogManager logManager,
             IServerConfigurationManager config, 
             INetworkManager networkmanager,
-            IMemoryStreamProvider streamProvider,
+            IMemoryStreamFactory streamProvider,
             string serverName, 
-            string defaultRedirectpath)
+            string defaultRedirectpath,
+            ITextEncoding textEncoding,
+            ISocketFactory socketFactory,
+            ICryptoProvider cryptoProvider)
         {
-            LogManager.LogFactory = new ServerLogFactory(logManager);
-
-            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider);
+            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider, textEncoding, socketFactory, cryptoProvider);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs
deleted file mode 100644
index 40af3f3b0..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using MediaBrowser.Model.Logging;
-using ServiceStack.Logging;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    /// <summary>
-    /// Class ServerLogFactory
-    /// </summary>
-    public class ServerLogFactory : ILogFactory
-    {
-        /// <summary>
-        /// The _log manager
-        /// </summary>
-        private readonly ILogManager _logManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServerLogFactory"/> class.
-        /// </summary>
-        /// <param name="logManager">The log manager.</param>
-        public ServerLogFactory(ILogManager logManager)
-        {
-            _logManager = logManager;
-        }
-
-        /// <summary>
-        /// Gets the logger.
-        /// </summary>
-        /// <param name="typeName">Name of the type.</param>
-        /// <returns>ILog.</returns>
-        public ILog GetLogger(string typeName)
-        {
-            return new ServerLogger(_logManager.GetLogger(typeName));
-        }
-
-        /// <summary>
-        /// Gets the logger.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns>ILog.</returns>
-        public ILog GetLogger(Type type)
-        {
-            return GetLogger(type.Name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs
deleted file mode 100644
index bf7924784..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-using MediaBrowser.Model.Logging;
-using ServiceStack.Logging;
-using System;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    /// <summary>
-    /// Class ServerLogger
-    /// </summary>
-    public class ServerLogger : ILog
-    {
-        /// <summary>
-        /// The _logger
-        /// </summary>
-        private readonly ILogger _logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServerLogger"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        public ServerLogger(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Logs a Debug message and exception.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="exception">The exception.</param>
-        public void Debug(object message, Exception exception)
-        {
-            _logger.ErrorException(GetMesssage(message), exception);
-        }
-
-        /// <summary>
-        /// Logs a Debug message.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public void Debug(object message)
-        {
-            // Way too verbose. Can always make this configurable if needed again.
-            //_logger.Debug(GetMesssage(message));
-        }
-
-        /// <summary>
-        /// Logs a Debug format message.
-        /// </summary>
-        /// <param name="format">The format.</param>
-        /// <param name="args">The args.</param>
-        public void DebugFormat(string format, params object[] args)
-        {
-            // Way too verbose. Can always make this configurable if needed again.
-            //_logger.Debug(format, args);
-        }
-
-        /// <summary>
-        /// Logs a Error message and exception.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="exception">The exception.</param>
-        public void Error(object message, Exception exception)
-        {
-            _logger.ErrorException(GetMesssage(message), exception);
-        }
-
-        /// <summary>
-        /// Logs a Error message.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public void Error(object message)
-        {
-            _logger.Error(GetMesssage(message));
-        }
-
-        /// <summary>
-        /// Logs a Error format message.
-        /// </summary>
-        /// <param name="format">The format.</param>
-        /// <param name="args">The args.</param>
-        public void ErrorFormat(string format, params object[] args)
-        {
-            _logger.Error(format, args);
-        }
-
-        /// <summary>
-        /// Logs a Fatal message and exception.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="exception">The exception.</param>
-        public void Fatal(object message, Exception exception)
-        {
-            _logger.FatalException(GetMesssage(message), exception);
-        }
-
-        /// <summary>
-        /// Logs a Fatal message.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public void Fatal(object message)
-        {
-            _logger.Fatal(GetMesssage(message));
-        }
-
-        /// <summary>
-        /// Logs a Error format message.
-        /// </summary>
-        /// <param name="format">The format.</param>
-        /// <param name="args">The args.</param>
-        public void FatalFormat(string format, params object[] args)
-        {
-            _logger.Fatal(format, args);
-        }
-
-        /// <summary>
-        /// Logs an Info message and exception.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="exception">The exception.</param>
-        public void Info(object message, Exception exception)
-        {
-            _logger.ErrorException(GetMesssage(message), exception);
-        }
-
-        /// <summary>
-        /// Logs an Info message and exception.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public void Info(object message)
-        {
-            _logger.Info(GetMesssage(message));
-        }
-
-        /// <summary>
-        /// Logs an Info format message.
-        /// </summary>
-        /// <param name="format">The format.</param>
-        /// <param name="args">The args.</param>
-        public void InfoFormat(string format, params object[] args)
-        {
-            _logger.Info(format, args);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is debug enabled.
-        /// </summary>
-        /// <value><c>true</c> if this instance is debug enabled; otherwise, <c>false</c>.</value>
-        public bool IsDebugEnabled
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Logs a Warning message and exception.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="exception">The exception.</param>
-        public void Warn(object message, Exception exception)
-        {
-            _logger.ErrorException(GetMesssage(message), exception);
-        }
-
-        /// <summary>
-        /// Logs a Warning message.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        public void Warn(object message)
-        {
-            // Hide StringMapTypeDeserializer messages
-            // _logger.Warn(GetMesssage(message));
-        }
-
-        /// <summary>
-        /// Logs a Warning format message.
-        /// </summary>
-        /// <param name="format">The format.</param>
-        /// <param name="args">The args.</param>
-        public void WarnFormat(string format, params object[] args)
-        {
-            // Hide StringMapTypeDeserializer messages
-            // _logger.Warn(format, args);
-        }
-
-        /// <summary>
-        /// Gets the messsage.
-        /// </summary>
-        /// <param name="o">The o.</param>
-        /// <returns>System.String.</returns>
-        private string GetMesssage(object o)
-        {
-            return o == null ? string.Empty : o.ToString();
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/Extensions.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/Extensions.cs
deleted file mode 100644
index 154313fb9..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/Extensions.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using MediaBrowser.Model.Logging;
-using SocketHttpListener.Net;
-using System;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
-{
-    public static class Extensions
-    {
-        public static string GetOperationName(this HttpListenerRequest request)
-        {
-            return request.Url.Segments[request.Url.Segments.Length - 1];
-        }
-
-        public static void CloseOutputStream(this HttpListenerResponse response, ILogger logger)
-        {
-            try
-            {
-                response.OutputStream.Flush();
-                response.OutputStream.Close();
-                response.Close();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorException("Error in HttpListenerResponseWrapper: " + ex.Message, ex);
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
index 13ae48cff..543eb4afe 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
@@ -2,11 +2,10 @@
 using System.Collections.Specialized;
 using System.Globalization;
 using System.IO;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web;
 using MediaBrowser.Model.Services;
-using ServiceStack;
 
 namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 {
@@ -128,7 +127,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             get
             {
-                return string.IsNullOrEmpty(request.Headers[HttpHeaders.Accept]) ? null : request.Headers[HttpHeaders.Accept];
+                return string.IsNullOrEmpty(request.Headers["Accept"]) ? null : request.Headers["Accept"];
             }
         }
 
@@ -136,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             get
             {
-                return string.IsNullOrEmpty(request.Headers[HttpHeaders.Authorization]) ? null : request.Headers[HttpHeaders.Authorization];
+                return string.IsNullOrEmpty(request.Headers["Authorization"]) ? null : request.Headers["Authorization"];
             }
         }
 
@@ -152,7 +151,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             string msg = String.Format("A potentially dangerous Request.{0} value was " +
                             "detected from the client ({1}={2}).", name, key, v);
 
-            throw new HttpRequestValidationException(msg);
+            throw new Exception(msg);
         }
 
         static void ValidateNameValueCollection(string name, QueryParamCollection coll)
@@ -278,9 +277,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         void AddRawKeyValue(StringBuilder key, StringBuilder value)
         {
-            string decodedKey = HttpUtility.UrlDecode(key.ToString(), ContentEncoding);
+            string decodedKey = WebUtility.UrlDecode(key.ToString());
             form.Add(decodedKey,
-                  HttpUtility.UrlDecode(value.ToString(), ContentEncoding));
+                  WebUtility.UrlDecode(value.ToString()));
 
             key.Length = 0;
             value.Length = 0;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
deleted file mode 100644
index d363c4de6..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using MediaBrowser.Common.Events;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using WebSocketState = MediaBrowser.Model.Net.WebSocketState;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
-{
-    public class SharpWebSocket : IWebSocket
-    {
-        /// <summary>
-        /// The logger
-        /// </summary>
-        private readonly ILogger _logger;
-
-        public event EventHandler<EventArgs> Closed;
-
-        /// <summary>
-        /// Gets or sets the web socket.
-        /// </summary>
-        /// <value>The web socket.</value>
-        private SocketHttpListener.WebSocket WebSocket { get; set; }
-
-        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NativeWebSocket" /> class.
-        /// </summary>
-        /// <param name="socket">The socket.</param>
-        /// <param name="logger">The logger.</param>
-        /// <exception cref="System.ArgumentNullException">socket</exception>
-        public SharpWebSocket(SocketHttpListener.WebSocket socket, ILogger logger)
-        {
-            if (socket == null)
-            {
-                throw new ArgumentNullException("socket");
-            }
-
-            if (logger == null)
-            {
-                throw new ArgumentNullException("logger");
-            }
-
-            _logger = logger;
-            WebSocket = socket;
-
-            socket.OnMessage += socket_OnMessage;
-            socket.OnClose += socket_OnClose;
-            socket.OnError += socket_OnError;
-
-            WebSocket.ConnectAsServer();
-        }
-
-        void socket_OnError(object sender, SocketHttpListener.ErrorEventArgs e)
-        {
-            _logger.Error("Error in SharpWebSocket: {0}", e.Message ?? string.Empty);
-            //EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
-        }
-
-        void socket_OnClose(object sender, SocketHttpListener.CloseEventArgs e)
-        {
-            EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
-        }
-
-        void socket_OnMessage(object sender, SocketHttpListener.MessageEventArgs e)
-        {
-            //if (!string.IsNullOrWhiteSpace(e.Data))
-            //{
-            //    if (OnReceive != null)
-            //    {
-            //        OnReceive(e.Data);
-            //    }
-            //    return;
-            //}
-            if (OnReceiveBytes != null)
-            {
-                OnReceiveBytes(e.RawData);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public WebSocketState State
-        {
-            get
-            {
-                WebSocketState commonState;
-
-                if (!Enum.TryParse(WebSocket.ReadyState.ToString(), true, out commonState))
-                {
-                    _logger.Warn("Unrecognized WebSocketState: {0}", WebSocket.ReadyState.ToString());
-                }
-
-                return commonState;
-            }
-        }
-
-        /// <summary>
-        /// Sends the async.
-        /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken)
-        {
-            var completionSource = new TaskCompletionSource<bool>();
-
-            WebSocket.SendAsync(bytes, res => completionSource.TrySetResult(true));
-
-            return completionSource.Task;
-        }
-
-        /// <summary>
-        /// Sends the asynchronous.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken)
-        {
-            var completionSource = new TaskCompletionSource<bool>();
-
-            WebSocket.SendAsync(text, res => completionSource.TrySetResult(true));
-
-            return completionSource.Task;
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool dispose)
-        {
-            if (dispose)
-            {
-                WebSocket.OnMessage -= socket_OnMessage;
-                WebSocket.OnClose -= socket_OnClose;
-                WebSocket.OnError -= socket_OnError;
-
-                _cancellationTokenSource.Cancel();
-
-                WebSocket.Close();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receive action.
-        /// </summary>
-        /// <value>The receive action.</value>
-        public Action<byte[]> OnReceiveBytes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the on receive.
-        /// </summary>
-        /// <value>The on receive.</value>
-        public Action<string> OnReceive { get; set; }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
deleted file mode 100644
index 56f8ab429..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-using System.Collections.Specialized;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Logging;
-using SocketHttpListener.Net;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Emby.Server.Implementations.HttpServer;
-using Emby.Server.Implementations.Logging;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Services;
-using ServiceStack;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
-{
-    public class WebSocketSharpListener : IHttpListener
-    {
-        private HttpListener _listener;
-
-        private readonly ILogger _logger;
-        private readonly string _certificatePath;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
-
-        public WebSocketSharpListener(ILogger logger, string certificatePath, IMemoryStreamProvider memoryStreamProvider)
-        {
-            _logger = logger;
-            _certificatePath = certificatePath;
-            _memoryStreamProvider = memoryStreamProvider;
-        }
-
-        public Action<Exception, IRequest> ErrorHandler { get; set; }
-
-        public Func<IHttpRequest, Uri, Task> RequestHandler { get; set; }
-
-        public Action<WebSocketConnectingEventArgs> WebSocketConnecting { get; set; }
-
-        public Action<WebSocketConnectEventArgs> WebSocketConnected { get; set; }
-
-        public void Start(IEnumerable<string> urlPrefixes)
-        {
-            if (_listener == null)
-                _listener = new HttpListener(new PatternsLogger(_logger), _certificatePath);
-
-            foreach (var prefix in urlPrefixes)
-            {
-                _logger.Info("Adding HttpListener prefix " + prefix);
-                _listener.Prefixes.Add(prefix);
-            }
-
-            _listener.OnContext = ProcessContext;
-
-            _listener.Start();
-        }
-
-        private void ProcessContext(HttpListenerContext context)
-        {
-            Task.Factory.StartNew(() => InitTask(context));
-        }
-
-        private void InitTask(HttpListenerContext context)
-        {
-            try
-            {
-                var task = this.ProcessRequestAsync(context);
-                task.ContinueWith(x => HandleError(x.Exception, context), TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.AttachedToParent);
-
-                //if (task.Status == TaskStatus.Created)
-                //{
-                //    task.RunSynchronously();
-                //}
-            }
-            catch (Exception ex)
-            {
-                HandleError(ex, context);
-            }
-        }
-
-        private Task ProcessRequestAsync(HttpListenerContext context)
-        {
-            var request = context.Request;
-
-            if (request.IsWebSocketRequest)
-            {
-                LoggerUtils.LogRequest(_logger, request);
-
-                ProcessWebSocketRequest(context);
-                return Task.FromResult(true);
-            }
-
-            if (string.IsNullOrEmpty(context.Request.RawUrl))
-                return ((object)null).AsTaskResult();
-
-            var httpReq = GetRequest(context);
-
-            return RequestHandler(httpReq, request.Url);
-        }
-
-        private void ProcessWebSocketRequest(HttpListenerContext ctx)
-        {
-            try
-            {
-                var endpoint = ctx.Request.RemoteEndPoint.ToString();
-                var url = ctx.Request.RawUrl;
-                var queryString = ctx.Request.QueryString ?? new NameValueCollection();
-
-                var queryParamCollection = new QueryParamCollection();
-
-                foreach (var key in queryString.AllKeys)
-                {
-                    queryParamCollection[key] = queryString[key];
-                }
-
-                var connectingArgs = new WebSocketConnectingEventArgs
-                {
-                    Url = url,
-                    QueryString = queryParamCollection,
-                    Endpoint = endpoint
-                };
-
-                if (WebSocketConnecting != null)
-                {
-                    WebSocketConnecting(connectingArgs);
-                }
-
-                if (connectingArgs.AllowConnection)
-                {
-                    _logger.Debug("Web socket connection allowed");
-
-                    var webSocketContext = ctx.AcceptWebSocket(null);
-
-                    if (WebSocketConnected != null)
-                    {
-                        WebSocketConnected(new WebSocketConnectEventArgs
-                        {
-                            Url = url,
-                            QueryString = queryParamCollection,
-                            WebSocket = new SharpWebSocket(webSocketContext.WebSocket, _logger),
-                            Endpoint = endpoint
-                        });
-                    }
-                }
-                else
-                {
-                    _logger.Warn("Web socket connection not allowed");
-                    ctx.Response.StatusCode = 401;
-                    ctx.Response.Close();
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("AcceptWebSocketAsync error", ex);
-                ctx.Response.StatusCode = 500;
-                ctx.Response.Close();
-            }
-        }
-
-        private IHttpRequest GetRequest(HttpListenerContext httpContext)
-        {
-            var operationName = httpContext.Request.GetOperationName();
-
-            var req = new WebSocketSharpRequest(httpContext, operationName, RequestAttributes.None, _logger, _memoryStreamProvider);
-
-            return req;
-        }
-
-        private void HandleError(Exception ex, HttpListenerContext context)
-        {
-            var httpReq = GetRequest(context);
-
-            if (ErrorHandler != null)
-            {
-                ErrorHandler(ex, httpReq);
-            }
-        }
-
-        public void Stop()
-        {
-            if (_listener != null)
-            {
-                foreach (var prefix in _listener.Prefixes.ToList())
-                {
-                    _listener.Prefixes.Remove(prefix);
-                }
-
-                _listener.Close();
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        private bool _disposed;
-        private readonly object _disposeLock = new object();
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed) return;
-
-            lock (_disposeLock)
-            {
-                if (_disposed) return;
-
-                if (disposing)
-                {
-                    Stop();
-                }
-
-                //release unmanaged resources here...
-                _disposed = true;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
index 72047609d..6f44fcce7 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
@@ -1,17 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.IO;
 using System.Text;
 using Emby.Server.Implementations.HttpServer.SocketSharp;
 using Funq;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Services;
 using ServiceStack;
 using ServiceStack.Host;
-using ServiceStack.Web;
 using SocketHttpListener.Net;
 using IHttpFile = MediaBrowser.Model.Services.IHttpFile;
 using IHttpRequest = MediaBrowser.Model.Services.IHttpRequest;
@@ -25,9 +22,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         public Container Container { get; set; }
         private readonly HttpListenerRequest request;
         private readonly IHttpResponse response;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
-        public WebSocketSharpRequest(HttpListenerContext httpContext, string operationName, RequestAttributes requestAttributes, ILogger logger, IMemoryStreamProvider memoryStreamProvider)
+        public WebSocketSharpRequest(HttpListenerContext httpContext, string operationName, ILogger logger, IMemoryStreamFactory memoryStreamProvider)
         {
             this.OperationName = operationName;
             _memoryStreamProvider = memoryStreamProvider;
@@ -55,36 +52,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             get { return response; }
         }
 
-        public T TryResolve<T>()
-        {
-            if (typeof(T) == typeof(IHttpRequest))
-                throw new Exception("You don't need to use IHttpRequest.TryResolve<IHttpRequest> to resolve itself");
-
-            if (typeof(T) == typeof(IHttpResponse))
-                throw new Exception("Resolve IHttpResponse with 'Response' property instead of IHttpRequest.TryResolve<IHttpResponse>");
-
-            return Container == null
-                ? HostContext.TryResolve<T>()
-                : Container.TryResolve<T>();
-        }
-
         public string OperationName { get; set; }
 
         public object Dto { get; set; }
 
-        public string GetRawBody()
-        {
-            if (bufferedStream != null)
-            {
-                return bufferedStream.ToArray().FromUtf8Bytes();
-            }
-
-            using (var reader = new StreamReader(InputStream))
-            {
-                return reader.ReadToEnd();
-            }
-        }
-
         public string RawUrl
         {
             get { return request.RawUrl; }
@@ -104,7 +75,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             get
             {
-                return String.IsNullOrEmpty(request.Headers[HttpHeaders.XForwardedFor]) ? null : request.Headers[HttpHeaders.XForwardedFor];
+                return String.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
             }
         }
 
@@ -112,7 +83,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             get
             {
-                return string.IsNullOrEmpty(request.Headers[HttpHeaders.XForwardedPort]) ? (int?)null : int.Parse(request.Headers[HttpHeaders.XForwardedPort]);
+                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Port"]) ? (int?)null : int.Parse(request.Headers["X-Forwarded-Port"]);
             }
         }
 
@@ -120,7 +91,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             get
             {
-                return string.IsNullOrEmpty(request.Headers[HttpHeaders.XForwardedProtocol]) ? null : request.Headers[HttpHeaders.XForwardedProtocol];
+                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Proto"]) ? null : request.Headers["X-Forwarded-Proto"];
             }
         }
 
@@ -128,7 +99,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             get
             {
-                return String.IsNullOrEmpty(request.Headers[HttpHeaders.XRealIp]) ? null : request.Headers[HttpHeaders.XRealIp];
+                return String.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
             }
         }
 
@@ -140,7 +111,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
                 return remoteIp ??
                     (remoteIp = (CheckBadChars(XForwardedFor)) ??
                                 (NormalizeIp(CheckBadChars(XRealIp)) ??
-                                (request.RemoteEndPoint != null ? NormalizeIp(request.RemoteEndPoint.Address.ToString()) : null)));
+                                (request.RemoteEndPoint != null ? NormalizeIp(request.RemoteEndPoint.IpAddress.ToString()) : null)));
             }
         }
 
@@ -280,7 +251,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
                 defaultContentType = HostContext.Config.DefaultContentType;
             }
 
-            var customContentTypes = HostContext.ContentTypes.ContentTypeFormats.Values;
+            var customContentTypes = ContentTypes.Instance.ContentTypeFormats.Values;
             var preferredContentTypes = new string[] {};
 
             var acceptsAnything = false;
@@ -328,11 +299,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
                 }
             }
 
-            if (httpReq.ContentType.MatchesContentType(MimeTypes.Soap12))
-            {
-                return MimeTypes.Soap12;
-            }
-
             if (acceptContentTypes == null && httpReq.ContentType == MimeTypes.Soap11)
             {
                 return MimeTypes.Soap11;
@@ -344,10 +310,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         private static string GetQueryStringContentType(IRequest httpReq)
         {
-            var callback = httpReq.QueryString[Keywords.Callback];
-            if (!string.IsNullOrEmpty(callback)) return MimeTypes.Json;
-
-            var format = httpReq.QueryString[Keywords.Format];
+            var format = httpReq.QueryString["format"];
             if (format == null)
             {
                 const int formatMaxLength = 4;
@@ -359,12 +322,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             }
 
             format = format.LeftPart('.').ToLower();
-            if (format.Contains("json")) return MimeTypes.Json;
+            if (format.Contains("json")) return "application/json";
             if (format.Contains("xml")) return MimeTypes.Xml;
-            if (format.Contains("jsv")) return MimeTypes.Jsv;
 
             string contentType;
-            HostContext.ContentTypes.ContentTypeFormats.TryGetValue(format, out contentType);
+            ContentTypes.Instance.ContentTypeFormats.TryGetValue(format, out contentType);
 
             return contentType;
         }
@@ -474,10 +436,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             get { return request.UserAgent; }
         }
 
-        private QueryParamCollection headers;
         public QueryParamCollection Headers
         {
-            get { return headers ?? (headers = ToQueryParams(request.Headers)); }
+            get { return request.Headers; }
         }
 
         private QueryParamCollection queryString;
@@ -492,18 +453,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             get { return formData ?? (formData = this.Form); }
         }
 
-        private QueryParamCollection ToQueryParams(NameValueCollection collection)
-        {
-            var result = new QueryParamCollection();
-
-            foreach (var key in collection.AllKeys)
-            {
-                result[key] = collection[key];
-            }
-
-            return result;
-        }
-
         public bool IsLocal
         {
             get { return request.IsLocal; }
@@ -563,21 +512,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             }
         }
 
-        public bool UseBufferedStream
-        {
-            get { return bufferedStream != null; }
-            set
-            {
-                bufferedStream = value
-                    ? bufferedStream ?? _memoryStreamProvider.CreateNew(request.InputStream.ReadFully())
-                    : null;
-            }
-        }
-
-        private MemoryStream bufferedStream;
         public Stream InputStream
         {
-            get { return bufferedStream ?? request.InputStream; }
+            get { return request.InputStream; }
         }
 
         public long ContentLength
@@ -613,7 +550,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             }
         }
 
-        static Stream GetSubStream(Stream stream, IMemoryStreamProvider streamProvider)
+        static Stream GetSubStream(Stream stream, IMemoryStreamFactory streamProvider)
         {
             if (stream is MemoryStream)
             {
@@ -654,4 +591,13 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             return pathInfo;
         }
     }
+
+    public class HttpFile : IHttpFile
+    {
+        public string Name { get; set; }
+        public string FileName { get; set; }
+        public long ContentLength { get; set; }
+        public string ContentType { get; set; }
+        public Stream InputStream { get; set; }
+    }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
deleted file mode 100644
index 3aae6c9ca..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using MediaBrowser.Model.Logging;
-using ServiceStack;
-using ServiceStack.Host;
-using HttpListenerResponse = SocketHttpListener.Net.HttpListenerResponse;
-using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse;
-using IRequest = MediaBrowser.Model.Services.IRequest;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
-{
-    public class WebSocketSharpResponse : IHttpResponse
-    {
-        private readonly ILogger _logger;
-        private readonly HttpListenerResponse _response;
-
-        public WebSocketSharpResponse(ILogger logger, HttpListenerResponse response, IRequest request)
-        {
-            _logger = logger;
-            this._response = response;
-            Items = new Dictionary<string, object>();
-            Request = request;
-        }
-
-        public IRequest Request { get; private set; }
-        public bool UseBufferedStream { get; set; }
-        public Dictionary<string, object> Items { get; private set; }
-        public object OriginalResponse
-        {
-            get { return _response; }
-        }
-
-        public int StatusCode
-        {
-            get { return this._response.StatusCode; }
-            set { this._response.StatusCode = value; }
-        }
-
-        public string StatusDescription
-        {
-            get { return this._response.StatusDescription; }
-            set { this._response.StatusDescription = value; }
-        }
-
-        public string ContentType
-        {
-            get { return _response.ContentType; }
-            set { _response.ContentType = value; }
-        }
-
-        //public ICookies Cookies { get; set; }
-
-        public void AddHeader(string name, string value)
-        {
-            if (string.Equals(name, "Content-Type", StringComparison.OrdinalIgnoreCase))
-            {
-                ContentType = value;
-                return;
-            }
-
-            _response.AddHeader(name, value);
-        }
-
-        public string GetHeader(string name)
-        {
-            return _response.Headers[name];
-        }
-
-        public void Redirect(string url)
-        {
-            _response.Redirect(url);
-        }
-
-        public Stream OutputStream
-        {
-            get { return _response.OutputStream; }
-        }
-
-        public object Dto { get; set; }
-
-        public void Write(string text)
-        {
-            var bOutput = System.Text.Encoding.UTF8.GetBytes(text);
-            _response.ContentLength64 = bOutput.Length;
-
-            var outputStream = _response.OutputStream;
-            outputStream.Write(bOutput, 0, bOutput.Length);
-            Close();
-        }
-
-        public void Close()
-        {
-            if (!this.IsClosed)
-            {
-                this.IsClosed = true;
-
-                try
-                {
-                    this._response.CloseOutputStream(_logger);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error closing HttpListener output stream", ex);
-                }
-            }
-        }
-
-        public void End()
-        {
-            Close();
-        }
-
-        public void Flush()
-        {
-            _response.OutputStream.Flush();
-        }
-
-        public bool IsClosed
-        {
-            get;
-            private set;
-        }
-
-        public void SetContentLength(long contentLength)
-        {
-            //you can happily set the Content-Length header in Asp.Net
-            //but HttpListener will complain if you do - you have to set ContentLength64 on the response.
-            //workaround: HttpListener throws "The parameter is incorrect" exceptions when we try to set the Content-Length header
-            _response.ContentLength64 = contentLength;
-        }
-
-        public void SetCookie(Cookie cookie)
-        {
-            var cookieStr = cookie.AsHeaderValue();
-            _response.Headers.Add(HttpHeaders.SetCookie, cookieStr);
-        }
-
-        public bool SendChunked
-        {
-            get { return _response.SendChunked; }
-            set { _response.SendChunked = value; }
-        }
-
-        public bool KeepAlive { get; set; }
-
-        public void ClearCookies()
-        {
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs b/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs
index 0a0a04d5d..cb62ffa98 100644
--- a/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs
+++ b/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs
@@ -4,7 +4,7 @@ using Microsoft.IO;
 
 namespace MediaBrowser.Server.Implementations.IO
 {
-    public class RecyclableMemoryStreamProvider : IMemoryStreamProvider
+    public class RecyclableMemoryStreamProvider : IMemoryStreamFactory
     {
         readonly RecyclableMemoryStreamManager _manager = new RecyclableMemoryStreamManager();
 
@@ -22,9 +22,15 @@ namespace MediaBrowser.Server.Implementations.IO
         {
             return _manager.GetStream("RecyclableMemoryStream", buffer, 0, buffer.Length);
         }
+
+        public bool TryGetBuffer(MemoryStream stream, out byte[] buffer)
+        {
+            buffer = stream.GetBuffer();
+            return true;
+        }
     }
 
-    public class MemoryStreamProvider : IMemoryStreamProvider
+    public class MemoryStreamProvider : IMemoryStreamFactory
     {
         public MemoryStream CreateNew()
         {
@@ -40,5 +46,11 @@ namespace MediaBrowser.Server.Implementations.IO
         {
             return new MemoryStream(buffer);
         }
+
+        public bool TryGetBuffer(MemoryStream stream, out byte[] buffer)
+        {
+            buffer = stream.GetBuffer();
+            return true;
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 42e2e0d7b..4096d71dc 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -69,16 +69,12 @@
       <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ServiceStack.Api.Swagger">
-      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath>
-    </Reference>
     <Reference Include="SharpCompress, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath>
     </Reference>
-    <Reference Include="SocketHttpListener, Version=1.0.6154.22657, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SocketHttpListener.1.0.0.44\lib\net45\SocketHttpListener.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SocketHttpListener.Portable">
+      <HintPath>..\ThirdParty\emby\SocketHttpListener.Portable.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -88,7 +84,6 @@
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="ServiceStack">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
@@ -119,18 +114,9 @@
     <Compile Include="HttpServer\ContainerAdapter.cs" />
     <Compile Include="HttpServer\HttpListenerHost.cs" />
     <Compile Include="HttpServer\HttpResultFactory.cs" />
-    <Compile Include="HttpServer\LoggerUtils.cs" />
-    <Compile Include="HttpServer\RangeRequestWriter.cs" />
-    <Compile Include="HttpServer\ResponseFilter.cs" />
     <Compile Include="HttpServer\ServerFactory.cs" />
-    <Compile Include="HttpServer\ServerLogFactory.cs" />
-    <Compile Include="HttpServer\ServerLogger.cs" />
-    <Compile Include="HttpServer\SocketSharp\SharpWebSocket.cs" />
-    <Compile Include="HttpServer\SocketSharp\Extensions.cs" />
     <Compile Include="HttpServer\SocketSharp\RequestMono.cs" />
-    <Compile Include="HttpServer\SocketSharp\WebSocketSharpListener.cs" />
     <Compile Include="HttpServer\SocketSharp\WebSocketSharpRequest.cs" />
-    <Compile Include="HttpServer\SocketSharp\WebSocketSharpResponse.cs" />
     <Compile Include="IO\LibraryMonitor.cs" />
     <Compile Include="IO\MemoryStreamProvider.cs" />
     <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" />
diff --git a/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs
index 86ecbd24d..179101ca2 100644
--- a/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// </summary>
         /// <returns>Stream.</returns>
         /// <exception cref="System.ArgumentNullException">reader</exception>
-        public static Stream GetMemoryStream(this IDataReader reader, int ordinal, IMemoryStreamProvider streamProvider)
+        public static Stream GetMemoryStream(this IDataReader reader, int ordinal, IMemoryStreamFactory streamProvider)
         {
             if (reader == null)
             {
@@ -134,7 +134,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// </summary>
         /// <returns>System.Byte[][].</returns>
         /// <exception cref="System.ArgumentNullException">obj</exception>
-        public static byte[] SerializeToBytes(this IJsonSerializer json, object obj, IMemoryStreamProvider streamProvider)
+        public static byte[] SerializeToBytes(this IJsonSerializer json, object obj, IMemoryStreamFactory streamProvider)
         {
             if (obj == null)
             {
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
index 3d20cad36..c97ba8792 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
@@ -20,9 +20,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
     /// </summary>
     public class SqliteDisplayPreferencesRepository : BaseSqliteRepository, IDisplayPreferencesRepository
     {
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
-        public SqliteDisplayPreferencesRepository(ILogManager logManager, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, IDbConnector dbConnector, IMemoryStreamProvider memoryStreamProvider)
+        public SqliteDisplayPreferencesRepository(ILogManager logManager, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, IDbConnector dbConnector, IMemoryStreamFactory memoryStreamProvider)
             : base(logManager, dbConnector)
         {
             _jsonSerializer = jsonSerializer;
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 5fcd38f87..3577d1883 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -99,12 +99,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
         private IDbCommand _updateInheritedTagsCommand;
 
         public const int LatestSchemaVersion = 109;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
-        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager, IDbConnector connector, IMemoryStreamProvider memoryStreamProvider)
+        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager, IDbConnector connector, IMemoryStreamFactory memoryStreamProvider)
             : base(logManager, connector)
         {
             if (config == null)
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
index c3cf4acc4..0c1367e0a 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
@@ -20,9 +20,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
     public class SqliteUserRepository : BaseSqliteRepository, IUserRepository
     {
         private readonly IJsonSerializer _jsonSerializer;
-        private readonly IMemoryStreamProvider _memoryStreamProvider;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
 
-        public SqliteUserRepository(ILogManager logManager, IServerApplicationPaths appPaths, IJsonSerializer jsonSerializer, IDbConnector dbConnector, IMemoryStreamProvider memoryStreamProvider) : base(logManager, dbConnector)
+        public SqliteUserRepository(ILogManager logManager, IServerApplicationPaths appPaths, IJsonSerializer jsonSerializer, IDbConnector dbConnector, IMemoryStreamFactory memoryStreamProvider) : base(logManager, dbConnector)
         {
             _jsonSerializer = jsonSerializer;
             _memoryStreamProvider = memoryStreamProvider;
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 909246f68..84a5d5a1d 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -5,6 +5,5 @@
   <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
   <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />
-  <package id="SocketHttpListener" version="1.0.0.44" targetFramework="net46" />
   <package id="UniversalDetector" version="1.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index fd84940dd..c0f184bef 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -126,7 +126,7 @@ using MediaBrowser.Model.Reflection;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Social;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 using MediaBrowser.Model.Xml;
 using MediaBrowser.Server.Implementations.Archiving;
 using MediaBrowser.Server.Implementations.Serialization;
@@ -252,6 +252,8 @@ namespace MediaBrowser.Server.Startup.Common
         /// <value>The zip client.</value>
         protected IZipClient ZipClient { get; private set; }
 
+        protected IAuthService AuthService { get; private set; }
+
         private readonly StartupOptions _startupOptions;
         private readonly string _releaseAssetFilename;
 
@@ -410,7 +412,7 @@ namespace MediaBrowser.Server.Startup.Common
             LogManager.RemoveConsoleOutput();
         }
 
-        protected override IMemoryStreamProvider CreateMemoryStreamProvider()
+        protected override IMemoryStreamFactory CreateMemoryStreamProvider()
         {
             if (Environment.OSVersion.Platform == PlatformID.Win32NT)
             {
@@ -555,7 +557,7 @@ namespace MediaBrowser.Server.Startup.Common
             StringExtensions.LocalizationManager = LocalizationManager;
             RegisterSingleInstance(LocalizationManager);
 
-            IEncoding textEncoding = new TextEncoding(FileSystemManager);
+            ITextEncoding textEncoding = new TextEncoding(FileSystemManager);
             RegisterSingleInstance(textEncoding);
             Utilities.EncodingHelper = textEncoding;
             RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer(FileSystemManager, textEncoding));
@@ -601,7 +603,7 @@ namespace MediaBrowser.Server.Startup.Common
 
             RegisterSingleInstance<ISearchEngine>(() => new SearchEngine(LogManager, LibraryManager, UserManager));
 
-            HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamProvider, "Emby", "web/index.html");
+            HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamProvider, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider);
             HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading");
             RegisterSingleInstance(HttpServer, false);
             progress.Report(10);
@@ -702,7 +704,9 @@ namespace MediaBrowser.Server.Startup.Common
             var authContext = new AuthorizationContext(AuthenticationRepository, ConnectManager);
             RegisterSingleInstance<IAuthorizationContext>(authContext);
             RegisterSingleInstance<ISessionContext>(new SessionContext(UserManager, authContext, SessionManager));
-            RegisterSingleInstance<IAuthService>(new AuthService(UserManager, authContext, ServerConfigurationManager, ConnectManager, SessionManager, DeviceManager));
+
+            AuthService = new AuthService(UserManager, authContext, ServerConfigurationManager, ConnectManager, SessionManager, DeviceManager);
+            RegisterSingleInstance<IAuthService>(AuthService);
 
             SubtitleEncoder = new SubtitleEncoder(LibraryManager, LogManager.GetLogger("SubtitleEncoder"), ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer, HttpClient, MediaSourceManager, MemoryStreamProvider, ProcessFactory, textEncoding);
             RegisterSingleInstance(SubtitleEncoder);
@@ -900,6 +904,7 @@ namespace MediaBrowser.Server.Startup.Common
             BaseStreamingService.AppHost = this;
             BaseStreamingService.HttpClient = HttpClient;
             Utilities.CryptographyProvider = CryptographyProvider;
+            AuthenticatedAttribute.AuthService = AuthService;
         }
 
         /// <summary>
@@ -1291,7 +1296,7 @@ namespace MediaBrowser.Server.Startup.Common
             try
             {
                 // Return the first matched address, if found, or the first known local address
-                var address = (await GetLocalIpAddressesInternal().ConfigureAwait(false)).FirstOrDefault(i => !IPAddress.IsLoopback(i));
+                var address = (await GetLocalIpAddresses().ConfigureAwait(false)).FirstOrDefault(i => !i.Equals(IpAddressInfo.Loopback) && !i.Equals(IpAddressInfo.IPv6Loopback));
 
                 if (address != null)
                 {
@@ -1308,19 +1313,14 @@ namespace MediaBrowser.Server.Startup.Common
             return null;
         }
 
-        public string GetLocalApiUrl(IPAddress ipAddress)
-        {
-            return GetLocalApiUrl(ipAddress.ToString(), ipAddress.AddressFamily == AddressFamily.InterNetworkV6);
-        }
-
-        public string GetLocalApiUrl(string ipAddress, bool isIpv6)
+        public string GetLocalApiUrl(IpAddressInfo ipAddress)
         {
-            if (isIpv6)
+            if (ipAddress.AddressFamily == IpAddressFamily.InterNetworkV6)
             {
-                return GetLocalApiUrl("[" + ipAddress + "]");
+                return GetLocalApiUrl("[" + ipAddress.Address + "]");
             }
 
-            return GetLocalApiUrl(ipAddress);
+            return GetLocalApiUrl(ipAddress.Address);
         }
 
         public string GetLocalApiUrl(string host)
@@ -1332,23 +1332,8 @@ namespace MediaBrowser.Server.Startup.Common
 
         public async Task<List<IpAddressInfo>> GetLocalIpAddresses()
         {
-            var list = await GetLocalIpAddressesInternal().ConfigureAwait(false);
-
-            return list.Select(i => new IpAddressInfo
-            {
-                Address = i.ToString(),
-                IsIpv6 = i.AddressFamily == AddressFamily.InterNetworkV6
-
-            }).ToList();
-        }
-
-        private async Task<List<IPAddress>> GetLocalIpAddressesInternal()
-        {
-            // Need to do this until Common will compile with this method
-            var nativeNetworkManager = (BaseNetworkManager)NetworkManager;
-
-            var addresses = nativeNetworkManager.GetLocalIpAddresses().ToList();
-            var list = new List<IPAddress>();
+            var addresses = NetworkManager.GetLocalIpAddresses().ToList();
+            var list = new List<IpAddressInfo>();
 
             foreach (var address in addresses)
             {
@@ -1364,9 +1349,10 @@ namespace MediaBrowser.Server.Startup.Common
 
         private readonly ConcurrentDictionary<string, bool> _validAddressResults = new ConcurrentDictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
         private DateTime _lastAddressCacheClear;
-        private async Task<bool> IsIpAddressValidAsync(IPAddress address)
+        private async Task<bool> IsIpAddressValidAsync(IpAddressInfo address)
         {
-            if (IPAddress.IsLoopback(address))
+            if (address.Equals(IpAddressInfo.Loopback) ||
+                address.Equals(IpAddressInfo.IPv6Loopback))
             {
                 return true;
             }
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index e813c0a0a..7b949fcb1 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.684</version>
+        <version>3.0.688</version>
         <title>Emby.Common</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 9b0c10cbb..96986de9b 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.684</version>
+        <version>3.0.688</version>
         <title>Emby.Server.Core</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Emby Server.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.684" />
+            <dependency id="MediaBrowser.Common" version="3.0.688" />
         </dependencies>
     </metadata>
     <files>
diff --git a/OpenSubtitlesHandler/Utilities.cs b/OpenSubtitlesHandler/Utilities.cs
index b2ad2d0f1..3fe606c78 100644
--- a/OpenSubtitlesHandler/Utilities.cs
+++ b/OpenSubtitlesHandler/Utilities.cs
@@ -24,7 +24,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Cryptography;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
 
 namespace OpenSubtitlesHandler
 {
@@ -33,9 +33,9 @@ namespace OpenSubtitlesHandler
     /// </summary>
     public sealed class Utilities
     {
-        public static ICryptographyProvider CryptographyProvider { get; set; }
+        public static ICryptoProvider CryptographyProvider { get; set; }
         public static IHttpClient HttpClient { get; set; }
-        public static IEncoding EncodingHelper { get; set; }
+        public static ITextEncoding EncodingHelper { get; set; }
 
         private const string XML_RPC_SERVER = "https://api.opensubtitles.org/xml-rpc";
 
@@ -124,13 +124,13 @@ namespace OpenSubtitlesHandler
                     data.Add((byte)r);
                 }
                 var bytes = data.ToArray();
-                return EncodingHelper.GetASCIIString(bytes, 0, bytes.Length);
+                return EncodingHelper.GetASCIIEncoding().GetString(bytes, 0, bytes.Length);
             }
         }
 
         public static byte[] GetASCIIBytes(string text)
         {
-            return EncodingHelper.GetASCIIBytes(text);
+            return EncodingHelper.GetASCIIEncoding().GetBytes(text);
         }
 
         /// <summary>
-- 
cgit v1.2.3


From e8c70da2b6044243d8352af8358dd701afe570e5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 8 Nov 2016 14:50:39 -0500
Subject: fix ipv6

---
 .../SocketSharp/WebSocketSharpListener.cs          |  6 ++-
 .../Library/LibraryManager.cs                      |  6 ++-
 MediaBrowser.Model/Net/IpAddressInfo.cs            |  2 +-
 .../HttpServer/HttpListenerHost.cs                 | 43 ++--------------------
 4 files changed, 13 insertions(+), 44 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index 0cb4d428b..db7b9bc4b 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -29,8 +29,9 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         private readonly ICryptoProvider _cryptoProvider;
         private readonly IStreamFactory _streamFactory;
         private readonly Func<HttpListenerContext, IHttpRequest> _httpRequestFactory;
+        private readonly bool _enableDualMode;
 
-        public WebSocketSharpListener(ILogger logger, ICertificate certificate, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, INetworkManager networkManager, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, Func<HttpListenerContext, IHttpRequest> httpRequestFactory)
+        public WebSocketSharpListener(ILogger logger, ICertificate certificate, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, INetworkManager networkManager, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, bool enableDualMode, Func<HttpListenerContext, IHttpRequest> httpRequestFactory)
         {
             _logger = logger;
             _certificate = certificate;
@@ -40,6 +41,7 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             _socketFactory = socketFactory;
             _cryptoProvider = cryptoProvider;
             _streamFactory = streamFactory;
+            _enableDualMode = enableDualMode;
             _httpRequestFactory = httpRequestFactory;
         }
 
@@ -55,6 +57,8 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             if (_listener == null)
                 _listener = new HttpListener(new PatternsLogger(_logger), _cryptoProvider, _streamFactory, _socketFactory, _networkManager, _textEncoding, _memoryStreamProvider);
 
+            _listener.EnableDualMode = _enableDualMode;
+
             if (_certificate != null)
             {
                 _listener.LoadCert(_certificate);
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 7ae00d94c..8800777ca 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2496,10 +2496,12 @@ namespace Emby.Server.Implementations.Library
                 }).OrderBy(i => i.Path).ToList();
         }
 
+        private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes" };
+
         public IEnumerable<Video> FindExtras(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService)
         {
             var files = fileSystemChildren.Where(i => i.IsDirectory)
-                .Where(i => string.Equals(i.Name, "extras", StringComparison.OrdinalIgnoreCase) || string.Equals(i.Name, "specials", StringComparison.OrdinalIgnoreCase))
+                .Where(i => ExtrasSubfolderNames.Contains(i.Name ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 .SelectMany(i => _fileSystem.GetFiles(i.FullName, false))
                 .ToList();
 
@@ -2788,7 +2790,7 @@ namespace Emby.Server.Implementations.Library
                 {
                     var path = Path.Combine(virtualFolderPath, collectionType + ".collection");
 
-                    _fileSystem.WriteAllBytes(path, new byte[] {});
+                    _fileSystem.WriteAllBytes(path, new byte[] { });
                 }
 
                 CollectionFolder.SaveLibraryOptions(virtualFolderPath, options);
diff --git a/MediaBrowser.Model/Net/IpAddressInfo.cs b/MediaBrowser.Model/Net/IpAddressInfo.cs
index 47ffe5118..00a16c03d 100644
--- a/MediaBrowser.Model/Net/IpAddressInfo.cs
+++ b/MediaBrowser.Model/Net/IpAddressInfo.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Model.Net
         public static IpAddressInfo Any = new IpAddressInfo("0.0.0.0", IpAddressFamily.InterNetwork);
         public static IpAddressInfo IPv6Any = new IpAddressInfo("00000000000000000000", IpAddressFamily.InterNetworkV6);
         public static IpAddressInfo Loopback = new IpAddressInfo("127.0.0.1", IpAddressFamily.InterNetwork);
-        public static IpAddressInfo IPv6Loopback = new IpAddressInfo("IPv6Loopback", IpAddressFamily.InterNetworkV6);
+        public static IpAddressInfo IPv6Loopback = new IpAddressInfo("::1", IpAddressFamily.InterNetworkV6);
 
         public string Address { get; set; }
         public IpAddressFamily AddressFamily { get; set; }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index ebb282503..7ef8c464e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -106,27 +106,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 {typeof (NotSupportedException), 500}
             };
 
-            HostConfig.Instance.GlobalResponseHeaders = new Dictionary<string, string>();
-
             // The Markdown feature causes slow startup times (5 mins+) on cold boots for some users
             // Custom format allows images
             HostConfig.Instance.EnableFeatures = Feature.Html | Feature.Json | Feature.Xml | Feature.CustomFormat;
 
             Container.Adapter = _containerAdapter;
 
-            //Plugins.Add(new AuthFeature(() => new AuthUserSession(), new IAuthProvider[] {
-            //    new SessionAuthProvider(_containerAdapter.Resolve<ISessionContext>()),
-            //}));
-
-            //PreRequestFilters.Add((httpReq, httpRes) =>
-            //{
-            //    //Handles Request and closes Responses after emitting global HTTP Headers
-            //    if (string.Equals(httpReq.Verb, "OPTIONS", StringComparison.OrdinalIgnoreCase))
-            //    {
-            //        httpRes.EndRequest(); //add a 'using ServiceStack;'
-            //    }
-            //});
-
             var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
             foreach (var filter in requestFilters)
             {
@@ -144,13 +129,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             }
         }
 
-        public override void OnAfterInit()
-        {
-            SetAppDomainData();
-
-            base.OnAfterInit();
-        }
-
         public override void OnConfigLoad()
         {
             base.OnConfigLoad();
@@ -167,23 +145,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return new ServiceController(this, () => types);
         }
 
-        public virtual void SetAppDomainData()
-        {
-            //Required for Mono to resolve VirtualPathUtility and Url.Content urls
-            var domain = Thread.GetDomain(); // or AppDomain.Current
-            domain.SetData(".appDomain", "1");
-            domain.SetData(".appVPath", "/");
-            domain.SetData(".appPath", domain.BaseDirectory);
-            if (string.IsNullOrEmpty(domain.GetData(".appId") as string))
-            {
-                domain.SetData(".appId", "1");
-            }
-            if (string.IsNullOrEmpty(domain.GetData(".domainId") as string))
-            {
-                domain.SetData(".domainId", "1");
-            }
-        }
-
         public override ServiceStackHost Start(string listeningAtUrlBase)
         {
             StartListener();
@@ -225,7 +186,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 ? GetCert(CertificatePath) :
                 null;
 
-            return new WebSocketSharpListener(_logger, cert, _memoryStreamProvider, _textEncoding, _networkManager, _socketFactory, _cryptoProvider, new StreamFactory(), GetRequest);
+            var enableDualMode = Environment.OSVersion.Platform == PlatformID.Win32NT;
+
+            return new WebSocketSharpListener(_logger, cert, _memoryStreamProvider, _textEncoding, _networkManager, _socketFactory, _cryptoProvider, new StreamFactory(), enableDualMode, GetRequest);
         }
 
         public static ICertificate GetCert(string certificateLocation)
-- 
cgit v1.2.3


From 227dd0a42d398978ca085a607345a7877de87950 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 10 Nov 2016 09:41:24 -0500
Subject: rework result factory

---
 .../HttpServer/SwaggerService.cs                   |    9 +-
 Emby.Server.sln                                    |   36 +-
 MediaBrowser.Api/ApiEntryPoint.cs                  |    7 +-
 MediaBrowser.Api/BaseApiService.cs                 |   43 +-
 MediaBrowser.Api/ConnectService.cs                 |    6 +-
 MediaBrowser.Api/GamesService.cs                   |    7 +-
 MediaBrowser.Api/Images/ImageByNameService.cs      |   14 +-
 MediaBrowser.Api/Images/ImageService.cs            |    8 +-
 MediaBrowser.Api/Library/LibraryService.cs         |   38 +-
 MediaBrowser.Api/LiveTv/LiveTvService.cs           |   26 +-
 MediaBrowser.Api/Movies/CollectionService.cs       |    8 +-
 MediaBrowser.Api/Movies/MoviesService.cs           |    8 +-
 MediaBrowser.Api/Movies/TrailersService.cs         |   10 +-
 MediaBrowser.Api/Music/AlbumsService.cs            |    8 +-
 MediaBrowser.Api/Music/InstantMixService.cs        |    6 +-
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |    5 +-
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs    |   10 +-
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs |    4 +-
 MediaBrowser.Api/Playback/Hls/VideoHlsService.cs   |    9 +-
 MediaBrowser.Api/Playback/MediaInfoService.cs      |    8 +-
 .../Playback/Progressive/AudioService.cs           |    9 +-
 .../Progressive/BaseProgressiveStreamingService.cs |    2 +-
 .../Playback/Progressive/VideoService.cs           |    4 +-
 MediaBrowser.Api/PlaylistService.cs                |    6 +-
 MediaBrowser.Api/Session/SessionsService.cs        |   22 +-
 MediaBrowser.Api/Social/SharingService.cs          |    8 +-
 MediaBrowser.Api/Subtitles/SubtitleService.cs      |    6 +-
 MediaBrowser.Api/Sync/SyncService.cs               |    6 +-
 MediaBrowser.Api/TvShowsService.cs                 |   14 +-
 MediaBrowser.Api/UserLibrary/ArtistsService.cs     |   20 +-
 .../UserLibrary/BaseItemsByNameService.cs          |    9 +-
 MediaBrowser.Api/UserLibrary/GameGenresService.cs  |   13 +-
 MediaBrowser.Api/UserLibrary/GenresService.cs      |   13 +-
 MediaBrowser.Api/UserLibrary/ItemsService.cs       |    6 +-
 MediaBrowser.Api/UserLibrary/MusicGenresService.cs |   13 +-
 MediaBrowser.Api/UserLibrary/PersonsService.cs     |   20 +-
 MediaBrowser.Api/UserLibrary/PlaystateService.cs   |   18 +-
 MediaBrowser.Api/UserLibrary/StudiosService.cs     |   13 +-
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |   20 +-
 MediaBrowser.Api/UserLibrary/UserViewsService.cs   |    9 +-
 MediaBrowser.Api/UserLibrary/YearsService.cs       |   13 +-
 MediaBrowser.Api/UserService.cs                    |   22 +-
 MediaBrowser.Api/VideosService.cs                  |    6 +-
 .../MediaBrowser.Controller.csproj                 |    2 -
 MediaBrowser.Controller/Net/IHasAuthorization.cs   |   12 -
 MediaBrowser.Controller/Net/IHasSession.cs         |   12 -
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |    5 +
 MediaBrowser.Model/Serialization/IXmlSerializer.cs |    2 +-
 .../HttpServer/ContainerAdapter.cs                 |   44 -
 .../HttpServer/HttpListenerHost.cs                 |  102 +-
 .../HttpServer/HttpResultFactory.cs                |  158 +-
 .../HttpServer/ServerFactory.cs                    |    7 +-
 .../SocketSharp/WebSocketSharpRequest.cs           |   32 +-
 .../MediaBrowser.Server.Implementations.csproj     |    4 -
 .../MediaBrowser.Server.Mono.csproj                |   21 +-
 MediaBrowser.Server.Mono/Native/BaseMonoApp.cs     |  271 ---
 MediaBrowser.Server.Mono/Native/MonoApp.cs         |  275 +++
 MediaBrowser.Server.Mono/Native/NativeApp.cs       |   45 -
 .../Networking/CertificateGenerator.cs             |   68 -
 .../Networking/NetworkManager.cs                   |   49 -
 MediaBrowser.Server.Mono/Program.cs                |    2 +-
 MediaBrowser.Server.Mono/Security/ASN1.cs          |  339 ----
 MediaBrowser.Server.Mono/Security/ASN1Convert.cs   |  206 ---
 .../Security/BitConverterLE.cs                     |  239 ---
 MediaBrowser.Server.Mono/Security/CryptoConvert.cs |  744 --------
 MediaBrowser.Server.Mono/Security/PKCS1.cs         |  490 -----
 MediaBrowser.Server.Mono/Security/PKCS12.cs        | 1933 -------------------
 MediaBrowser.Server.Mono/Security/PKCS7.cs         | 1011 ----------
 MediaBrowser.Server.Mono/Security/PKCS8.cs         |  494 -----
 MediaBrowser.Server.Mono/Security/X501Name.cs      |  392 ----
 MediaBrowser.Server.Mono/Security/X509Builder.cs   |  152 --
 .../Security/X509Certificate.cs                    |  562 ------
 .../Security/X509CertificateBuilder.cs             |  244 ---
 .../Security/X509CertificateCollection.cs          |  200 --
 MediaBrowser.Server.Mono/Security/X509Extension.cs |  207 ---
 .../Security/X509Extensions.cs                     |  194 --
 .../Security/X520Attributes.cs                     |  345 ----
 .../ApplicationHost.cs                             |    4 +-
 .../MediaBrowser.Server.Startup.Common.csproj      |   24 +-
 .../Networking/NetworkManager.cs                   |   50 +
 .../Security/ASN1.cs                               |  339 ++++
 .../Security/ASN1Convert.cs                        |  207 +++
 .../Security/BitConverterLE.cs                     |  239 +++
 .../Security/CertificateGenerator.cs               |   67 +
 .../Security/CryptoConvert.cs                      |  745 ++++++++
 .../Security/PKCS1.cs                              |  491 +++++
 .../Security/PKCS12.cs                             | 1934 ++++++++++++++++++++
 .../Security/PKCS7.cs                              | 1012 ++++++++++
 .../Security/PKCS8.cs                              |  495 +++++
 .../Security/PfxGenerator.cs                       |   75 +
 .../Security/X501Name.cs                           |  393 ++++
 .../Security/X509Builder.cs                        |  153 ++
 .../Security/X509Certificate.cs                    |  563 ++++++
 .../Security/X509CertificateBuilder.cs             |  245 +++
 .../Security/X509CertificateCollection.cs          |  201 ++
 .../Security/X509Extension.cs                      |  208 +++
 .../Security/X509Extensions.cs                     |  195 ++
 .../Security/X520Attributes.cs                     |  346 ++++
 .../MediaBrowser.ServerApplication.csproj          |    1 -
 .../Networking/CertificateGenerator.cs             |  244 ---
 .../Networking/NetworkManager.cs                   |   16 +-
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |   22 +-
 102 files changed, 8789 insertions(+), 8885 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Net/IHasAuthorization.cs
 delete mode 100644 MediaBrowser.Controller/Net/IHasSession.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs
 delete mode 100644 MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
 create mode 100644 MediaBrowser.Server.Mono/Native/MonoApp.cs
 delete mode 100644 MediaBrowser.Server.Mono/Native/NativeApp.cs
 delete mode 100644 MediaBrowser.Server.Mono/Networking/CertificateGenerator.cs
 delete mode 100644 MediaBrowser.Server.Mono/Networking/NetworkManager.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/ASN1.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/ASN1Convert.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/BitConverterLE.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/CryptoConvert.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/PKCS1.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/PKCS12.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/PKCS7.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/PKCS8.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X501Name.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X509Builder.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X509Certificate.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X509CertificateBuilder.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X509CertificateCollection.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X509Extension.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X509Extensions.cs
 delete mode 100644 MediaBrowser.Server.Mono/Security/X520Attributes.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Networking/NetworkManager.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/ASN1.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/ASN1Convert.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/BitConverterLE.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/CertificateGenerator.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/CryptoConvert.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/PKCS1.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/PKCS12.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/PKCS7.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/PKCS8.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/PfxGenerator.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X501Name.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X509Builder.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X509Certificate.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X509CertificateBuilder.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X509CertificateCollection.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X509Extension.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X509Extensions.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Security/X520Attributes.cs
 delete mode 100644 MediaBrowser.ServerApplication/Networking/CertificateGenerator.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/HttpServer/SwaggerService.cs b/Emby.Server.Implementations/HttpServer/SwaggerService.cs
index 3c181e425..d41946645 100644
--- a/Emby.Server.Implementations/HttpServer/SwaggerService.cs
+++ b/Emby.Server.Implementations/HttpServer/SwaggerService.cs
@@ -6,15 +6,16 @@ using MediaBrowser.Model.Services;
 
 namespace Emby.Server.Implementations.HttpServer
 {
-    public class SwaggerService : IHasResultFactory, IService
+    public class SwaggerService : IService, IRequiresRequest
     {
         private readonly IServerApplicationPaths _appPaths;
         private readonly IFileSystem _fileSystem;
 
-        public SwaggerService(IServerApplicationPaths appPaths, IFileSystem fileSystem)
+        public SwaggerService(IServerApplicationPaths appPaths, IFileSystem fileSystem, IHttpResultFactory resultFactory)
         {
             _appPaths = appPaths;
             _fileSystem = fileSystem;
+            _resultFactory = resultFactory;
         }
 
         /// <summary>
@@ -28,14 +29,14 @@ namespace Emby.Server.Implementations.HttpServer
 
             var requestedFile = Path.Combine(swaggerDirectory, request.ResourceName.Replace('/', _fileSystem.DirectorySeparatorChar));
 
-            return ResultFactory.GetStaticFileResult(Request, requestedFile).Result;
+            return _resultFactory.GetStaticFileResult(Request, requestedFile).Result;
         }
 
         /// <summary>
         /// Gets or sets the result factory.
         /// </summary>
         /// <value>The result factory.</value>
-        public IHttpResultFactory ResultFactory { get; set; }
+        private readonly IHttpResultFactory _resultFactory;
 
         /// <summary>
         /// Gets or sets the request context.
diff --git a/Emby.Server.sln b/Emby.Server.sln
index d28a49273..dce5e562e 100644
--- a/Emby.Server.sln
+++ b/Emby.Server.sln
@@ -36,10 +36,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Emby.Common.Implementations
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mono.Nat", "Mono.Nat\Mono.Nat.xproj", "{0A82260B-4C22-4FD2-869A-E510044E3502}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RSSDP", "RSSDP\RSSDP.xproj", "{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Emby.Dlna", "Emby.Dlna\Emby.Dlna.xproj", "{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Photos", "Emby.Photos\Emby.Photos.csproj", "{89AB4548-770D-41FD-A891-8DAFF44F452C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Api", "MediaBrowser.Api\MediaBrowser.Api.csproj", "{4FD51AC5-2C16-4308-A993-C3A84F3B4582}"
@@ -48,6 +44,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.MediaEncoding"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Server.Implementations", "Emby.Server.Implementations\Emby.Server.Implementations.csproj", "{D08B8079-08B3-48F2-83C4-E9CCCE48AFF1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSSDP", "RSSDP\RSSDP.csproj", "{21002819-C39A-4D3E-BE83-2A276A77FB1F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Dlna", "Emby.Dlna\Emby.Dlna.csproj", "{805844AB-E92F-45E6-9D99-4F6D48D129A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -133,18 +133,6 @@ Global
 		{0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|Any CPU.Build.0 = Release|Any CPU
 		{0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}.Release Mono|Any CPU.Build.0 = Release|Any CPU
-		{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Release Mono|Any CPU.Build.0 = Release|Any CPU
-		{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
@@ -169,6 +157,18 @@ Global
 		{D08B8079-08B3-48F2-83C4-E9CCCE48AFF1}.Release Mono|Any CPU.Build.0 = Release|Any CPU
 		{D08B8079-08B3-48F2-83C4-E9CCCE48AFF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D08B8079-08B3-48F2-83C4-E9CCCE48AFF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Release Mono|Any CPU.Build.0 = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release Mono|Any CPU.Build.0 = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -187,11 +187,11 @@ Global
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
 		{5A27010A-09C6-4E86-93EA-437484C10917} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
 		{0A82260B-4C22-4FD2-869A-E510044E3502} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
-		{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
-		{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
 		{89AB4548-770D-41FD-A891-8DAFF44F452C} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
 		{D08B8079-08B3-48F2-83C4-E9CCCE48AFF1} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5} = {8ADD772F-F0A4-4A53-9B2F-AF4A4C585839}
 	EndGlobalSection
 EndGlobal
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 8f5b5eaaf..bc0241766 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -16,6 +16,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Dto;
@@ -37,7 +38,8 @@ namespace MediaBrowser.Api
         /// Gets or sets the logger.
         /// </summary>
         /// <value>The logger.</value>
-        private ILogger Logger { get; set; }
+        internal ILogger Logger { get; private set; }
+        internal IHttpResultFactory ResultFactory { get; private set; }
 
         /// <summary>
         /// The application paths
@@ -66,7 +68,7 @@ namespace MediaBrowser.Api
         /// <param name="config">The configuration.</param>
         /// <param name="fileSystem">The file system.</param>
         /// <param name="mediaSourceManager">The media source manager.</param>
-        public ApiEntryPoint(ILogger logger, ISessionManager sessionManager, IServerConfigurationManager config, IFileSystem fileSystem, IMediaSourceManager mediaSourceManager, ITimerFactory timerFactory, IProcessFactory processFactory)
+        public ApiEntryPoint(ILogger logger, ISessionManager sessionManager, IServerConfigurationManager config, IFileSystem fileSystem, IMediaSourceManager mediaSourceManager, ITimerFactory timerFactory, IProcessFactory processFactory, IHttpResultFactory resultFactory)
         {
             Logger = logger;
             _sessionManager = sessionManager;
@@ -75,6 +77,7 @@ namespace MediaBrowser.Api
             _mediaSourceManager = mediaSourceManager;
             TimerFactory = timerFactory;
             ProcessFactory = processFactory;
+            ResultFactory = resultFactory;
 
             Instance = this;
             _sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress;
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 4810d4e9c..73a2bedb9 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -17,19 +17,31 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class BaseApiService
     /// </summary>
-    public class BaseApiService : IHasResultFactory, IService, IHasSession
+    public class BaseApiService : IService, IRequiresRequest
     {
         /// <summary>
         /// Gets or sets the logger.
         /// </summary>
         /// <value>The logger.</value>
-        public ILogger Logger { get; set; }
+        public ILogger Logger
+        {
+            get
+            {
+                return ApiEntryPoint.Instance.Logger;
+            }
+        }
 
         /// <summary>
         /// Gets or sets the HTTP result factory.
         /// </summary>
         /// <value>The HTTP result factory.</value>
-        public IHttpResultFactory ResultFactory { get; set; }
+        public IHttpResultFactory ResultFactory
+        {
+            get
+            {
+                return ApiEntryPoint.Instance.ResultFactory;
+            }
+        }
 
         /// <summary>
         /// Gets or sets the request context.
@@ -37,9 +49,6 @@ namespace MediaBrowser.Api
         /// <value>The request context.</value>
         public IRequest Request { get; set; }
 
-        public ISessionContext SessionContext { get; set; }
-        public IAuthorizationContext AuthorizationContext { get; set; }
-
         public string GetHeader(string name)
         {
             return Request.Headers[name];
@@ -57,9 +66,9 @@ namespace MediaBrowser.Api
             return ResultFactory.GetOptimizedResult(Request, result);
         }
 
-        protected void AssertCanUpdateUser(IUserManager userManager, string userId)
+        protected void AssertCanUpdateUser(IAuthorizationContext authContext, IUserManager userManager, string userId)
         {
-            var auth = AuthorizationContext.GetAuthorizationInfo(Request);
+            var auth = authContext.GetAuthorizationInfo(Request);
 
             var authenticatedUser = userManager.GetUserById(auth.UserId);
 
@@ -96,9 +105,9 @@ namespace MediaBrowser.Api
         /// Gets the session.
         /// </summary>
         /// <returns>SessionInfo.</returns>
-        protected async Task<SessionInfo> GetSession()
+        protected async Task<SessionInfo> GetSession(ISessionContext sessionContext)
         {
-            var session = await SessionContext.GetSession(Request).ConfigureAwait(false);
+            var session = await sessionContext.GetSession(Request).ConfigureAwait(false);
 
             if (session == null)
             {
@@ -108,21 +117,11 @@ namespace MediaBrowser.Api
             return session;
         }
 
-        /// <summary>
-        /// To the static file result.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>System.Object.</returns>
-        protected object ToStaticFileResult(string path)
-        {
-            return ResultFactory.GetStaticFileResult(Request, path).Result;
-        }
-
-        protected DtoOptions GetDtoOptions(object request)
+        protected DtoOptions GetDtoOptions(IAuthorizationContext authContext, object request)
         {
             var options = new DtoOptions();
 
-            options.DeviceId = AuthorizationContext.GetAuthorizationInfo(Request).DeviceId;
+            options.DeviceId = authContext.GetAuthorizationInfo(Request).DeviceId;
 
             var hasFields = request as IHasItemFields;
             if (hasFields != null)
diff --git a/MediaBrowser.Api/ConnectService.cs b/MediaBrowser.Api/ConnectService.cs
index ad3649cd2..304dc366b 100644
--- a/MediaBrowser.Api/ConnectService.cs
+++ b/MediaBrowser.Api/ConnectService.cs
@@ -78,11 +78,13 @@ namespace MediaBrowser.Api
     {
         private readonly IConnectManager _connectManager;
         private readonly ISessionManager _sessionManager;
+        private readonly IAuthorizationContext _authContext;
 
-        public ConnectService(IConnectManager connectManager, ISessionManager sessionManager)
+        public ConnectService(IConnectManager connectManager, ISessionManager sessionManager, IAuthorizationContext authContext)
         {
             _connectManager = connectManager;
             _sessionManager = sessionManager;
+            _authContext = authContext;
         }
 
         public object Post(CreateConnectLink request)
@@ -142,7 +144,7 @@ namespace MediaBrowser.Api
                 throw new ResourceNotFoundException();
             }
 
-            var auth = AuthorizationContext.GetAuthorizationInfo(Request);
+            var auth = _authContext.GetAuthorizationInfo(Request);
 
             if (string.IsNullOrWhiteSpace(auth.Client))
             {
diff --git a/MediaBrowser.Api/GamesService.cs b/MediaBrowser.Api/GamesService.cs
index 0c033fe0d..a9394b52e 100644
--- a/MediaBrowser.Api/GamesService.cs
+++ b/MediaBrowser.Api/GamesService.cs
@@ -80,6 +80,8 @@ namespace MediaBrowser.Api
         /// </summary>
         private readonly IDtoService _dtoService;
 
+        private readonly IAuthorizationContext _authContext;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="GamesService" /> class.
         /// </summary>
@@ -88,13 +90,14 @@ namespace MediaBrowser.Api
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="itemRepo">The item repo.</param>
         /// <param name="dtoService">The dto service.</param>
-        public GamesService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService)
+        public GamesService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _userDataRepository = userDataRepository;
             _libraryManager = libraryManager;
             _itemRepo = itemRepo;
             _dtoService = dtoService;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -200,7 +203,7 @@ namespace MediaBrowser.Api
                 (!string.IsNullOrWhiteSpace(request.UserId) ? user.RootFolder :
                 _libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
diff --git a/MediaBrowser.Api/Images/ImageByNameService.cs b/MediaBrowser.Api/Images/ImageByNameService.cs
index e0a9246c1..8fbc56ce3 100644
--- a/MediaBrowser.Api/Images/ImageByNameService.cs
+++ b/MediaBrowser.Api/Images/ImageByNameService.cs
@@ -102,15 +102,17 @@ namespace MediaBrowser.Api.Images
         private readonly IServerApplicationPaths _appPaths;
 
         private readonly IFileSystem _fileSystem;
+        private readonly IHttpResultFactory _resultFactory;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageByNameService" /> class.
         /// </summary>
         /// <param name="appPaths">The app paths.</param>
-        public ImageByNameService(IServerApplicationPaths appPaths, IFileSystem fileSystem)
+        public ImageByNameService(IServerApplicationPaths appPaths, IFileSystem fileSystem, IHttpResultFactory resultFactory)
         {
             _appPaths = appPaths;
             _fileSystem = fileSystem;
+            _resultFactory = resultFactory;
         }
 
         public object Get(GetMediaInfoImages request)
@@ -187,7 +189,7 @@ namespace MediaBrowser.Api.Images
 
 			var path = paths.FirstOrDefault(_fileSystem.FileExists) ?? paths.FirstOrDefault();
 
-            return ToStaticFileResult(path);
+            return _resultFactory.GetStaticFileResult(Request, path);
         }
 
         /// <summary>
@@ -207,7 +209,7 @@ namespace MediaBrowser.Api.Images
 
                 if (!string.IsNullOrEmpty(path))
                 {
-                    return ToStaticFileResult(path);
+                    return _resultFactory.GetStaticFileResult(Request, path);
                 }
             }
 
@@ -224,7 +226,7 @@ namespace MediaBrowser.Api.Images
 
                 if (!string.IsNullOrEmpty(path))
                 {
-                    return ToStaticFileResult(path);
+                    return _resultFactory.GetStaticFileResult(Request, path);
                 }
             }
 
@@ -247,7 +249,7 @@ namespace MediaBrowser.Api.Images
 
                 if (!string.IsNullOrEmpty(path))
                 {
-                    return ToStaticFileResult(path);
+                    return _resultFactory.GetStaticFileResult(Request, path);
                 }
             }
 
@@ -263,7 +265,7 @@ namespace MediaBrowser.Api.Images
 
                 if (!string.IsNullOrEmpty(path))
                 {
-                    return ToStaticFileResult(path);
+                    return _resultFactory.GetStaticFileResult(Request, path);
                 }
             }
 
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index c41907a87..f3ad462c4 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -236,11 +236,12 @@ namespace MediaBrowser.Api.Images
         private readonly IItemRepository _itemRepo;
         private readonly IImageProcessor _imageProcessor;
         private readonly IFileSystem _fileSystem;
+        private readonly IAuthorizationContext _authContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageService" /> class.
         /// </summary>
-        public ImageService(IUserManager userManager, ILibraryManager libraryManager, IProviderManager providerManager, IItemRepository itemRepo, IImageProcessor imageProcessor, IFileSystem fileSystem)
+        public ImageService(IUserManager userManager, ILibraryManager libraryManager, IProviderManager providerManager, IItemRepository itemRepo, IImageProcessor imageProcessor, IFileSystem fileSystem, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _libraryManager = libraryManager;
@@ -248,6 +249,7 @@ namespace MediaBrowser.Api.Images
             _itemRepo = itemRepo;
             _imageProcessor = imageProcessor;
             _fileSystem = fileSystem;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -425,7 +427,7 @@ namespace MediaBrowser.Api.Images
         public void Post(PostUserImage request)
         {
             var userId = GetPathValue(1);
-            AssertCanUpdateUser(_userManager, userId);
+            AssertCanUpdateUser(_authContext, _userManager, userId);
 
             request.Type = (ImageType)Enum.Parse(typeof(ImageType), GetPathValue(3), true);
 
@@ -460,7 +462,7 @@ namespace MediaBrowser.Api.Images
         public void Delete(DeleteUserImage request)
         {
             var userId = request.Id;
-            AssertCanUpdateUser(_userManager, userId);
+            AssertCanUpdateUser(_authContext, _userManager, userId);
 
             var item = _userManager.GetUserById(userId);
 
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 912387fda..36a58cc20 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -323,13 +323,9 @@ namespace MediaBrowser.Api.Library
 
             if (item is Game)
             {
-                return new GamesService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService)
+                return new GamesService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _authContext)
                 {
-                    AuthorizationContext = AuthorizationContext,
-                    Logger = Logger,
                     Request = Request,
-                    SessionContext = SessionContext,
-                    ResultFactory = ResultFactory
 
                 }.Get(new GetSimilarGames
                 {
@@ -341,13 +337,9 @@ namespace MediaBrowser.Api.Library
             }
             if (item is MusicAlbum)
             {
-                return new AlbumsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService)
+                return new AlbumsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _authContext)
                 {
-                    AuthorizationContext = AuthorizationContext,
-                    Logger = Logger,
                     Request = Request,
-                    SessionContext = SessionContext,
-                    ResultFactory = ResultFactory
 
                 }.Get(new GetSimilarAlbums
                 {
@@ -360,13 +352,9 @@ namespace MediaBrowser.Api.Library
             }
             if (item is MusicArtist)
             {
-                return new AlbumsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService)
+                return new AlbumsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _authContext)
                 {
-                    AuthorizationContext = AuthorizationContext,
-                    Logger = Logger,
                     Request = Request,
-                    SessionContext = SessionContext,
-                    ResultFactory = ResultFactory
 
                 }.Get(new GetSimilarArtists
                 {
@@ -381,13 +369,9 @@ namespace MediaBrowser.Api.Library
 
             if (item is Movie || (program != null && program.IsMovie) || item is Trailer)
             {
-                return new MoviesService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _config)
+                return new MoviesService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _config, _authContext)
                 {
-                    AuthorizationContext = AuthorizationContext,
-                    Logger = Logger,
                     Request = Request,
-                    SessionContext = SessionContext,
-                    ResultFactory = ResultFactory
 
                 }.Get(new GetSimilarMovies
                 {
@@ -400,13 +384,9 @@ namespace MediaBrowser.Api.Library
 
             if (item is Series || (program != null && program.IsSeries))
             {
-                return new TvShowsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _tvManager)
+                return new TvShowsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _tvManager, _authContext)
                 {
-                    AuthorizationContext = AuthorizationContext,
-                    Logger = Logger,
                     Request = Request,
-                    SessionContext = SessionContext,
-                    ResultFactory = ResultFactory
 
                 }.Get(new GetSimilarShows
                 {
@@ -431,7 +411,7 @@ namespace MediaBrowser.Api.Library
                 items = items.Where(i => i.IsHidden == val).ToList();
             }
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var result = new ItemsResult
             {
@@ -612,7 +592,7 @@ namespace MediaBrowser.Api.Library
 
             var user = !string.IsNullOrWhiteSpace(request.UserId) ? _userManager.GetUserById(request.UserId) : null;
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             BaseItem parent = item.GetParent();
 
@@ -841,7 +821,7 @@ namespace MediaBrowser.Api.Library
                 item = item.GetParent();
             }
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dtos = item.ThemeSongIds.Select(_libraryManager.GetItemById)
                             .Where(i => i != null)
@@ -885,7 +865,7 @@ namespace MediaBrowser.Api.Library
                 item = item.GetParent();
             }
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dtos = item.ThemeVideoIds.Select(_libraryManager.GetItemById)
                             .Where(i => i != null)
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index fffd7ad7e..c829ad2ab 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -695,8 +695,10 @@ namespace MediaBrowser.Api.LiveTv
         private readonly ILibraryManager _libraryManager;
         private readonly IDtoService _dtoService;
         private readonly IFileSystem _fileSystem;
+        private readonly IAuthorizationContext _authContext;
+        private readonly ISessionContext _sessionContext;
 
-        public LiveTvService(ILiveTvManager liveTvManager, IUserManager userManager, IServerConfigurationManager config, IHttpClient httpClient, ILibraryManager libraryManager, IDtoService dtoService, IFileSystem fileSystem)
+        public LiveTvService(ILiveTvManager liveTvManager, IUserManager userManager, IServerConfigurationManager config, IHttpClient httpClient, ILibraryManager libraryManager, IDtoService dtoService, IFileSystem fileSystem, IAuthorizationContext authContext, ISessionContext sessionContext)
         {
             _liveTvManager = liveTvManager;
             _userManager = userManager;
@@ -705,6 +707,8 @@ namespace MediaBrowser.Api.LiveTv
             _libraryManager = libraryManager;
             _dtoService = dtoService;
             _fileSystem = fileSystem;
+            _authContext = authContext;
+            _sessionContext = sessionContext;
         }
 
         public object Get(GetLiveRecordingFile request)
@@ -819,7 +823,7 @@ namespace MediaBrowser.Api.LiveTv
 
         private void AssertUserCanManageLiveTv()
         {
-            var user = SessionContext.GetUser(Request).Result;
+            var user = _sessionContext.GetUser(Request).Result;
 
             if (user == null)
             {
@@ -907,7 +911,7 @@ namespace MediaBrowser.Api.LiveTv
 
             var user = string.IsNullOrEmpty(request.UserId) ? null : _userManager.GetUserById(request.UserId);
 
-            var options = GetDtoOptions(request);
+            var options = GetDtoOptions(_authContext, request);
             RemoveFields(options);
 
             options.AddCurrentProgram = request.AddCurrentProgram;
@@ -937,7 +941,7 @@ namespace MediaBrowser.Api.LiveTv
 
             var item = _libraryManager.GetItemById(request.Id);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var result = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
@@ -1002,7 +1006,7 @@ namespace MediaBrowser.Api.LiveTv
                 }
             }
 
-            var result = await _liveTvManager.GetPrograms(query, GetDtoOptions(request), CancellationToken.None).ConfigureAwait(false);
+            var result = await _liveTvManager.GetPrograms(query, GetDtoOptions(_authContext, request), CancellationToken.None).ConfigureAwait(false);
 
             return ToOptimizedResult(result);
         }
@@ -1023,7 +1027,7 @@ namespace MediaBrowser.Api.LiveTv
                 EnableTotalRecordCount = request.EnableTotalRecordCount
             };
 
-            var result = await _liveTvManager.GetRecommendedPrograms(query, GetDtoOptions(request), CancellationToken.None).ConfigureAwait(false);
+            var result = await _liveTvManager.GetRecommendedPrograms(query, GetDtoOptions(_authContext, request), CancellationToken.None).ConfigureAwait(false);
 
             return ToOptimizedResult(result);
         }
@@ -1035,8 +1039,8 @@ namespace MediaBrowser.Api.LiveTv
 
         public async Task<object> Get(GetRecordings request)
         {
-            var options = GetDtoOptions(request);
-            options.DeviceId = AuthorizationContext.GetAuthorizationInfo(Request).DeviceId;
+            var options = GetDtoOptions(_authContext, request);
+            options.DeviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
 
             var result = await _liveTvManager.GetRecordings(new RecordingQuery
             {
@@ -1062,8 +1066,8 @@ namespace MediaBrowser.Api.LiveTv
 
         public async Task<object> Get(GetRecordingSeries request)
         {
-            var options = GetDtoOptions(request);
-            options.DeviceId = AuthorizationContext.GetAuthorizationInfo(Request).DeviceId;
+            var options = GetDtoOptions(_authContext, request);
+            options.DeviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
 
             var result = await _liveTvManager.GetRecordingSeries(new RecordingQuery
             {
@@ -1087,7 +1091,7 @@ namespace MediaBrowser.Api.LiveTv
             var user = string.IsNullOrEmpty(request.UserId) ? null : _userManager.GetUserById(request.UserId);
 
             var options = new DtoOptions();
-            options.DeviceId = AuthorizationContext.GetAuthorizationInfo(Request).DeviceId;
+            options.DeviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
 
             var result = await _liveTvManager.GetRecording(request.Id, options, CancellationToken.None, user).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Api/Movies/CollectionService.cs b/MediaBrowser.Api/Movies/CollectionService.cs
index da8018a35..917a3bc0b 100644
--- a/MediaBrowser.Api/Movies/CollectionService.cs
+++ b/MediaBrowser.Api/Movies/CollectionService.cs
@@ -51,16 +51,18 @@ namespace MediaBrowser.Api.Movies
     {
         private readonly ICollectionManager _collectionManager;
         private readonly IDtoService _dtoService;
+        private readonly IAuthorizationContext _authContext;
 
-        public CollectionService(ICollectionManager collectionManager, IDtoService dtoService)
+        public CollectionService(ICollectionManager collectionManager, IDtoService dtoService, IAuthorizationContext authContext)
         {
             _collectionManager = collectionManager;
             _dtoService = dtoService;
+            _authContext = authContext;
         }
 
         public async Task<object> Post(CreateCollection request)
         {
-            var userId = AuthorizationContext.GetAuthorizationInfo(Request).UserId;
+            var userId = _authContext.GetAuthorizationInfo(Request).UserId;
 
             var parentId = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
 
@@ -74,7 +76,7 @@ namespace MediaBrowser.Api.Movies
 
             }).ConfigureAwait(false);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dto = _dtoService.GetBaseItemDto(item, dtoOptions);
 
diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs
index 66a83d271..1b2fa4fff 100644
--- a/MediaBrowser.Api/Movies/MoviesService.cs
+++ b/MediaBrowser.Api/Movies/MoviesService.cs
@@ -90,6 +90,7 @@ namespace MediaBrowser.Api.Movies
         private readonly IItemRepository _itemRepo;
         private readonly IDtoService _dtoService;
         private readonly IServerConfigurationManager _config;
+        private readonly IAuthorizationContext _authContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MoviesService" /> class.
@@ -99,7 +100,7 @@ namespace MediaBrowser.Api.Movies
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="itemRepo">The item repo.</param>
         /// <param name="dtoService">The dto service.</param>
-        public MoviesService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, IServerConfigurationManager config)
+        public MoviesService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, IServerConfigurationManager config, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _userDataRepository = userDataRepository;
@@ -107,6 +108,7 @@ namespace MediaBrowser.Api.Movies
             _itemRepo = itemRepo;
             _dtoService = dtoService;
             _config = config;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -132,7 +134,7 @@ namespace MediaBrowser.Api.Movies
         {
             var user = _userManager.GetUserById(request.UserId);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             dtoOptions.Fields = request.GetItemFields().ToList();
 
@@ -156,7 +158,7 @@ namespace MediaBrowser.Api.Movies
                 itemTypes.Add(typeof(LiveTvProgram).Name);
             }
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
diff --git a/MediaBrowser.Api/Movies/TrailersService.cs b/MediaBrowser.Api/Movies/TrailersService.cs
index 19f46b3d6..eb5365ab8 100644
--- a/MediaBrowser.Api/Movies/TrailersService.cs
+++ b/MediaBrowser.Api/Movies/TrailersService.cs
@@ -39,8 +39,9 @@ namespace MediaBrowser.Api.Movies
         private readonly ICollectionManager _collectionManager;
         private readonly ILocalizationManager _localizationManager;
         private readonly IJsonSerializer _json;
+        private readonly IAuthorizationContext _authContext;
 
-        public TrailersService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IDtoService dtoService, ICollectionManager collectionManager, ILocalizationManager localizationManager, IJsonSerializer json)
+        public TrailersService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IDtoService dtoService, ICollectionManager collectionManager, ILocalizationManager localizationManager, IJsonSerializer json, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _userDataRepository = userDataRepository;
@@ -49,6 +50,7 @@ namespace MediaBrowser.Api.Movies
             _collectionManager = collectionManager;
             _localizationManager = localizationManager;
             _json = json;
+            _authContext = authContext;
         }
 
         public object Get(Getrailers request)
@@ -58,13 +60,9 @@ namespace MediaBrowser.Api.Movies
 
             getItems.IncludeItemTypes = "Trailer";
 
-            return new ItemsService(_userManager, _libraryManager, _localizationManager, _dtoService)
+            return new ItemsService(_userManager, _libraryManager, _localizationManager, _dtoService, _authContext)
             {
-                AuthorizationContext = AuthorizationContext,
-                Logger = Logger,
                 Request = Request,
-                ResultFactory = ResultFactory,
-                SessionContext = SessionContext
 
             }.Get(getItems);
         }
diff --git a/MediaBrowser.Api/Music/AlbumsService.cs b/MediaBrowser.Api/Music/AlbumsService.cs
index f35f3be88..bc7ae2be2 100644
--- a/MediaBrowser.Api/Music/AlbumsService.cs
+++ b/MediaBrowser.Api/Music/AlbumsService.cs
@@ -40,19 +40,21 @@ namespace MediaBrowser.Api.Music
         private readonly ILibraryManager _libraryManager;
         private readonly IItemRepository _itemRepo;
         private readonly IDtoService _dtoService;
+        private readonly IAuthorizationContext _authContext;
 
-        public AlbumsService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService)
+        public AlbumsService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _userDataRepository = userDataRepository;
             _libraryManager = libraryManager;
             _itemRepo = itemRepo;
             _dtoService = dtoService;
+            _authContext = authContext;
         }
 
         public async Task<object> Get(GetSimilarArtists request)
         {
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var result = await SimilarItemsHelper.GetSimilarItemsResult(dtoOptions, _userManager,
                 _itemRepo,
@@ -73,7 +75,7 @@ namespace MediaBrowser.Api.Music
         /// <returns>System.Object.</returns>
         public async Task<object> Get(GetSimilarAlbums request)
         {
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var result = await SimilarItemsHelper.GetSimilarItemsResult(dtoOptions, _userManager,
                 _itemRepo,
diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index 8b9331802..d735dd7cd 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -68,13 +68,15 @@ namespace MediaBrowser.Api.Music
         private readonly IDtoService _dtoService;
         private readonly ILibraryManager _libraryManager;
         private readonly IMusicManager _musicManager;
+        private readonly IAuthorizationContext _authContext;
 
-        public InstantMixService(IUserManager userManager, IDtoService dtoService, IMusicManager musicManager, ILibraryManager libraryManager)
+        public InstantMixService(IUserManager userManager, IDtoService dtoService, IMusicManager musicManager, ILibraryManager libraryManager, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _dtoService = dtoService;
             _musicManager = musicManager;
             _libraryManager = libraryManager;
+            _authContext = authContext;
         }
 
         public Task<object> Get(GetInstantMixFromItem request)
@@ -171,7 +173,7 @@ namespace MediaBrowser.Api.Music
                 TotalRecordCount = list.Count
             };
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             result.Items = (await _dtoService.GetBaseItemDtos(list.Take(request.Limit ?? list.Count), dtoOptions, user).ConfigureAwait(false)).ToArray();
 
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 4fa663b19..bac612a5b 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -21,6 +21,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Diagnostics;
 
 namespace MediaBrowser.Api.Playback
@@ -71,13 +72,15 @@ namespace MediaBrowser.Api.Playback
 
         public static IServerApplicationHost AppHost;
         public static IHttpClient HttpClient;
+        protected IAuthorizationContext AuthorizationContext { get; private set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseStreamingService" /> class.
         /// </summary>
-        protected BaseStreamingService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer)
+        protected BaseStreamingService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext)
         {
             JsonSerializer = jsonSerializer;
+            AuthorizationContext = authorizationContext;
             ZipClient = zipClient;
             MediaSourceManager = mediaSourceManager;
             DeviceManager = deviceManager;
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 55f61f7c7..0c1cdf53e 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -15,6 +15,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.Api.Playback.Hls
@@ -24,11 +25,6 @@ namespace MediaBrowser.Api.Playback.Hls
     /// </summary>
     public abstract class BaseHlsService : BaseStreamingService
     {
-        protected BaseHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer)
-            : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer)
-        {
-        }
-
         /// <summary>
         /// Gets the audio arguments.
         /// </summary>
@@ -292,5 +288,9 @@ namespace MediaBrowser.Api.Playback.Hls
 
             return isLiveStream;
         }
+
+        public BaseHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext)
+        {
+        }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 353e83205..471bfe604 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -95,8 +95,8 @@ namespace MediaBrowser.Api.Playback.Hls
 
     public class DynamicHlsService : BaseHlsService
     {
-        public DynamicHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, INetworkManager networkManager)
-            : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer)
+
+        public DynamicHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, INetworkManager networkManager) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext)
         {
             NetworkManager = networkManager;
         }
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index fcff2ae29..8a2047de4 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -8,6 +8,7 @@ using MediaBrowser.Model.Serialization;
 using System;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Services;
@@ -24,10 +25,6 @@ namespace MediaBrowser.Api.Playback.Hls
     /// </summary>
     public class VideoHlsService : BaseHlsService
     {
-        public VideoHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer)
-        {
-        }
-
         public object Get(GetLiveHlsStream request)
         {
             return ProcessRequest(request, true);
@@ -129,5 +126,9 @@ namespace MediaBrowser.Api.Playback.Hls
         {
             return ".ts";
         }
+
+        public VideoHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index 373c522da..8fb78b6e5 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -72,8 +72,9 @@ namespace MediaBrowser.Api.Playback
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IUserManager _userManager;
         private readonly IJsonSerializer _json;
+        private readonly IAuthorizationContext _authContext;
 
-        public MediaInfoService(IMediaSourceManager mediaSourceManager, IDeviceManager deviceManager, ILibraryManager libraryManager, IServerConfigurationManager config, INetworkManager networkManager, IMediaEncoder mediaEncoder, IUserManager userManager, IJsonSerializer json)
+        public MediaInfoService(IMediaSourceManager mediaSourceManager, IDeviceManager deviceManager, ILibraryManager libraryManager, IServerConfigurationManager config, INetworkManager networkManager, IMediaEncoder mediaEncoder, IUserManager userManager, IJsonSerializer json, IAuthorizationContext authContext)
         {
             _mediaSourceManager = mediaSourceManager;
             _deviceManager = deviceManager;
@@ -83,6 +84,7 @@ namespace MediaBrowser.Api.Playback
             _mediaEncoder = mediaEncoder;
             _userManager = userManager;
             _json = json;
+            _authContext = authContext;
         }
 
         public object Get(GetBitrateTestBytes request)
@@ -105,7 +107,7 @@ namespace MediaBrowser.Api.Playback
 
         public async Task<object> Post(OpenMediaSource request)
         {
-            var authInfo = AuthorizationContext.GetAuthorizationInfo(Request);
+            var authInfo = _authContext.GetAuthorizationInfo(Request);
 
             var result = await _mediaSourceManager.OpenLiveStream(request, true, CancellationToken.None).ConfigureAwait(false);
 
@@ -146,7 +148,7 @@ namespace MediaBrowser.Api.Playback
 
         public async Task<object> Post(GetPostedPlaybackInfo request)
         {
-            var authInfo = AuthorizationContext.GetAuthorizationInfo(Request);
+            var authInfo = _authContext.GetAuthorizationInfo(Request);
 
             var profile = request.DeviceProfile;
 
diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
index e4544370e..082d6b2f4 100644
--- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 
@@ -34,10 +35,6 @@ namespace MediaBrowser.Api.Playback.Progressive
     /// </summary>
     public class AudioService : BaseProgressiveStreamingService
     {
-        public AudioService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IImageProcessor imageProcessor, IHttpClient httpClient) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, imageProcessor, httpClient)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -97,5 +94,9 @@ namespace MediaBrowser.Api.Playback.Progressive
                 string.Join(" ", audioTranscodeParams.ToArray()),
                 outputPath).Trim();
         }
+
+        public AudioService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext, imageProcessor)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
index 8302c1d42..23a84e480 100644
--- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
@@ -29,7 +29,7 @@ namespace MediaBrowser.Api.Playback.Progressive
     {
         protected readonly IImageProcessor ImageProcessor;
 
-        protected BaseProgressiveStreamingService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IImageProcessor imageProcessor, IHttpClient httpClient) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer)
+        public BaseProgressiveStreamingService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext)
         {
             ImageProcessor = imageProcessor;
         }
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index f32a4e895..285d09cdc 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -12,6 +12,7 @@ using System.IO;
 using System.Threading.Tasks;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Services;
@@ -68,8 +69,7 @@ namespace MediaBrowser.Api.Playback.Progressive
     /// </summary>
     public class VideoService : BaseProgressiveStreamingService
     {
-        public VideoService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IImageProcessor imageProcessor, IHttpClient httpClient)
-            : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, imageProcessor, httpClient)
+        public VideoService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext, imageProcessor)
         {
         }
 
diff --git a/MediaBrowser.Api/PlaylistService.cs b/MediaBrowser.Api/PlaylistService.cs
index 685465a6f..bb2bc449b 100644
--- a/MediaBrowser.Api/PlaylistService.cs
+++ b/MediaBrowser.Api/PlaylistService.cs
@@ -125,13 +125,15 @@ namespace MediaBrowser.Api
         private readonly IDtoService _dtoService;
         private readonly IUserManager _userManager;
         private readonly ILibraryManager _libraryManager;
+        private readonly IAuthorizationContext _authContext;
 
-        public PlaylistService(IDtoService dtoService, IPlaylistManager playlistManager, IUserManager userManager, ILibraryManager libraryManager)
+        public PlaylistService(IDtoService dtoService, IPlaylistManager playlistManager, IUserManager userManager, ILibraryManager libraryManager, IAuthorizationContext authContext)
         {
             _dtoService = dtoService;
             _playlistManager = playlistManager;
             _userManager = userManager;
             _libraryManager = libraryManager;
+            _authContext = authContext;
         }
 
         public void Post(MoveItem request)
@@ -188,7 +190,7 @@ namespace MediaBrowser.Api
                 items = items.Take(request.Limit.Value).ToArray();
             }
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dtos = (await _dtoService.GetBaseItemDtos(items.Select(i => i.Item2), dtoOptions, user).ConfigureAwait(false))
                    .ToArray();
diff --git a/MediaBrowser.Api/Session/SessionsService.cs b/MediaBrowser.Api/Session/SessionsService.cs
index e2f16df2d..70e0d3c45 100644
--- a/MediaBrowser.Api/Session/SessionsService.cs
+++ b/MediaBrowser.Api/Session/SessionsService.cs
@@ -306,6 +306,7 @@ namespace MediaBrowser.Api.Session
         private readonly IAuthorizationContext _authContext;
         private readonly IAuthenticationRepository _authRepo;
         private readonly IDeviceManager _deviceManager;
+        private readonly ISessionContext _sessionContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SessionsService" /> class.
@@ -314,13 +315,14 @@ namespace MediaBrowser.Api.Session
         /// <param name="userManager">The user manager.</param>
         /// <param name="authContext">The authentication context.</param>
         /// <param name="authRepo">The authentication repo.</param>
-        public SessionsService(ISessionManager sessionManager, IUserManager userManager, IAuthorizationContext authContext, IAuthenticationRepository authRepo, IDeviceManager deviceManager)
+        public SessionsService(ISessionManager sessionManager, IUserManager userManager, IAuthorizationContext authContext, IAuthenticationRepository authRepo, IDeviceManager deviceManager, ISessionContext sessionContext)
         {
             _sessionManager = sessionManager;
             _userManager = userManager;
             _authContext = authContext;
             _authRepo = authRepo;
             _deviceManager = deviceManager;
+            _sessionContext = sessionContext;
         }
 
         public void Delete(RevokeKey request)
@@ -419,7 +421,7 @@ namespace MediaBrowser.Api.Session
                 SeekPositionTicks = request.SeekPositionTicks
             };
 
-            var task = _sessionManager.SendPlaystateCommand(GetSession().Result.Id, request.Id, command, CancellationToken.None);
+            var task = _sessionManager.SendPlaystateCommand(GetSession(_sessionContext).Result.Id, request.Id, command, CancellationToken.None);
 
             Task.WaitAll(task);
         }
@@ -437,7 +439,7 @@ namespace MediaBrowser.Api.Session
                 ItemType = request.ItemType
             };
 
-            var task = _sessionManager.SendBrowseCommand(GetSession().Result.Id, request.Id, command, CancellationToken.None);
+            var task = _sessionManager.SendBrowseCommand(GetSession(_sessionContext).Result.Id, request.Id, command, CancellationToken.None);
 
             Task.WaitAll(task);
         }
@@ -456,7 +458,7 @@ namespace MediaBrowser.Api.Session
                 name = commandType.ToString();
             }
 
-            var currentSession = GetSession().Result;
+            var currentSession = GetSession(_sessionContext).Result;
 
             var command = new GeneralCommand
             {
@@ -482,7 +484,7 @@ namespace MediaBrowser.Api.Session
                 Text = request.Text
             };
 
-            var task = _sessionManager.SendMessageCommand(GetSession().Result.Id, request.Id, command, CancellationToken.None);
+            var task = _sessionManager.SendMessageCommand(GetSession(_sessionContext).Result.Id, request.Id, command, CancellationToken.None);
 
             Task.WaitAll(task);
         }
@@ -501,14 +503,14 @@ namespace MediaBrowser.Api.Session
                 StartPositionTicks = request.StartPositionTicks
             };
 
-            var task = _sessionManager.SendPlayCommand(GetSession().Result.Id, request.Id, command, CancellationToken.None);
+            var task = _sessionManager.SendPlayCommand(GetSession(_sessionContext).Result.Id, request.Id, command, CancellationToken.None);
 
             Task.WaitAll(task);
         }
 
         public void Post(SendGeneralCommand request)
         {
-            var currentSession = GetSession().Result;
+            var currentSession = GetSession(_sessionContext).Result;
 
             var command = new GeneralCommand
             {
@@ -523,7 +525,7 @@ namespace MediaBrowser.Api.Session
 
         public void Post(SendFullGeneralCommand request)
         {
-            var currentSession = GetSession().Result;
+            var currentSession = GetSession(_sessionContext).Result;
 
             request.ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null;
 
@@ -546,7 +548,7 @@ namespace MediaBrowser.Api.Session
         {
             if (string.IsNullOrWhiteSpace(request.Id))
             {
-                request.Id = GetSession().Result.Id;
+                request.Id = GetSession(_sessionContext).Result.Id;
             }
             _sessionManager.ReportCapabilities(request.Id, new ClientCapabilities
             {
@@ -570,7 +572,7 @@ namespace MediaBrowser.Api.Session
         {
             if (string.IsNullOrWhiteSpace(request.Id))
             {
-                request.Id = GetSession().Result.Id;
+                request.Id = GetSession(_sessionContext).Result.Id;
             }
             _sessionManager.ReportCapabilities(request.Id, request);
         }
diff --git a/MediaBrowser.Api/Social/SharingService.cs b/MediaBrowser.Api/Social/SharingService.cs
index 94b0c6390..86fe0a136 100644
--- a/MediaBrowser.Api/Social/SharingService.cs
+++ b/MediaBrowser.Api/Social/SharingService.cs
@@ -66,13 +66,15 @@ namespace MediaBrowser.Api.Social
         private readonly ILibraryManager _libraryManager;
         private readonly IDlnaManager _dlnaManager;
         private readonly IDtoService _dtoService;
+        private readonly IHttpResultFactory _resultFactory;
 
-        public SharingService(ISharingManager sharingManager, IDlnaManager dlnaManager, ILibraryManager libraryManager, IDtoService dtoService)
+        public SharingService(ISharingManager sharingManager, IDlnaManager dlnaManager, ILibraryManager libraryManager, IDtoService dtoService, IHttpResultFactory resultFactory)
         {
             _sharingManager = sharingManager;
             _dlnaManager = dlnaManager;
             _libraryManager = libraryManager;
             _dtoService = dtoService;
+            _resultFactory = resultFactory;
         }
 
         public object Get(GetSocialShareInfo request)
@@ -144,14 +146,14 @@ namespace MediaBrowser.Api.Social
             {
                 if (image.IsLocalFile)
                 {
-                    return ToStaticFileResult(image.Path);
+                    return _resultFactory.GetStaticFileResult(Request, image.Path);
                 }
 
                 try
                 {
                     // Don't fail the request over this
                     var updatedImage = await _libraryManager.ConvertImageToLocal(item, image, 0).ConfigureAwait(false);
-                    return ToStaticFileResult(updatedImage.Path);
+                    return _resultFactory.GetStaticFileResult(Request, updatedImage.Path);
                 }
                 catch
                 {
diff --git a/MediaBrowser.Api/Subtitles/SubtitleService.cs b/MediaBrowser.Api/Subtitles/SubtitleService.cs
index f7ff3d162..47d442e79 100644
--- a/MediaBrowser.Api/Subtitles/SubtitleService.cs
+++ b/MediaBrowser.Api/Subtitles/SubtitleService.cs
@@ -135,8 +135,9 @@ namespace MediaBrowser.Api.Subtitles
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IProviderManager _providerManager;
         private readonly IFileSystem _fileSystem;
+        private readonly IAuthorizationContext _authContext;
 
-        public SubtitleService(ILibraryManager libraryManager, ISubtitleManager subtitleManager, ISubtitleEncoder subtitleEncoder, IMediaSourceManager mediaSourceManager, IProviderManager providerManager, IFileSystem fileSystem)
+        public SubtitleService(ILibraryManager libraryManager, ISubtitleManager subtitleManager, ISubtitleEncoder subtitleEncoder, IMediaSourceManager mediaSourceManager, IProviderManager providerManager, IFileSystem fileSystem, IAuthorizationContext authContext)
         {
             _libraryManager = libraryManager;
             _subtitleManager = subtitleManager;
@@ -144,6 +145,7 @@ namespace MediaBrowser.Api.Subtitles
             _mediaSourceManager = mediaSourceManager;
             _providerManager = providerManager;
             _fileSystem = fileSystem;
+            _authContext = authContext;
         }
 
         public async Task<object> Get(GetSubtitlePlaylist request)
@@ -170,7 +172,7 @@ namespace MediaBrowser.Api.Subtitles
             long positionTicks = 0;
             var segmentLengthTicks = TimeSpan.FromSeconds(request.SegmentLength).Ticks;
 
-            var accessToken = AuthorizationContext.GetAuthorizationInfo(Request).Token;
+            var accessToken = _authContext.GetAuthorizationInfo(Request).Token;
 
             while (positionTicks < runtime)
             {
diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs
index 3665bea0c..e50d2b77f 100644
--- a/MediaBrowser.Api/Sync/SyncService.cs
+++ b/MediaBrowser.Api/Sync/SyncService.cs
@@ -161,13 +161,15 @@ namespace MediaBrowser.Api.Sync
         private readonly IDtoService _dtoService;
         private readonly ILibraryManager _libraryManager;
         private readonly IUserManager _userManager;
+        private readonly IAuthorizationContext _authContext;
 
-        public SyncService(ISyncManager syncManager, IDtoService dtoService, ILibraryManager libraryManager, IUserManager userManager)
+        public SyncService(ISyncManager syncManager, IDtoService dtoService, ILibraryManager libraryManager, IUserManager userManager, IAuthorizationContext authContext)
         {
             _syncManager = syncManager;
             _dtoService = dtoService;
             _libraryManager = libraryManager;
             _userManager = userManager;
+            _authContext = authContext;
         }
 
         public object Get(GetSyncTargets request)
@@ -263,7 +265,7 @@ namespace MediaBrowser.Api.Sync
             result.Targets = _syncManager.GetSyncTargets(request.UserId)
                 .ToList();
 
-            var auth = AuthorizationContext.GetAuthorizationInfo(Request);
+            var auth = _authContext.GetAuthorizationInfo(Request);
             var authenticatedUser = _userManager.GetUserById(auth.UserId);
 
             if (!string.IsNullOrWhiteSpace(request.TargetId))
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index 9ba489583..71c5e732a 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -265,6 +265,7 @@ namespace MediaBrowser.Api
         private readonly IItemRepository _itemRepo;
         private readonly IDtoService _dtoService;
         private readonly ITVSeriesManager _tvSeriesManager;
+        private readonly IAuthorizationContext _authContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TvShowsService" /> class.
@@ -272,7 +273,7 @@ namespace MediaBrowser.Api
         /// <param name="userManager">The user manager.</param>
         /// <param name="userDataManager">The user data repository.</param>
         /// <param name="libraryManager">The library manager.</param>
-        public TvShowsService(IUserManager userManager, IUserDataManager userDataManager, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, ITVSeriesManager tvSeriesManager)
+        public TvShowsService(IUserManager userManager, IUserDataManager userDataManager, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, ITVSeriesManager tvSeriesManager, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _userDataManager = userDataManager;
@@ -280,6 +281,7 @@ namespace MediaBrowser.Api
             _itemRepo = itemRepo;
             _dtoService = dtoService;
             _tvSeriesManager = tvSeriesManager;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -302,7 +304,7 @@ namespace MediaBrowser.Api
                 (!string.IsNullOrWhiteSpace(request.UserId) ? user.RootFolder :
                 _libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
@@ -334,7 +336,7 @@ namespace MediaBrowser.Api
 
             var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
 
-            var options = GetDtoOptions(request);
+            var options = GetDtoOptions(_authContext, request);
 
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
@@ -379,7 +381,7 @@ namespace MediaBrowser.Api
 
             var user = _userManager.GetUserById(request.UserId);
 
-            var options = GetDtoOptions(request);
+            var options = GetDtoOptions(_authContext, request);
 
             var returnItems = (await _dtoService.GetBaseItemDtos(result.Items, options, user).ConfigureAwait(false)).ToArray();
 
@@ -434,7 +436,7 @@ namespace MediaBrowser.Api
 
             }).ConfigureAwait(false)).Items.OfType<Season>();
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var returnItems = (await _dtoService.GetBaseItemDtos(seasons, dtoOptions, user).ConfigureAwait(false))
                 .ToArray();
@@ -526,7 +528,7 @@ namespace MediaBrowser.Api
 
             var pagedItems = ApplyPaging(returnList, request.StartIndex, request.Limit);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dtos = (await _dtoService.GetBaseItemDtos(pagedItems, dtoOptions, user).ConfigureAwait(false))
                 .ToArray();
diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
index 36a62b237..5bbd96c7c 100644
--- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
@@ -49,18 +49,6 @@ namespace MediaBrowser.Api.UserLibrary
     [Authenticated]
     public class ArtistsService : BaseItemsByNameService<MusicArtist>
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArtistsService" /> class.
-        /// </summary>
-        /// <param name="userManager">The user manager.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="userDataRepository">The user data repository.</param>
-        /// <param name="itemRepo">The item repo.</param>
-        public ArtistsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
-            : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -81,8 +69,8 @@ namespace MediaBrowser.Api.UserLibrary
         private BaseItemDto GetItem(GetArtist request)
         {
             var item = GetArtist(request.Name, LibraryManager);
-
-            var dtoOptions = GetDtoOptions(request);
+            
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
 
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
@@ -148,5 +136,9 @@ namespace MediaBrowser.Api.UserLibrary
         {
             throw new NotImplementedException();
         }
+
+        public ArtistsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext) : base(userManager, libraryManager, userDataRepository, itemRepository, dtoService, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
index 971d1a45c..ff285b605 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Model.Querying;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Services;
 
@@ -30,6 +31,7 @@ namespace MediaBrowser.Api.UserLibrary
         protected readonly IUserDataManager UserDataRepository;
         protected readonly IItemRepository ItemRepository;
         protected IDtoService DtoService { get; private set; }
+        protected IAuthorizationContext AuthorizationContext { get; private set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseItemsByNameService{TItemType}" /> class.
@@ -39,13 +41,14 @@ namespace MediaBrowser.Api.UserLibrary
         /// <param name="userDataRepository">The user data repository.</param>
         /// <param name="itemRepository">The item repository.</param>
         /// <param name="dtoService">The dto service.</param>
-        protected BaseItemsByNameService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService)
+        protected BaseItemsByNameService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext)
         {
             UserManager = userManager;
             LibraryManager = libraryManager;
             UserDataRepository = userDataRepository;
             ItemRepository = itemRepository;
             DtoService = dtoService;
+            AuthorizationContext = authorizationContext;
         }
 
         protected BaseItem GetParentItem(GetItemsByName request)
@@ -86,7 +89,7 @@ namespace MediaBrowser.Api.UserLibrary
 
         protected ItemsResult GetResultSlim(GetItemsByName request)
         {
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
 
             User user = null;
             BaseItem parentItem;
@@ -223,7 +226,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// <returns>Task{ItemsResult}.</returns>
         protected ItemsResult GetResult(GetItemsByName request)
         {
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
 
             User user = null;
             BaseItem parentItem;
diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
index 809df2531..2eef1ab2f 100644
--- a/MediaBrowser.Api/UserLibrary/GameGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
@@ -37,11 +37,6 @@ namespace MediaBrowser.Api.UserLibrary
     [Authenticated]
     public class GameGenresService : BaseItemsByNameService<GameGenre>
     {
-        public GameGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
-            : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -63,8 +58,8 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetGameGenre(request.Name, LibraryManager);
 
-            var dtoOptions = GetDtoOptions(request);
-
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
+            
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
                 var user = UserManager.GetUserById(request.UserId);
@@ -102,5 +97,9 @@ namespace MediaBrowser.Api.UserLibrary
         {
             throw new NotImplementedException();
         }
+
+        public GameGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext) : base(userManager, libraryManager, userDataRepository, itemRepository, dtoService, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
index 25447f832..664efac14 100644
--- a/MediaBrowser.Api/UserLibrary/GenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GenresService.cs
@@ -47,11 +47,6 @@ namespace MediaBrowser.Api.UserLibrary
     [Authenticated]
     public class GenresService : BaseItemsByNameService<Genre>
     {
-        public GenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
-            : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -72,8 +67,8 @@ namespace MediaBrowser.Api.UserLibrary
         private BaseItemDto GetItem(GetGenre request)
         {
             var item = GetGenre(request.Name, LibraryManager);
-
-            var dtoOptions = GetDtoOptions(request);
+            
+            var dtoOptions = GetDtoOptions(AuthorizationContext ,request);
 
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
@@ -124,5 +119,9 @@ namespace MediaBrowser.Api.UserLibrary
         {
             throw new NotImplementedException();
         }
+
+        public GenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext) : base(userManager, libraryManager, userDataRepository, itemRepository, dtoService, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index d75e42850..a07128f74 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -41,6 +41,7 @@ namespace MediaBrowser.Api.UserLibrary
         private readonly ILocalizationManager _localization;
 
         private readonly IDtoService _dtoService;
+        private readonly IAuthorizationContext _authContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemsService" /> class.
@@ -49,7 +50,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="localization">The localization.</param>
         /// <param name="dtoService">The dto service.</param>
-        public ItemsService(IUserManager userManager, ILibraryManager libraryManager, ILocalizationManager localization, IDtoService dtoService)
+        public ItemsService(IUserManager userManager, ILibraryManager libraryManager, ILocalizationManager localization, IDtoService dtoService, IAuthorizationContext authContext)
         {
             if (userManager == null)
             {
@@ -72,6 +73,7 @@ namespace MediaBrowser.Api.UserLibrary
             _libraryManager = libraryManager;
             _localization = localization;
             _dtoService = dtoService;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -100,7 +102,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var user = !string.IsNullOrWhiteSpace(request.UserId) ? _userManager.GetUserById(request.UserId) : null;
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var result = await GetQueryResult(request, dtoOptions, user).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
index 0d1f9e325..305c136df 100644
--- a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
@@ -38,11 +38,6 @@ namespace MediaBrowser.Api.UserLibrary
     [Authenticated]
     public class MusicGenresService : BaseItemsByNameService<MusicGenre>
     {
-        public MusicGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
-            : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -63,8 +58,8 @@ namespace MediaBrowser.Api.UserLibrary
         private BaseItemDto GetItem(GetMusicGenre request)
         {
             var item = GetMusicGenre(request.Name, LibraryManager);
-
-            var dtoOptions = GetDtoOptions(request);
+            
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
 
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
@@ -103,5 +98,9 @@ namespace MediaBrowser.Api.UserLibrary
         {
             throw new NotImplementedException();
         }
+
+        public MusicGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext) : base(userManager, libraryManager, userDataRepository, itemRepository, dtoService, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs
index 1979bcd67..dbce22578 100644
--- a/MediaBrowser.Api/UserLibrary/PersonsService.cs
+++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs
@@ -45,18 +45,6 @@ namespace MediaBrowser.Api.UserLibrary
     [Authenticated]
     public class PersonsService : BaseItemsByNameService<Person>
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonsService" /> class.
-        /// </summary>
-        /// <param name="userManager">The user manager.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="userDataRepository">The user data repository.</param>
-        /// <param name="itemRepo">The item repo.</param>
-        public PersonsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
-            : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -77,8 +65,8 @@ namespace MediaBrowser.Api.UserLibrary
         private BaseItemDto GetItem(GetPerson request)
         {
             var item = GetPerson(request.Name, LibraryManager);
-
-            var dtoOptions = GetDtoOptions(request);
+            
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
 
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
@@ -155,5 +143,9 @@ namespace MediaBrowser.Api.UserLibrary
 
             return allPeople.Where(i => allIds.Contains(i.ItemId)).OrderBy(p => p.SortOrder ?? int.MaxValue).ThenBy(p => p.Type);
         }
+
+        public PersonsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext) : base(userManager, libraryManager, userDataRepository, itemRepository, dtoService, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/PlaystateService.cs b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
index aafc0b125..5fe6c1771 100644
--- a/MediaBrowser.Api/UserLibrary/PlaystateService.cs
+++ b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
@@ -234,13 +234,17 @@ namespace MediaBrowser.Api.UserLibrary
         private readonly IUserDataManager _userDataRepository;
         private readonly ILibraryManager _libraryManager;
         private readonly ISessionManager _sessionManager;
+        private readonly ISessionContext _sessionContext;
+        private readonly IAuthorizationContext _authContext;
 
-        public PlaystateService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, ISessionManager sessionManager)
+        public PlaystateService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, ISessionManager sessionManager, ISessionContext sessionContext, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _userDataRepository = userDataRepository;
             _libraryManager = libraryManager;
             _sessionManager = sessionManager;
+            _sessionContext = sessionContext;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -265,7 +269,7 @@ namespace MediaBrowser.Api.UserLibrary
                 datePlayed = DateTime.ParseExact(request.DatePlayed, "yyyyMMddHHmmss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
             }
 
-            var session = await GetSession().ConfigureAwait(false);
+            var session = await GetSession(_sessionContext).ConfigureAwait(false);
 
             var dto = await UpdatePlayedStatus(user, request.Id, true, datePlayed).ConfigureAwait(false);
 
@@ -303,7 +307,7 @@ namespace MediaBrowser.Api.UserLibrary
 
         public void Post(ReportPlaybackStart request)
         {
-            request.SessionId = GetSession().Result.Id;
+            request.SessionId = GetSession(_sessionContext).Result.Id;
 
             var task = _sessionManager.OnPlaybackStart(request);
 
@@ -335,7 +339,7 @@ namespace MediaBrowser.Api.UserLibrary
 
         public void Post(ReportPlaybackProgress request)
         {
-            request.SessionId = GetSession().Result.Id;
+            request.SessionId = GetSession(_sessionContext).Result.Id;
 
             var task = _sessionManager.OnPlaybackProgress(request);
 
@@ -369,10 +373,10 @@ namespace MediaBrowser.Api.UserLibrary
 
             if (!string.IsNullOrWhiteSpace(request.PlaySessionId))
             {
-                ApiEntryPoint.Instance.KillTranscodingJobs(AuthorizationContext.GetAuthorizationInfo(Request).DeviceId, request.PlaySessionId, s => true);
+                ApiEntryPoint.Instance.KillTranscodingJobs(_authContext.GetAuthorizationInfo(Request).DeviceId, request.PlaySessionId, s => true);
             }
 
-            request.SessionId = GetSession().Result.Id;
+            request.SessionId = GetSession(_sessionContext).Result.Id;
 
             var task = _sessionManager.OnPlaybackStopped(request);
 
@@ -394,7 +398,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var user = _userManager.GetUserById(request.UserId);
 
-            var session = await GetSession().ConfigureAwait(false);
+            var session = await GetSession(_sessionContext).ConfigureAwait(false);
 
             var dto = await UpdatePlayedStatus(user, request.Id, false, null).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs
index d63fd8b16..f4debcf48 100644
--- a/MediaBrowser.Api/UserLibrary/StudiosService.cs
+++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs
@@ -47,11 +47,6 @@ namespace MediaBrowser.Api.UserLibrary
     [Authenticated]
     public class StudiosService : BaseItemsByNameService<Studio>
     {
-        public StudiosService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
-            : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -73,8 +68,8 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetStudio(request.Name, LibraryManager);
 
-            var dtoOptions = GetDtoOptions(request);
-
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
+            
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
                 var user = UserManager.GetUserById(request.UserId);
@@ -117,5 +112,9 @@ namespace MediaBrowser.Api.UserLibrary
                 .DistinctNames()
                 .Select(name => LibraryManager.GetStudio(name));
         }
+
+        public StudiosService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext) : base(userManager, libraryManager, userDataRepository, itemRepository, dtoService, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index fbc2c0ccd..4121cc295 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -270,8 +270,9 @@ namespace MediaBrowser.Api.UserLibrary
         private readonly IDtoService _dtoService;
         private readonly IUserViewManager _userViewManager;
         private readonly IFileSystem _fileSystem;
+        private readonly IAuthorizationContext _authContext;
 
-        public UserLibraryService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IDtoService dtoService, IUserViewManager userViewManager, IFileSystem fileSystem)
+        public UserLibraryService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IDtoService dtoService, IUserViewManager userViewManager, IFileSystem fileSystem, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _libraryManager = libraryManager;
@@ -279,6 +280,7 @@ namespace MediaBrowser.Api.UserLibrary
             _dtoService = dtoService;
             _userViewManager = userViewManager;
             _fileSystem = fileSystem;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -315,7 +317,7 @@ namespace MediaBrowser.Api.UserLibrary
                 UserId = request.UserId
             });
 
-            var options = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dtos = list.Select(i =>
             {
@@ -328,7 +330,7 @@ namespace MediaBrowser.Api.UserLibrary
                     childCount = i.Item2.Count;
                 }
 
-                var dto = _dtoService.GetBaseItemDto(item, options, user);
+                var dto = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
                 dto.ChildCount = childCount;
 
@@ -351,7 +353,7 @@ namespace MediaBrowser.Api.UserLibrary
             // Get them from the child tree
             if (series != null)
             {
-                var dtoOptions = GetDtoOptions(request);
+                var dtoOptions = GetDtoOptions(_authContext, request);
 
                 // Avoid implicitly captured closure
                 var currentUser = user;
@@ -382,7 +384,7 @@ namespace MediaBrowser.Api.UserLibrary
             // Get them from the db
             if (movie != null)
             {
-                var dtoOptions = GetDtoOptions(request);
+                var dtoOptions = GetDtoOptions(_authContext, request);
 
                 var dtos = movie.SpecialFeatureIds
                     .Select(_libraryManager.GetItemById)
@@ -421,7 +423,7 @@ namespace MediaBrowser.Api.UserLibrary
                 trailerIds = hasTrailers.GetTrailerIds();
             }
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dtos = trailerIds
                 .Select(_libraryManager.GetItemById)
@@ -443,7 +445,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             await RefreshItemOnDemandIfNeeded(item).ConfigureAwait(false);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var result = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
@@ -482,7 +484,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var item = user.RootFolder;
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var result = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
@@ -502,7 +504,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var items = await _libraryManager.GetIntros(item, user).ConfigureAwait(false);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var dtos = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
                 .ToArray();
diff --git a/MediaBrowser.Api/UserLibrary/UserViewsService.cs b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
index 51783065c..6210b8b05 100644
--- a/MediaBrowser.Api/UserLibrary/UserViewsService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.UserLibrary
@@ -57,12 +58,14 @@ namespace MediaBrowser.Api.UserLibrary
         private readonly IUserManager _userManager;
         private readonly IUserViewManager _userViewManager;
         private readonly IDtoService _dtoService;
+        private readonly IAuthorizationContext _authContext;
 
-        public UserViewsService(IUserManager userManager, IUserViewManager userViewManager, IDtoService dtoService)
+        public UserViewsService(IUserManager userManager, IUserViewManager userViewManager, IDtoService dtoService, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _userViewManager = userViewManager;
             _dtoService = dtoService;
+            _authContext = authContext;
         }
 
         public async Task<object> Get(GetUserViews request)
@@ -82,7 +85,7 @@ namespace MediaBrowser.Api.UserLibrary
                 query.PresetViews = request.PresetViews.Split(',');
             }
 
-            var app = AuthorizationContext.GetAuthorizationInfo(Request).Client ?? string.Empty;
+            var app = _authContext.GetAuthorizationInfo(Request).Client ?? string.Empty;
             if (app.IndexOf("emby rt", StringComparison.OrdinalIgnoreCase) != -1)
             {
                 query.PresetViews = new[] { CollectionType.Music, CollectionType.Movies, CollectionType.TvShows };
@@ -91,7 +94,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var folders = await _userViewManager.GetUserViews(query, CancellationToken.None).ConfigureAwait(false);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
             dtoOptions.Fields = new List<ItemFields>();
             dtoOptions.Fields.Add(ItemFields.PrimaryImageAspectRatio);
             dtoOptions.Fields.Add(ItemFields.DisplayPreferencesId);
diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs
index 2d2ca523d..1059b72cb 100644
--- a/MediaBrowser.Api/UserLibrary/YearsService.cs
+++ b/MediaBrowser.Api/UserLibrary/YearsService.cs
@@ -45,11 +45,6 @@ namespace MediaBrowser.Api.UserLibrary
     [Authenticated]
     public class YearsService : BaseItemsByNameService<Year>
     {
-        public YearsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
-            : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService)
-        {
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -70,8 +65,8 @@ namespace MediaBrowser.Api.UserLibrary
         private BaseItemDto GetItem(GetYear request)
         {
             var item = LibraryManager.GetYear(request.Year);
-
-            var dtoOptions = GetDtoOptions(request);
+            
+            var dtoOptions = GetDtoOptions(AuthorizationContext, request);
 
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
@@ -111,5 +106,9 @@ namespace MediaBrowser.Api.UserLibrary
                 .Distinct()
                 .Select(year => LibraryManager.GetYear(year));
         }
+
+        public YearsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepository, IDtoService dtoService, IAuthorizationContext authorizationContext) : base(userManager, libraryManager, userDataRepository, itemRepository, dtoService, authorizationContext)
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index f87cad0ff..96c7fc111 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -246,7 +246,7 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class UsersService
     /// </summary>
-    public class UserService : BaseApiService, IHasAuthorization
+    public class UserService : BaseApiService
     {
         /// <summary>
         /// The _user manager
@@ -256,14 +256,16 @@ namespace MediaBrowser.Api
         private readonly IServerConfigurationManager _config;
         private readonly INetworkManager _networkManager;
         private readonly IDeviceManager _deviceManager;
+        private readonly IAuthorizationContext _authContext;
 
-        public UserService(IUserManager userManager, ISessionManager sessionMananger, IServerConfigurationManager config, INetworkManager networkManager, IDeviceManager deviceManager)
+        public UserService(IUserManager userManager, ISessionManager sessionMananger, IServerConfigurationManager config, INetworkManager networkManager, IDeviceManager deviceManager, IAuthorizationContext authContext)
         {
             _userManager = userManager;
             _sessionMananger = sessionMananger;
             _config = config;
             _networkManager = networkManager;
             _deviceManager = deviceManager;
+            _authContext = authContext;
         }
 
         public object Get(GetPublicUsers request)
@@ -316,7 +318,7 @@ namespace MediaBrowser.Api
 
             if (filterByDevice)
             {
-                var deviceId = AuthorizationContext.GetAuthorizationInfo(Request).DeviceId;
+                var deviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
 
                 if (!string.IsNullOrWhiteSpace(deviceId))
                 {
@@ -412,7 +414,7 @@ namespace MediaBrowser.Api
 
         public async Task<object> Post(AuthenticateUserByName request)
         {
-            var auth = AuthorizationContext.GetAuthorizationInfo(Request);
+            var auth = _authContext.GetAuthorizationInfo(Request);
 
             var result = await _sessionMananger.AuthenticateNewSession(new AuthenticationRequest
             {
@@ -442,7 +444,7 @@ namespace MediaBrowser.Api
 
         public async Task PostAsync(UpdateUserPassword request)
         {
-            AssertCanUpdateUser(_userManager, request.Id);
+            AssertCanUpdateUser(_authContext, _userManager, request.Id);
 
             var user = _userManager.GetUserById(request.Id);
 
@@ -466,7 +468,7 @@ namespace MediaBrowser.Api
 
                 await _userManager.ChangePassword(user, request.NewPassword).ConfigureAwait(false);
 
-                var currentToken = AuthorizationContext.GetAuthorizationInfo(Request).Token;
+                var currentToken = _authContext.GetAuthorizationInfo(Request).Token;
 
                 await _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), currentToken).ConfigureAwait(false);
             }
@@ -480,7 +482,7 @@ namespace MediaBrowser.Api
         
         public async Task PostAsync(UpdateUserEasyPassword request)
         {
-            AssertCanUpdateUser(_userManager, request.Id);
+            AssertCanUpdateUser(_authContext, _userManager, request.Id);
             
             var user = _userManager.GetUserById(request.Id);
 
@@ -516,7 +518,7 @@ namespace MediaBrowser.Api
             // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
             var id = GetPathValue(1);
 
-            AssertCanUpdateUser(_userManager, id);
+            AssertCanUpdateUser(_authContext, _userManager, id);
 
             var dtoUser = request;
 
@@ -566,7 +568,7 @@ namespace MediaBrowser.Api
 
         public void Post(UpdateUserConfiguration request)
         {
-            AssertCanUpdateUser(_userManager, request.Id);
+            AssertCanUpdateUser(_authContext, _userManager, request.Id);
 
             var task = _userManager.UpdateConfiguration(request.Id, request);
 
@@ -606,7 +608,7 @@ namespace MediaBrowser.Api
                     throw new ArgumentException("There must be at least one enabled user in the system.");
                 }
 
-                var currentToken = AuthorizationContext.GetAuthorizationInfo(Request).Token;
+                var currentToken = _authContext.GetAuthorizationInfo(Request).Token;
                 await _sessionMananger.RevokeUserTokens(user.Id.ToString("N"), currentToken).ConfigureAwait(false);
             }
 
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index a1aec667e..f7b83f23b 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -56,8 +56,9 @@ namespace MediaBrowser.Api
         private readonly IFileSystem _fileSystem;
         private readonly IItemRepository _itemRepo;
         private readonly IServerConfigurationManager _config;
+        private readonly IAuthorizationContext _authContext;
 
-        public VideosService(ILibraryManager libraryManager, IUserManager userManager, IDtoService dtoService, IItemRepository itemRepo, IFileSystem fileSystem, IServerConfigurationManager config)
+        public VideosService(ILibraryManager libraryManager, IUserManager userManager, IDtoService dtoService, IItemRepository itemRepo, IFileSystem fileSystem, IServerConfigurationManager config, IAuthorizationContext authContext)
         {
             _libraryManager = libraryManager;
             _userManager = userManager;
@@ -65,6 +66,7 @@ namespace MediaBrowser.Api
             _itemRepo = itemRepo;
             _fileSystem = fileSystem;
             _config = config;
+            _authContext = authContext;
         }
 
         /// <summary>
@@ -82,7 +84,7 @@ namespace MediaBrowser.Api
                                   : _libraryManager.RootFolder)
                            : _libraryManager.GetItemById(request.Id);
 
-            var dtoOptions = GetDtoOptions(request);
+            var dtoOptions = GetDtoOptions(_authContext, request);
 
             var video = item as Video;
             BaseItemDto[] items;
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 6801a4639..518daa6d7 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -193,9 +193,7 @@
     <Compile Include="Net\AuthorizationInfo.cs" />
     <Compile Include="Net\IAuthorizationContext.cs" />
     <Compile Include="Net\IAuthService.cs" />
-    <Compile Include="Net\IHasAuthorization.cs" />
     <Compile Include="Net\IHasResultFactory.cs" />
-    <Compile Include="Net\IHasSession.cs" />
     <Compile Include="Net\IHttpResultFactory.cs" />
     <Compile Include="Net\IHttpServer.cs" />
     <Compile Include="Net\IServerManager.cs" />
diff --git a/MediaBrowser.Controller/Net/IHasAuthorization.cs b/MediaBrowser.Controller/Net/IHasAuthorization.cs
deleted file mode 100644
index 6fc70159d..000000000
--- a/MediaBrowser.Controller/Net/IHasAuthorization.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-namespace MediaBrowser.Controller.Net
-{
-    public interface IHasAuthorization
-    {
-        /// <summary>
-        /// Gets or sets the authorization context.
-        /// </summary>
-        /// <value>The authorization context.</value>
-        IAuthorizationContext AuthorizationContext { get; set; }
-    }
-}
diff --git a/MediaBrowser.Controller/Net/IHasSession.cs b/MediaBrowser.Controller/Net/IHasSession.cs
deleted file mode 100644
index e762c1e84..000000000
--- a/MediaBrowser.Controller/Net/IHasSession.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-namespace MediaBrowser.Controller.Net
-{
-    public interface IHasSession
-    {
-        /// <summary>
-        /// Gets or sets the session context.
-        /// </summary>
-        /// <value>The session context.</value>
-        ISessionContext SessionContext { get; set; }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 0d7a7912a..bae367d82 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -1218,6 +1218,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         public string EscapeSubtitleFilterPath(string path)
         {
+            // https://ffmpeg.org/ffmpeg-filters.html#Notes-on-filtergraph-escaping
+            // We need to double escape
+
+            var escapeChars = new[] {':', '\'', ','};
+
             return path.Replace('\\', '/').Replace(":/", "\\:/").Replace("'", "'\\\\\\''");
         }
 
diff --git a/MediaBrowser.Model/Serialization/IXmlSerializer.cs b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
index eb23d784f..b26b673f3 100644
--- a/MediaBrowser.Model/Serialization/IXmlSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Model.Serialization
         /// <param name="file">The file.</param>
         /// <returns>System.Object.</returns>
         object DeserializeFromFile(Type type, string file);
-
+        
         /// <summary>
         /// Deserializes from bytes.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs b/MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs
deleted file mode 100644
index 235b62f69..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/ContainerAdapter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using MediaBrowser.Common;
-using ServiceStack.Configuration;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    /// <summary>
-    /// Class ContainerAdapter
-    /// </summary>
-    class ContainerAdapter : IContainerAdapter
-    {
-        /// <summary>
-        /// The _app host
-        /// </summary>
-        private readonly IApplicationHost _appHost;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContainerAdapter" /> class.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public ContainerAdapter(IApplicationHost appHost)
-        {
-            _appHost = appHost;
-        }
-        /// <summary>
-        /// Resolves this instance.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns>``0.</returns>
-        public T Resolve<T>()
-        {
-            return _appHost.Resolve<T>();
-        }
-
-        /// <summary>
-        /// Tries the resolve.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns>``0.</returns>
-        public T TryResolve<T>()
-        {
-            return _appHost.TryResolve<T>();
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 5d9d05034..d86e4da37 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -1,13 +1,10 @@
-using Funq;
-using MediaBrowser.Common;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Implementations.HttpServer.SocketSharp;
 using ServiceStack;
 using ServiceStack.Host;
-using ServiceStack.Host.Handlers;
 using ServiceStack.Web;
 using System;
 using System.Collections.Generic;
@@ -17,7 +14,6 @@ using System.Net.Security;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
-using System.Threading;
 using System.Threading.Tasks;
 using Emby.Common.Implementations.Net;
 using Emby.Server.Implementations.HttpServer;
@@ -29,6 +25,7 @@ using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Text;
 using SocketHttpListener.Net;
@@ -47,8 +44,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private IHttpListener _listener;
 
-        private readonly ContainerAdapter _containerAdapter;
-
         public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
         public event EventHandler<WebSocketConnectingEventArgs> WebSocketConnecting;
 
@@ -64,11 +59,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         private readonly ISocketFactory _socketFactory;
         private readonly ICryptoProvider _cryptoProvider;
 
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly IXmlSerializer _xmlSerializer;
+
         public HttpListenerHost(IServerApplicationHost applicationHost,
             ILogManager logManager,
             IServerConfigurationManager config,
             string serviceName,
-            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider)
+            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer)
             : base(serviceName, new Assembly[] { })
         {
             _appHost = applicationHost;
@@ -78,11 +76,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             _textEncoding = textEncoding;
             _socketFactory = socketFactory;
             _cryptoProvider = cryptoProvider;
+            _jsonSerializer = jsonSerializer;
+            _xmlSerializer = xmlSerializer;
             _config = config;
 
             _logger = logManager.GetLogger("HttpServer");
-
-            _containerAdapter = new ContainerAdapter(applicationHost);
         }
 
         public string GlobalResponse { get; set; }
@@ -106,19 +104,13 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 {typeof (NotSupportedException), 500}
             };
 
-            // The Markdown feature causes slow startup times (5 mins+) on cold boots for some users
-            // Custom format allows images
-            HostConfig.Instance.EnableFeatures = Feature.Html | Feature.Json | Feature.Xml | Feature.CustomFormat;
-
-            Container.Adapter = _containerAdapter;
-
             var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
             foreach (var filter in requestFilters)
             {
-                HostContext.GlobalRequestFilters.Add(filter.Filter);
+                GlobalRequestFilters.Add(filter.Filter);
             }
 
-            HostContext.GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
+            GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
         }
 
         protected override ILogger Logger
@@ -129,6 +121,21 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             }
         }
 
+        public override T Resolve<T>()
+        {
+            return _appHost.Resolve<T>();
+        }
+
+        public override T TryResolve<T>()
+        {
+            return _appHost.TryResolve<T>();
+        }
+
+        public override object CreateInstance(Type type)
+        {
+            return _appHost.CreateInstance(type);
+        }
+
         public override void OnConfigLoad()
         {
             base.OnConfigLoad();
@@ -241,6 +248,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         {
             try
             {
+                _logger.ErrorException("Error processing request", ex);
+
                 var httpRes = httpReq.Response;
 
                 if (httpRes.IsClosed)
@@ -248,39 +257,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                     return;
                 }
 
-                var errorResponse = new ErrorResponse
-                {
-                    ResponseStatus = new ResponseStatus
-                    {
-                        ErrorCode = ex.GetType().GetOperationName(),
-                        Message = ex.Message,
-                        StackTrace = ex.StackTrace
-                    }
-                };
-
-                var contentType = httpReq.ResponseContentType;
-
-                var serializer = ContentTypes.Instance.GetResponseSerializer(contentType);
-                if (serializer == null)
-                {
-                    contentType = HostContext.Config.DefaultContentType;
-                    serializer = ContentTypes.Instance.GetResponseSerializer(contentType);
-                }
-
-                var httpError = ex as IHttpError;
-                if (httpError != null)
-                {
-                    httpRes.StatusCode = httpError.Status;
-                    httpRes.StatusDescription = httpError.StatusDescription;
-                }
-                else
-                {
-                    httpRes.StatusCode = 500;
-                }
-
-                httpRes.ContentType = contentType;
+                httpRes.StatusCode = 500;
 
-                serializer(httpReq, errorResponse, httpRes);
+                httpRes.ContentType = "text/html";
+                httpRes.Write(ex.Message);
 
                 httpRes.Close();
             }
@@ -571,7 +551,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         public static void RedirectToUrl(IResponse httpRes, string url)
         {
             httpRes.StatusCode = 302;
-            httpRes.AddHeader(HttpHeaders.Location, url);
+            httpRes.AddHeader("Location", url);
         }
 
 
@@ -622,6 +602,26 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return routes.ToArray();
         }
 
+        public override void SerializeToJson(object o, Stream stream)
+        {
+            _jsonSerializer.SerializeToStream(o, stream);
+        }
+
+        public override void SerializeToXml(object o, Stream stream)
+        {
+            _xmlSerializer.SerializeToStream(o, stream);
+        }
+
+        public override object DeserializeXml(Type type, Stream stream)
+        {
+            return _xmlSerializer.DeserializeFromStream(type, stream);
+        }
+
+        public override object DeserializeJson(Type type, Stream stream)
+        {
+            return _jsonSerializer.DeserializeFromStream(stream, type);
+        }
+
         private string NormalizeEmbyRoutePath(string path)
         {
             if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 4c251ba24..b013a0952 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -6,13 +6,17 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.IO.Compression;
 using System.Net;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using System.Xml;
 using Emby.Server.Implementations.HttpServer;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 using ServiceStack;
+using ServiceStack.Host;
 using IRequest = MediaBrowser.Model.Services.IRequest;
 using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
 using StreamWriter = Emby.Server.Implementations.HttpServer.StreamWriter;
@@ -30,6 +34,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
         private readonly IJsonSerializer _jsonSerializer;
+        private readonly IXmlSerializer _xmlSerializer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpResultFactory" /> class.
@@ -37,10 +42,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// <param name="logManager">The log manager.</param>
         /// <param name="fileSystem">The file system.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
-        public HttpResultFactory(ILogManager logManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer)
+        public HttpResultFactory(ILogManager logManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer)
         {
             _fileSystem = fileSystem;
             _jsonSerializer = jsonSerializer;
+            _xmlSerializer = xmlSerializer;
             _logger = logManager.GetLogger("HttpResultFactory");
         }
 
@@ -130,7 +136,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 throw new ArgumentNullException("result");
             }
 
-            var optimizedResult = requestContext.ToOptimizedResult(result);
+            var optimizedResult = ToOptimizedResult(requestContext, result);
 
             if (responseHeaders == null)
             {
@@ -152,7 +158,99 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             return optimizedResult;
         }
-        
+
+        public static string GetCompressionType(IRequest request)
+        {
+            var prefs = new RequestPreferences(request);
+
+            if (prefs.AcceptsDeflate)
+                return "deflate";
+
+            if (prefs.AcceptsGzip)
+                return "gzip";
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the optimized result for the IRequestContext. 
+        /// Does not use or store results in any cache.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public object ToOptimizedResult<T>(IRequest request, T dto)
+        {
+            request.Response.Dto = dto;
+
+            var compressionType = GetCompressionType(request);
+            if (compressionType == null)
+            {
+                var contentType = request.ResponseContentType;
+                var contentTypeAttr = ContentFormat.GetEndpointAttributes(contentType);
+
+                switch (contentTypeAttr)
+                {
+                    case RequestAttributes.Xml:
+                        return SerializeToXmlString(dto);
+
+                    case RequestAttributes.Json:
+                        return _jsonSerializer.SerializeToString(dto);
+                }
+            }
+
+            using (var ms = new MemoryStream())
+            {
+                using (var compressionStream = GetCompressionStream(ms, compressionType))
+                {
+                    ContentTypes.Instance.SerializeToStream(request, dto, compressionStream);
+                    compressionStream.Close();
+
+                    var compressedBytes = ms.ToArray();
+
+                    var httpResult = new HttpResult(compressedBytes, request.ResponseContentType)
+                    {
+                        Status = request.Response.StatusCode
+                    };
+
+                    httpResult.Headers["Content-Length"] = compressedBytes.Length.ToString(UsCulture);
+                    httpResult.Headers["Content-Encoding"] = compressionType;
+
+                    return httpResult;
+                }
+            }
+        }
+
+        public static string SerializeToXmlString(object from)
+        {
+            using (var ms = new MemoryStream())
+            {
+                var xwSettings = new XmlWriterSettings();
+                xwSettings.Encoding = new UTF8Encoding(false);
+                xwSettings.OmitXmlDeclaration = false;
+
+                using (var xw = XmlWriter.Create(ms, xwSettings))
+                {
+                    var serializer = new DataContractSerializer(from.GetType());
+                    serializer.WriteObject(xw, from);
+                    xw.Flush();
+                    ms.Seek(0, SeekOrigin.Begin);
+                    var reader = new StreamReader(ms);
+                    return reader.ReadToEnd();
+                }
+            }
+        }
+
+        private static Stream GetCompressionStream(Stream outputStream, string compressionType)
+        {
+            if (compressionType == "deflate")
+                return new DeflateStream(outputStream, CompressionMode.Compress);
+            if (compressionType == "gzip")
+                return new GZipStream(outputStream, CompressionMode.Compress);
+
+            throw new NotSupportedException(compressionType);
+        }
+
         /// <summary>
         /// Gets the optimized result using cache.
         /// </summary>
@@ -471,7 +569,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             var contentType = options.ContentType;
             var responseHeaders = options.ResponseHeaders;
 
-            var requestedCompressionType = requestContext.GetCompressionType();
+            var requestedCompressionType = GetCompressionType(requestContext);
 
             if (!compress || string.IsNullOrEmpty(requestedCompressionType))
             {
@@ -513,16 +611,64 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 }
             }
 
-            var contents = content.Compress(requestedCompressionType);
+            var contents = Compress(content, requestedCompressionType);
 
             responseHeaders["Content-Length"] = contents.Length.ToString(UsCulture);
+            responseHeaders["Content-Encoding"] = requestedCompressionType;
 
             if (isHeadRequest)
             {
                 return GetHttpResult(new byte[] { }, contentType);
             }
 
-            return new CompressedResult(contents, requestedCompressionType, contentType);
+            return GetHttpResult(contents, contentType, responseHeaders);
+        }
+
+        public static byte[] Compress(string text, string compressionType)
+        {
+            if (compressionType == "deflate")
+                return Deflate(text);
+
+            if (compressionType == "gzip")
+                return GZip(text);
+
+            throw new NotSupportedException(compressionType);
+        }
+
+        public static byte[] Deflate(string text)
+        {
+            return Deflate(Encoding.UTF8.GetBytes(text));
+        }
+
+        public static byte[] Deflate(byte[] bytes)
+        {
+            // In .NET FX incompat-ville, you can't access compressed bytes without closing DeflateStream
+            // Which means we must use MemoryStream since you have to use ToArray() on a closed Stream
+            using (var ms = new MemoryStream())
+            using (var zipStream = new DeflateStream(ms, CompressionMode.Compress))
+            {
+                zipStream.Write(bytes, 0, bytes.Length);
+                zipStream.Close();
+
+                return ms.ToArray();
+            }
+        }
+
+        public static byte[] GZip(string text)
+        {
+            return GZip(Encoding.UTF8.GetBytes(text));
+        }
+
+        public static byte[] GZip(byte[] buffer)
+        {
+            using (var ms = new MemoryStream())
+            using (var zipStream = new GZipStream(ms, CompressionMode.Compress))
+            {
+                zipStream.Write(buffer, 0, buffer.Length);
+                zipStream.Close();
+
+                return ms.ToArray();
+            }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
index 5da515900..abcf84abd 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
@@ -6,6 +6,7 @@ using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Text;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
@@ -28,9 +29,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             string defaultRedirectpath,
             ITextEncoding textEncoding,
             ISocketFactory socketFactory,
-            ICryptoProvider cryptoProvider)
+            ICryptoProvider cryptoProvider,
+            IJsonSerializer json,
+            IXmlSerializer xml)
         {
-            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider, textEncoding, socketFactory, cryptoProvider);
+            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider, textEncoding, socketFactory, cryptoProvider, json, xml);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
index 6f44fcce7..95b2ccaba 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Emby.Server.Implementations.HttpServer.SocketSharp;
-using Funq;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Services;
@@ -19,7 +18,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 {
     public partial class WebSocketSharpRequest : IHttpRequest
     {
-        public Container Container { get; set; }
         private readonly HttpListenerRequest request;
         private readonly IHttpResponse response;
         private readonly IMemoryStreamFactory _memoryStreamProvider;
@@ -239,6 +237,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             }
         }
 
+        public const string FormUrlEncoded = "application/x-www-form-urlencoded";
+        public const string MultiPartFormData = "multipart/form-data";
         private static string GetResponseContentType(IRequest httpReq)
         {
             var specifiedContentType = GetQueryStringContentType(httpReq);
@@ -246,7 +246,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
             var acceptContentTypes = httpReq.AcceptTypes;
             var defaultContentType = httpReq.ContentType;
-            if (httpReq.HasAnyOfContentTypes(MimeTypes.FormUrlEncoded, MimeTypes.MultiPartFormData))
+            if (HasAnyOfContentTypes(httpReq, FormUrlEncoded, MultiPartFormData))
             {
                 defaultContentType = HostContext.Config.DefaultContentType;
             }
@@ -299,15 +299,32 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
                 }
             }
 
-            if (acceptContentTypes == null && httpReq.ContentType == MimeTypes.Soap11)
+            if (acceptContentTypes == null && httpReq.ContentType == Soap11)
             {
-                return MimeTypes.Soap11;
+                return Soap11;
             }
 
             //We could also send a '406 Not Acceptable', but this is allowed also
             return HostContext.Config.DefaultContentType;
         }
+        public const string Soap11 = "text/xml; charset=utf-8";
 
+        public static bool HasAnyOfContentTypes(IRequest request, params string[] contentTypes)
+        {
+            if (contentTypes == null || request.ContentType == null) return false;
+            foreach (var contentType in contentTypes)
+            {
+                if (IsContentType(request, contentType)) return true;
+            }
+            return false;
+        }
+
+        public static bool IsContentType(IRequest request, string contentType)
+        {
+            return request.ContentType.StartsWith(contentType, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public const string Xml = "application/xml";
         private static string GetQueryStringContentType(IRequest httpReq)
         {
             var format = httpReq.QueryString["format"];
@@ -323,7 +340,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
             format = format.LeftPart('.').ToLower();
             if (format.Contains("json")) return "application/json";
-            if (format.Contains("xml")) return MimeTypes.Xml;
+            if (format.Contains("xml")) return Xml;
 
             string contentType;
             ContentTypes.Instance.ContentTypeFormats.TryGetValue(format, out contentType);
@@ -464,8 +481,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             get
             {
                 return httpMethod
-                    ?? (httpMethod = Param(HttpHeaders.XHttpMethodOverride)
-                    ?? request.HttpMethod);
+                    ?? (httpMethod = request.HttpMethod);
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 3d38c2e3c..a2edc7aa8 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -88,9 +88,6 @@
     <Reference Include="ServiceStack">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Interfaces">
-      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>
-    </Reference>
     <Reference Include="ServiceStack.Text">
       <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
     </Reference>
@@ -111,7 +108,6 @@
     <Compile Include="Devices\DeviceRepository.cs" />
     <Compile Include="Devices\CameraUploadsFolder.cs" />
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
-    <Compile Include="HttpServer\ContainerAdapter.cs" />
     <Compile Include="HttpServer\HttpListenerHost.cs" />
     <Compile Include="HttpServer\HttpResultFactory.cs" />
     <Compile Include="HttpServer\ServerFactory.cs" />
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index b7dbe4dc7..dcc409d3a 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -98,30 +98,11 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
-    <Compile Include="Native\BaseMonoApp.cs" />
+    <Compile Include="Native\MonoApp.cs" />
     <Compile Include="Native\DbConnector.cs" />
     <Compile Include="Native\PowerManagement.cs" />
-    <Compile Include="Networking\CertificateGenerator.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Native\NativeApp.cs" />
-    <Compile Include="Networking\NetworkManager.cs" />
-    <Compile Include="Security\ASN1.cs" />
-    <Compile Include="Security\ASN1Convert.cs" />
-    <Compile Include="Security\BitConverterLE.cs" />
-    <Compile Include="Security\CryptoConvert.cs" />
-    <Compile Include="Security\PKCS1.cs" />
-    <Compile Include="Security\PKCS12.cs" />
-    <Compile Include="Security\PKCS7.cs" />
-    <Compile Include="Security\PKCS8.cs" />
-    <Compile Include="Security\X501Name.cs" />
-    <Compile Include="Security\X509Builder.cs" />
-    <Compile Include="Security\X509Certificate.cs" />
-    <Compile Include="Security\X509CertificateBuilder.cs" />
-    <Compile Include="Security\X509CertificateCollection.cs" />
-    <Compile Include="Security\X509Extension.cs" />
-    <Compile Include="Security\X509Extensions.cs" />
-    <Compile Include="Security\X520Attributes.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
deleted file mode 100644
index 46605e19f..000000000
--- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.IsoMounter;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Mono.Networking;
-using MediaBrowser.Server.Startup.Common;
-using Mono.Unix.Native;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using MediaBrowser.Model.System;
-using MediaBrowser.Server.Implementations.Persistence;
-using MediaBrowser.Server.Startup.Common.FFMpeg;
-using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
-
-namespace MediaBrowser.Server.Mono.Native
-{
-    public abstract class BaseMonoApp : INativeApp
-    {
-        protected StartupOptions StartupOptions { get; private set; }
-        protected ILogger Logger { get; private set; }
-
-        protected BaseMonoApp(StartupOptions startupOptions, ILogger logger)
-        {
-            StartupOptions = startupOptions;
-            Logger = logger;
-        }
-
-        /// <summary>
-        /// Shutdowns this instance.
-        /// </summary>
-        public abstract void Shutdown();
-
-        /// <summary>
-        /// Restarts this instance.
-        /// </summary>
-        public virtual void Restart(StartupOptions startupOptions)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Determines whether this instance [can self restart].
-        /// </summary>
-        /// <returns><c>true</c> if this instance [can self restart]; otherwise, <c>false</c>.</returns>
-        public virtual bool CanSelfRestart
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance can self update.
-        /// </summary>
-        /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value>
-        public bool CanSelfUpdate
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        public bool SupportsAutoRunAtStartup
-        {
-            get { return false; }
-        }
-
-        public List<Assembly> GetAssembliesWithParts()
-        {
-            var list = new List<Assembly>();
-
-            if (Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux)
-            {
-                list.AddRange(GetLinuxAssemblies());
-            }
-
-            list.Add(GetType().Assembly);
-
-            return list;
-        }
-
-        private IEnumerable<Assembly> GetLinuxAssemblies()
-        {
-            var list = new List<Assembly>();
-
-            list.Add(typeof(LinuxIsoManager).Assembly);
-
-            return list;
-        }
-
-        public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory)
-        {
-        }
-
-        private NativeEnvironment _nativeEnvironment;
-        public NativeEnvironment Environment
-        {
-            get { return _nativeEnvironment ?? (_nativeEnvironment = GetEnvironmentInfo()); }
-        }
-
-        public bool SupportsRunningAsService
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        public bool IsRunningAsService
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        public bool SupportsLibraryMonitor
-        {
-            get
-            {
-                return Environment.OperatingSystem != Startup.Common.OperatingSystem.Osx;
-            }
-        }
-
-        public void ConfigureAutoRun(bool autorun)
-        {
-        }
-
-        public INetworkManager CreateNetworkManager(ILogger logger)
-        {
-            return new NetworkManager(logger);
-        }
-
-        private NativeEnvironment GetEnvironmentInfo()
-        {
-            var info = new NativeEnvironment
-            {
-                OperatingSystem = Startup.Common.OperatingSystem.Linux
-            };
-
-            var uname = GetUnixName();
-
-            var sysName = uname.sysname ?? string.Empty;
-
-            if (string.Equals(sysName, "Darwin", StringComparison.OrdinalIgnoreCase))
-            {
-                info.OperatingSystem = Startup.Common.OperatingSystem.Osx;
-            }
-            else if (string.Equals(sysName, "Linux", StringComparison.OrdinalIgnoreCase))
-            {
-                info.OperatingSystem = Startup.Common.OperatingSystem.Linux;
-            }
-            else if (string.Equals(sysName, "BSD", StringComparison.OrdinalIgnoreCase))
-            {
-                info.OperatingSystem = Startup.Common.OperatingSystem.Bsd;
-            }
-
-            var archX86 = new Regex("(i|I)[3-6]86");
-
-            if (archX86.IsMatch(uname.machine))
-            {
-                info.SystemArchitecture = Architecture.X86;
-            }
-            else if (string.Equals(uname.machine, "x86_64", StringComparison.OrdinalIgnoreCase))
-            {
-                info.SystemArchitecture = Architecture.X64;
-            }
-            else if (uname.machine.StartsWith("arm", StringComparison.OrdinalIgnoreCase))
-            {
-                info.SystemArchitecture = Architecture.Arm;
-            }
-            else if (System.Environment.Is64BitOperatingSystem)
-            {
-                info.SystemArchitecture = Architecture.X64;
-            }
-            else
-            {
-                info.SystemArchitecture = Architecture.X86;
-            }
-
-            info.OperatingSystemVersionString = string.IsNullOrWhiteSpace(sysName) ?
-                System.Environment.OSVersion.VersionString :
-                sysName;
-
-            return info;
-        }
-
-        private Uname _unixName;
-
-        private Uname GetUnixName()
-        {
-            if (_unixName == null)
-            {
-                var uname = new Uname();
-                try
-                {
-                    Utsname utsname;
-                    var callResult = Syscall.uname(out utsname);
-                    if (callResult == 0)
-                    {
-                        uname.sysname = utsname.sysname ?? string.Empty;
-                        uname.machine = utsname.machine ?? string.Empty;
-                    }
-
-                }
-                catch (Exception ex)
-                {
-                    Logger.ErrorException("Error getting unix name", ex);
-                }
-                _unixName = uname;
-            }
-            return _unixName;
-        }
-
-        public class Uname
-        {
-            public string sysname = string.Empty;
-            public string machine = string.Empty;
-        }
-
-        public FFMpegInstallInfo GetFfmpegInstallInfo()
-        {
-            return GetInfo(Environment);
-        }
-
-        public void LaunchUrl(string url)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDbConnector GetDbConnector()
-        {
-            return new DbConnector(Logger);
-        }
-
-        public static FFMpegInstallInfo GetInfo(NativeEnvironment environment)
-        {
-            var info = new FFMpegInstallInfo();
-
-            // Windows builds: http://ffmpeg.zeranoe.com/builds/
-            // Linux builds: http://johnvansickle.com/ffmpeg/
-            // OS X builds: http://ffmpegmac.net/
-            // OS X x64: http://www.evermeet.cx/ffmpeg/
-
-            switch (environment.OperatingSystem)
-            {
-                case OperatingSystem.Osx:
-                case OperatingSystem.Bsd:
-                    break;
-                case OperatingSystem.Linux:
-
-                    info.ArchiveType = "7z";
-                    info.Version = "20160215";
-                    break;
-            }
-
-            // No version available - user requirement
-            info.DownloadUrls = new string[] { };
-
-            return info;
-        }
-
-        public void EnableLoopback(string appName)
-        {
-
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Mono/Native/MonoApp.cs b/MediaBrowser.Server.Mono/Native/MonoApp.cs
new file mode 100644
index 000000000..bc4a9978e
--- /dev/null
+++ b/MediaBrowser.Server.Mono/Native/MonoApp.cs
@@ -0,0 +1,275 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.IsoMounter;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Server.Startup.Common;
+using Mono.Unix.Native;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using MediaBrowser.Model.System;
+using MediaBrowser.Server.Implementations.Persistence;
+using MediaBrowser.Server.Startup.Common.FFMpeg;
+using MediaBrowser.Server.Startup.Common.Networking;
+using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
+
+namespace MediaBrowser.Server.Mono.Native
+{
+    public class MonoApp : INativeApp
+    {
+        protected StartupOptions StartupOptions { get; private set; }
+        protected ILogger Logger { get; private set; }
+
+        public MonoApp(StartupOptions startupOptions, ILogger logger)
+        {
+            StartupOptions = startupOptions;
+            Logger = logger;
+        }
+
+        /// <summary>
+        /// Shutdowns this instance.
+        /// </summary>
+        public void Shutdown()
+        {
+            MainClass.Shutdown();
+        }
+
+        /// <summary>
+        /// Determines whether this instance [can self restart].
+        /// </summary>
+        /// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
+        public bool CanSelfRestart
+        {
+            get
+            {
+                // A restart script must be provided
+                return StartupOptions.ContainsOption("-restartpath");
+            }
+        }
+
+        /// <summary>
+        /// Restarts this instance.
+        /// </summary>
+        public void Restart(StartupOptions startupOptions)
+        {
+            MainClass.Restart(startupOptions);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance can self update.
+        /// </summary>
+        /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value>
+        public bool CanSelfUpdate
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public bool SupportsAutoRunAtStartup
+        {
+            get { return false; }
+        }
+
+        public List<Assembly> GetAssembliesWithParts()
+        {
+            var list = new List<Assembly>();
+
+            if (Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux)
+            {
+                list.AddRange(GetLinuxAssemblies());
+            }
+
+            list.Add(GetType().Assembly);
+
+            return list;
+        }
+
+        private IEnumerable<Assembly> GetLinuxAssemblies()
+        {
+            var list = new List<Assembly>();
+
+            list.Add(typeof(LinuxIsoManager).Assembly);
+
+            return list;
+        }
+
+        public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory)
+        {
+        }
+
+        private NativeEnvironment _nativeEnvironment;
+        public NativeEnvironment Environment
+        {
+            get { return _nativeEnvironment ?? (_nativeEnvironment = GetEnvironmentInfo()); }
+        }
+
+        public bool SupportsRunningAsService
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public bool IsRunningAsService
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public bool SupportsLibraryMonitor
+        {
+            get
+            {
+                return Environment.OperatingSystem != Startup.Common.OperatingSystem.Osx;
+            }
+        }
+
+        public void ConfigureAutoRun(bool autorun)
+        {
+        }
+
+        public INetworkManager CreateNetworkManager(ILogger logger)
+        {
+            return new NetworkManager(logger);
+        }
+
+        private NativeEnvironment GetEnvironmentInfo()
+        {
+            var info = new NativeEnvironment
+            {
+                OperatingSystem = Startup.Common.OperatingSystem.Linux
+            };
+
+            var uname = GetUnixName();
+
+            var sysName = uname.sysname ?? string.Empty;
+
+            if (string.Equals(sysName, "Darwin", StringComparison.OrdinalIgnoreCase))
+            {
+                info.OperatingSystem = Startup.Common.OperatingSystem.Osx;
+            }
+            else if (string.Equals(sysName, "Linux", StringComparison.OrdinalIgnoreCase))
+            {
+                info.OperatingSystem = Startup.Common.OperatingSystem.Linux;
+            }
+            else if (string.Equals(sysName, "BSD", StringComparison.OrdinalIgnoreCase))
+            {
+                info.OperatingSystem = Startup.Common.OperatingSystem.Bsd;
+            }
+
+            var archX86 = new Regex("(i|I)[3-6]86");
+
+            if (archX86.IsMatch(uname.machine))
+            {
+                info.SystemArchitecture = Architecture.X86;
+            }
+            else if (string.Equals(uname.machine, "x86_64", StringComparison.OrdinalIgnoreCase))
+            {
+                info.SystemArchitecture = Architecture.X64;
+            }
+            else if (uname.machine.StartsWith("arm", StringComparison.OrdinalIgnoreCase))
+            {
+                info.SystemArchitecture = Architecture.Arm;
+            }
+            else if (System.Environment.Is64BitOperatingSystem)
+            {
+                info.SystemArchitecture = Architecture.X64;
+            }
+            else
+            {
+                info.SystemArchitecture = Architecture.X86;
+            }
+
+            info.OperatingSystemVersionString = string.IsNullOrWhiteSpace(sysName) ?
+                System.Environment.OSVersion.VersionString :
+                sysName;
+
+            return info;
+        }
+
+        private Uname _unixName;
+
+        private Uname GetUnixName()
+        {
+            if (_unixName == null)
+            {
+                var uname = new Uname();
+                try
+                {
+                    Utsname utsname;
+                    var callResult = Syscall.uname(out utsname);
+                    if (callResult == 0)
+                    {
+                        uname.sysname = utsname.sysname ?? string.Empty;
+                        uname.machine = utsname.machine ?? string.Empty;
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error getting unix name", ex);
+                }
+                _unixName = uname;
+            }
+            return _unixName;
+        }
+
+        public class Uname
+        {
+            public string sysname = string.Empty;
+            public string machine = string.Empty;
+        }
+
+        public FFMpegInstallInfo GetFfmpegInstallInfo()
+        {
+            return GetInfo(Environment);
+        }
+
+        public void LaunchUrl(string url)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IDbConnector GetDbConnector()
+        {
+            return new DbConnector(Logger);
+        }
+
+        public static FFMpegInstallInfo GetInfo(NativeEnvironment environment)
+        {
+            var info = new FFMpegInstallInfo();
+
+            // Windows builds: http://ffmpeg.zeranoe.com/builds/
+            // Linux builds: http://johnvansickle.com/ffmpeg/
+            // OS X builds: http://ffmpegmac.net/
+            // OS X x64: http://www.evermeet.cx/ffmpeg/
+
+            switch (environment.OperatingSystem)
+            {
+                case OperatingSystem.Osx:
+                case OperatingSystem.Bsd:
+                    break;
+                case OperatingSystem.Linux:
+
+                    info.ArchiveType = "7z";
+                    info.Version = "20160215";
+                    break;
+            }
+
+            // No version available - user requirement
+            info.DownloadUrls = new string[] { };
+
+            return info;
+        }
+
+        public void EnableLoopback(string appName)
+        {
+
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Mono/Native/NativeApp.cs b/MediaBrowser.Server.Mono/Native/NativeApp.cs
deleted file mode 100644
index c0874a1d8..000000000
--- a/MediaBrowser.Server.Mono/Native/NativeApp.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Startup.Common;
-
-namespace MediaBrowser.Server.Mono.Native
-{
-    /// <summary>
-    /// Class NativeApp
-    /// </summary>
-    internal class NativeApp : BaseMonoApp
-    {
-        public NativeApp(StartupOptions startupOptions, ILogger logger)
-            : base(startupOptions, logger)
-        {
-        }
-
-        /// <summary>
-        /// Shutdowns this instance.
-        /// </summary>
-        public override void Shutdown()
-        {
-            MainClass.Shutdown();
-        }
-
-        /// <summary>
-        /// Determines whether this instance [can self restart].
-        /// </summary>
-        /// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
-        public override bool CanSelfRestart
-        {
-            get
-            {
-                // A restart script must be provided
-                return StartupOptions.ContainsOption("-restartpath");
-            }
-        }
-
-        /// <summary>
-        /// Restarts this instance.
-        /// </summary>
-        public override void Restart(StartupOptions startupOptions)
-        {
-            MainClass.Restart(startupOptions);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Mono/Networking/CertificateGenerator.cs b/MediaBrowser.Server.Mono/Networking/CertificateGenerator.cs
deleted file mode 100644
index 58c5bba2d..000000000
--- a/MediaBrowser.Server.Mono/Networking/CertificateGenerator.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using MediaBrowser.Model.Logging;
-using System;
-using System.Collections;
-using System.Security.Cryptography;
-using MediaBrowser.Server.Mono.Security;
-
-namespace MediaBrowser.Server.Mono.Networking
-{
-    internal class CertificateGenerator
-    {
-        private const string MonoTestRootAgency = "<RSAKeyValue><Modulus>v/4nALBxCE+9JgEC0LnDUvKh6e96PwTpN4Rj+vWnqKT7IAp1iK/JjuqvAg6DQ2vTfv0dTlqffmHH51OyioprcT5nzxcSTsZb/9jcHScG0s3/FRIWnXeLk/fgm7mSYhjUaHNI0m1/NTTktipicjKxo71hGIg9qucCWnDum+Krh/k=</Modulus><Exponent>AQAB</Exponent><P>9jbKxMXEruW2CfZrzhxtull4O8P47+mNsEL+9gf9QsRO1jJ77C+jmzfU6zbzjf8+ViK+q62tCMdC1ZzulwdpXQ==</P><Q>x5+p198l1PkK0Ga2mRh0SIYSykENpY2aLXoyZD/iUpKYAvATm0/wvKNrE4dKJyPCA+y3hfTdgVag+SP9avvDTQ==</Q><DP>ISSjCvXsUfbOGG05eddN1gXxL2pj+jegQRfjpk7RAsnWKvNExzhqd5x+ZuNQyc6QH5wxun54inP4RTUI0P/IaQ==</DP><DQ>R815VQmR3RIbPqzDXzv5j6CSH6fYlcTiQRtkBsUnzhWmkd/y3XmamO+a8zJFjOCCx9CcjpVuGziivBqi65lVPQ==</DQ><InverseQ>iYiu0KwMWI/dyqN3RJYUzuuLj02/oTD1pYpwo2rvNCXU1Q5VscOeu2DpNg1gWqI+1RrRCsEoaTNzXB1xtKNlSw==</InverseQ><D>nIfh1LYF8fjRBgMdAH/zt9UKHWiaCnc+jXzq5tkR8HVSKTVdzitD8bl1JgAfFQD8VjSXiCJqluexy/B5SGrCXQ49c78NIQj0hD+J13Y8/E0fUbW1QYbhj6Ff7oHyhaYe1WOQfkp2t/h+llHOdt1HRf7bt7dUknYp7m8bQKGxoYE=</D></RSAKeyValue>";
-
-        internal static void CreateSelfSignCertificatePfx(
-            string fileName,
-            string hostname,
-            ILogger logger)
-        {
-            if (string.IsNullOrWhiteSpace(fileName))
-            {
-                throw new ArgumentNullException("fileName");
-            }
-
-            byte[] sn = Guid.NewGuid().ToByteArray();
-            string subject = string.Format("CN={0}", hostname);
-            string issuer = subject;
-            DateTime notBefore = DateTime.Now.AddDays(-2);
-            DateTime notAfter = DateTime.Now.AddYears(10);
-
-            RSA issuerKey = RSA.Create();
-            issuerKey.FromXmlString(MonoTestRootAgency);
-            RSA subjectKey = RSA.Create();
-
-            // serial number MUST be positive
-            if ((sn[0] & 0x80) == 0x80)
-                sn[0] -= 0x80;
-
-            issuer = subject;
-            issuerKey = subjectKey;
-
-            X509CertificateBuilder cb = new X509CertificateBuilder(3);
-            cb.SerialNumber = sn;
-            cb.IssuerName = issuer;
-            cb.NotBefore = notBefore;
-            cb.NotAfter = notAfter;
-            cb.SubjectName = subject;
-            cb.SubjectPublicKey = subjectKey;
-
-            // signature
-            cb.Hash = "SHA256";
-            byte[] rawcert = cb.Sign(issuerKey);
-
-            PKCS12 p12 = new PKCS12();
-
-
-            ArrayList list = new ArrayList();
-            // we use a fixed array to avoid endianess issues 
-            // (in case some tools requires the ID to be 1).
-            list.Add(new byte[4] { 1, 0, 0, 0 });
-            Hashtable attributes = new Hashtable(1);
-            attributes.Add(PKCS9.localKeyId, list);
-
-            p12.AddCertificate(new X509Certificate(rawcert), attributes);
-
-            p12.AddPkcs8ShroudedKeyBag(subjectKey, attributes);
-            p12.SaveToFile(fileName);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Mono/Networking/NetworkManager.cs b/MediaBrowser.Server.Mono/Networking/NetworkManager.cs
deleted file mode 100644
index 3ef68b665..000000000
--- a/MediaBrowser.Server.Mono/Networking/NetworkManager.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
-using System.Collections.Generic;
-using Emby.Common.Implementations.Networking;
-
-namespace MediaBrowser.Server.Mono.Networking
-{
-    /// <summary>
-    /// Class NetUtils
-    /// </summary>
-    public class NetworkManager : BaseNetworkManager, INetworkManager
-    {
-        public NetworkManager(ILogger logger)
-            : base(logger)
-        {
-        }
-
-        /// <summary>
-        /// Gets the network shares.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>IEnumerable{NetworkShare}.</returns>
-        public IEnumerable<NetworkShare> GetNetworkShares(string path)
-        {
-            return new List<NetworkShare>();
-        }
-
-        /// <summary>
-        /// Gets available devices within the domain
-        /// </summary>
-        /// <returns>PC's in the Domain</returns>
-        public IEnumerable<FileSystemEntryInfo> GetNetworkDevices()
-        {
-            return new List<FileSystemEntryInfo>();
-        }
-
-        /// <summary>
-        /// Generates a self signed certificate at the locatation specified by <paramref name="certificatePath"/>.
-        /// </summary>
-        /// <param name="certificatePath">The path to generate the certificate.</param>
-        /// <param name="hostname">The common name for the certificate.</param>
-        public void GenerateSelfSignedSslCertificate(string certificatePath, string hostname)
-        {
-            CertificateGenerator.CreateSelfSignCertificatePfx(certificatePath, hostname, Logger);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 662d82ff0..77fa6fd91 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -78,7 +78,7 @@ namespace MediaBrowser.Server.Mono
             var fileSystem = new ManagedFileSystem(logManager.GetLogger("FileSystem"), false, false);
             fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
 
-            var nativeApp = new NativeApp(options, logManager.GetLogger("App"));
+            var nativeApp = new MonoApp(options, logManager.GetLogger("App"));
 
             _appHost = new ApplicationHost(appPaths, logManager, options, fileSystem, nativeApp, new PowerManagement(), "emby.mono.zip");
 
diff --git a/MediaBrowser.Server.Mono/Security/ASN1.cs b/MediaBrowser.Server.Mono/Security/ASN1.cs
deleted file mode 100644
index 2fcbde7c1..000000000
--- a/MediaBrowser.Server.Mono/Security/ASN1.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-//
-// ASN1.cs: Abstract Syntax Notation 1 - micro-parser and generator
-//
-// Authors:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//	Jesper Pedersen  <jep@itplus.dk>
-//
-// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-// (C) 2004 IT+ A/S (http://www.itplus.dk)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-	// References:
-	// a.	ITU ASN.1 standards (free download)
-	//	http://www.itu.int/ITU-T/studygroups/com17/languages/
-
-    public class ASN1 {
-
-		private byte m_nTag;
-		private byte[] m_aValue;
-		private ArrayList elist;
-
-		public ASN1 () : this (0x00, null) {}
-
-		public ASN1 (byte tag) : this (tag, null) {}
-
-		public ASN1 (byte tag, byte[] data) 
-		{
-			m_nTag = tag;
-			m_aValue = data;
-		}
-
-		public ASN1 (byte[] data) 
-		{
-			m_nTag = data [0];
-
-			int nLenLength = 0;
-			int nLength = data [1];
-
-			if (nLength > 0x80) {
-				// composed length
-				nLenLength = nLength - 0x80;
-				nLength = 0;
-				for (int i = 0; i < nLenLength; i++) {
-					nLength *= 256;
-					nLength += data [i + 2];
-				}
-			}
-			else if (nLength == 0x80) {
-				// undefined length encoding
-				throw new NotSupportedException ("Undefined length encoding.");
-			}
-
-			m_aValue = new byte [nLength];
-			Buffer.BlockCopy (data, (2 + nLenLength), m_aValue, 0, nLength);
-
-			if ((m_nTag & 0x20) == 0x20) {
-				int nStart = (2 + nLenLength);
-				Decode (data, ref nStart, data.Length);
-			}
-		}
-
-		public int Count {
-			get { 
-				if (elist == null)
-					return 0;
-				return elist.Count; 
-			}
-		}
-
-		public byte Tag {
-			get { return m_nTag; }
-		}
-
-		public int Length {
-			get { 
-				if (m_aValue != null)
-					return m_aValue.Length; 
-				else
-					return 0;
-			}
-		}
-
-		public byte[] Value {
-			get { 
-				if (m_aValue == null)
-					GetBytes ();
-				return (byte[]) m_aValue.Clone (); 
-			}
-			set { 
-				if (value != null)
-					m_aValue = (byte[]) value.Clone (); 
-			}
-		}
-
-		private bool CompareArray (byte[] array1, byte[] array2)
-		{
-			bool bResult = (array1.Length == array2.Length);
-			if (bResult) {
-				for (int i = 0; i < array1.Length; i++) {
-					if (array1[i] != array2[i])
-						return false;
-				}
-			}
-			return bResult;
-		}
-
-		public bool Equals (byte[] asn1) 
-		{
-			return CompareArray (this.GetBytes (), asn1);
-		}
-
-		public bool CompareValue (byte[] value) 
-		{
-			return CompareArray (m_aValue, value);
-		}
-
-		public ASN1 Add (ASN1 asn1) 
-		{
-			if (asn1 != null) {
-				if (elist == null)
-					elist = new ArrayList ();
-				elist.Add (asn1);
-			}
-			return asn1;
-		}
-
-		public virtual byte[] GetBytes () 
-		{
-			byte[] val = null;
-			
-			if (Count > 0) {
-				int esize = 0;
-				ArrayList al = new ArrayList ();
-				foreach (ASN1 a in elist) {
-					byte[] item = a.GetBytes ();
-					al.Add (item);
-					esize += item.Length;
-				}
-				val = new byte [esize];
-				int pos = 0;
-				for (int i=0; i < elist.Count; i++) {
-					byte[] item = (byte[]) al[i];
-					Buffer.BlockCopy (item, 0, val, pos, item.Length);
-					pos += item.Length;
-				}
-			} else if (m_aValue != null) {
-				val = m_aValue;
-			}
-
-			byte[] der;
-			int nLengthLen = 0;
-
-			if (val != null) {
-				int nLength = val.Length;
-				// special for length > 127
-				if (nLength > 127) {
-					if (nLength <= Byte.MaxValue) {
-						der = new byte [3 + nLength];
-						Buffer.BlockCopy (val, 0, der, 3, nLength);
-						nLengthLen = 0x81;
-						der[2] = (byte)(nLength);
-					}
-					else if (nLength <= UInt16.MaxValue) {
-						der = new byte [4 + nLength];
-						Buffer.BlockCopy (val, 0, der, 4, nLength);
-						nLengthLen = 0x82;
-						der[2] = (byte)(nLength >> 8);
-						der[3] = (byte)(nLength);
-					}
-					else if (nLength <= 0xFFFFFF) {
-						// 24 bits
-						der = new byte [5 + nLength];
-						Buffer.BlockCopy (val, 0, der, 5, nLength);
-						nLengthLen = 0x83;
-						der [2] = (byte)(nLength >> 16);
-						der [3] = (byte)(nLength >> 8);
-						der [4] = (byte)(nLength);
-					}
-					else {
-						// max (Length is an integer) 32 bits
-						der = new byte [6 + nLength];
-						Buffer.BlockCopy (val, 0, der, 6, nLength);
-						nLengthLen = 0x84;
-						der [2] = (byte)(nLength >> 24);
-						der [3] = (byte)(nLength >> 16);
-						der [4] = (byte)(nLength >> 8);
-						der [5] = (byte)(nLength);
-					}
-				}
-				else {
-					// basic case (no encoding)
-					der = new byte [2 + nLength];
-					Buffer.BlockCopy (val, 0, der, 2, nLength);
-					nLengthLen = nLength;
-				}
-				if (m_aValue == null)
-					m_aValue = val;
-			}
-			else
-				der = new byte[2];
-
-			der[0] = m_nTag;
-			der[1] = (byte)nLengthLen;
-
-			return der;
-		}
-
-		// Note: Recursive
-		protected void Decode (byte[] asn1, ref int anPos, int anLength) 
-		{
-			byte nTag;
-			int nLength;
-			byte[] aValue;
-
-			// minimum is 2 bytes (tag + length of 0)
-			while (anPos < anLength - 1) {
-				DecodeTLV (asn1, ref anPos, out nTag, out nLength, out aValue);
-				// sometimes we get trailing 0
-				if (nTag == 0)
-					continue;
-
-				ASN1 elm = Add (new ASN1 (nTag, aValue));
-
-				if ((nTag & 0x20) == 0x20) {
-					int nConstructedPos = anPos;
-					elm.Decode (asn1, ref nConstructedPos, nConstructedPos + nLength);
-				}
-				anPos += nLength; // value length
-			}
-		}
-
-		// TLV : Tag - Length - Value
-		protected void DecodeTLV (byte[] asn1, ref int pos, out byte tag, out int length, out byte[] content) 
-		{
-			tag = asn1 [pos++];
-			length = asn1 [pos++];
-
-			// special case where L contains the Length of the Length + 0x80
-			if ((length & 0x80) == 0x80) {
-				int nLengthLen = length & 0x7F;
-				length = 0;
-				for (int i = 0; i < nLengthLen; i++)
-					length = length * 256 + asn1 [pos++];
-			}
-
-			content = new byte [length];
-			Buffer.BlockCopy (asn1, pos, content, 0, length);
-		}
-
-		public ASN1 this [int index] {
-			get { 		
-				try {
-					if ((elist == null) || (index >= elist.Count))
-						return null;
-					return (ASN1) elist [index];
-				}
-				catch (ArgumentOutOfRangeException) {
-					return null;
-				}
-			}
-		}
-
-		public ASN1 Element (int index, byte anTag) 
-		{
-			try {
-				if ((elist == null) || (index >= elist.Count))
-					return null;
-
-				ASN1 elm = (ASN1) elist [index];
-				if (elm.Tag == anTag)
-					return elm;
-				else
-					return null;
-			}
-			catch (ArgumentOutOfRangeException) {
-				return null;
-			}
-		}
-
-		public override string ToString()
-		{
-			StringBuilder hexLine = new StringBuilder ();
-            
-			// Add tag
-			hexLine.AppendFormat ("Tag: {0} {1}", m_nTag.ToString ("X2"), Environment.NewLine);
-
-			// Add length
-			hexLine.AppendFormat ("Length: {0} {1}", Value.Length, Environment.NewLine);
-
-			// Add value
-			hexLine.Append ("Value: ");
-			hexLine.Append (Environment.NewLine);
-			for (int i = 0; i < Value.Length; i++) {
-				hexLine.AppendFormat ("{0} ", Value [i].ToString ("X2"));
-				if ((i+1) % 16 == 0)
-					hexLine.AppendFormat (Environment.NewLine);
-			}
-			return hexLine.ToString ();
-		}
-
-		public void SaveToFile (string filename)
-		{
-			if (filename == null)
-				throw new ArgumentNullException ("filename");
-
-			using (FileStream fs = File.Create (filename)) {
-				byte[] data = GetBytes ();
-				fs.Write (data, 0, data.Length);
-			}
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/ASN1Convert.cs b/MediaBrowser.Server.Mono/Security/ASN1Convert.cs
deleted file mode 100644
index f25a5275a..000000000
--- a/MediaBrowser.Server.Mono/Security/ASN1Convert.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// ASN1Convert.cs: Abstract Syntax Notation 1 convertion routines
-//
-// Authors:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//	Jesper Pedersen  <jep@itplus.dk>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 IT+ A/S (http://www.itplus.dk)
-// Copyright (C) 2004-2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Globalization;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-	// References:
-	// a.	ITU ASN.1 standards (free download)
-	//	http://www.itu.int/ITU-T/studygroups/com17/languages/
-
-    public static class ASN1Convert {
-		// RFC3280, section 4.2.1.5
-		// CAs conforming to this profile MUST always encode certificate
-		// validity dates through the year 2049 as UTCTime; certificate validity
-		// dates in 2050 or later MUST be encoded as GeneralizedTime.
-
-		// Under 1.x this API requires a Local datetime to be provided
-		// Under 2.0 it will also accept a Utc datetime
-		static public ASN1 FromDateTime (DateTime dt) 
-		{
-			if (dt.Year < 2050) {
-				// UTCTIME
-				return new ASN1 (0x17, Encoding.ASCII.GetBytes (
-					dt.ToUniversalTime ().ToString ("yyMMddHHmmss",
-					CultureInfo.InvariantCulture) + "Z"));
-			}
-			else {
-				// GENERALIZEDTIME
-				return new ASN1 (0x18, Encoding.ASCII.GetBytes (
-					dt.ToUniversalTime ().ToString ("yyyyMMddHHmmss", 
-					CultureInfo.InvariantCulture) + "Z"));
-			}
-		}
-
-		static public ASN1 FromInt32 (Int32 value) 
-		{
-			byte[] integer = BitConverterLE.GetBytes (value);
-			Array.Reverse (integer);
-			int x = 0;
-			while ((x < integer.Length) && (integer [x] == 0x00))
-				x++;
-			ASN1 asn1 = new ASN1 (0x02);
-			switch (x) {
-			case 0:
-				asn1.Value = integer;
-				break;
-			case 4:
-				asn1.Value = new byte [1];
-				break;
-			default:
-				byte[] smallerInt = new byte [4 - x];
-				Buffer.BlockCopy (integer, x, smallerInt, 0, smallerInt.Length);
-				asn1.Value = smallerInt;
-				break;
-			}
-			return asn1;
-		}
-
-		static public ASN1 FromOid (string oid) 
-		{
-			if (oid == null)
-				throw new ArgumentNullException ("oid");
-
-			return new ASN1 (CryptoConfig.EncodeOID (oid));
-		}
-
-		static public ASN1 FromUnsignedBigInteger (byte[] big) 
-		{
-			if (big == null)
-				throw new ArgumentNullException ("big");
-
-			// check for numbers that could be interpreted as negative (first bit)
-			if (big [0] >= 0x80) {
-				// in thie cas we add a new, empty, byte (position 0) so we're
-				// sure this will always be interpreted an unsigned integer.
-				// However we can't feed it into RSAParameters or DSAParameters
-				int length = big.Length + 1;
-				byte[] uinteger = new byte [length];
-				Buffer.BlockCopy (big, 0, uinteger, 1, length - 1);
-				big = uinteger;
-			}
-			return new ASN1 (0x02, big);
-		}
-
-		static public int ToInt32 (ASN1 asn1) 
-		{
-			if (asn1 == null)
-				throw new ArgumentNullException ("asn1");
-			if (asn1.Tag != 0x02)
-				throw new FormatException ("Only integer can be converted");
-
-			int x = 0;
-			for (int i=0; i < asn1.Value.Length; i++)
-				x = (x << 8) + asn1.Value [i];
-			return x;
-		}
-
-		// Convert a binary encoded OID to human readable string representation of 
-		// an OID (IETF style). Based on DUMPASN1.C from Peter Gutmann.
-		static public string ToOid (ASN1 asn1) 
-		{
-			if (asn1 == null)
-				throw new ArgumentNullException ("asn1");
-
-			byte[] aOID = asn1.Value;
-			StringBuilder sb = new StringBuilder ();
-			// Pick apart the OID
-			byte x = (byte) (aOID[0] / 40);
-			byte y = (byte) (aOID[0] % 40);
-			if (x > 2) {
-				// Handle special case for large y if x = 2
-				y += (byte) ((x - 2) * 40);
-				x = 2;
-			}
-			sb.Append (x.ToString (CultureInfo.InvariantCulture));
-			sb.Append (".");
-			sb.Append (y.ToString (CultureInfo.InvariantCulture));
-			ulong val = 0;
-			for (x = 1; x < aOID.Length; x++) {
-				val = ((val << 7) | ((byte) (aOID [x] & 0x7F)));
-				if ( !((aOID [x] & 0x80) == 0x80)) {
-					sb.Append (".");
-					sb.Append (val.ToString (CultureInfo.InvariantCulture));
-					val = 0;
-				}
-			}
-			return sb.ToString ();
-		}
-
-		static public DateTime ToDateTime (ASN1 time) 
-		{
-			if (time == null)
-				throw new ArgumentNullException ("time");
-
-			string t = Encoding.ASCII.GetString (time.Value);
-			// to support both UTCTime and GeneralizedTime (and not so common format)
-			string mask = null;
-			int year;
-			switch (t.Length) {
-				case 11:
-					// illegal format, still it's supported for compatibility
-					mask = "yyMMddHHmmZ";
-					break;
-				case 13: 
-					// RFC3280: 4.1.2.5.1  UTCTime
-					year = Convert.ToInt16 (t.Substring (0, 2), CultureInfo.InvariantCulture);
-					// Where YY is greater than or equal to 50, the 
-					// year SHALL be interpreted as 19YY; and 
-					// Where YY is less than 50, the year SHALL be 
-					// interpreted as 20YY.
-					if (year >= 50)
-						t = "19" + t;
-					else
-						t = "20" + t;
-					mask = "yyyyMMddHHmmssZ";
-					break;
-				case 15:
-					mask = "yyyyMMddHHmmssZ"; // GeneralizedTime
-					break;
-				case 17:
-					// another illegal format (990630000000+1000), again supported for compatibility
-					year = Convert.ToInt16 (t.Substring (0, 2), CultureInfo.InvariantCulture);
-					string century = (year >= 50) ? "19" : "20";
-					// ASN.1 (see ITU X.680 section 43.3) deals with offset differently than .NET
-					char sign = (t[12] == '+') ? '-' : '+';
-					t = String.Format ("{0}{1}{2}{3}{4}:{5}{6}", century, t.Substring (0, 12), sign, 
-						t[13], t[14], t[15], t[16]);
-					mask = "yyyyMMddHHmmsszzz";
-					break;
-			}
-			return DateTime.ParseExact (t, mask, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal);
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/BitConverterLE.cs b/MediaBrowser.Server.Mono/Security/BitConverterLE.cs
deleted file mode 100644
index 29b6ee023..000000000
--- a/MediaBrowser.Server.Mono/Security/BitConverterLE.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-//
-// Mono.Security.BitConverterLE.cs
-//  Like System.BitConverter but always little endian
-//
-// Author:
-//   Bernie Solomon
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace MediaBrowser.Server.Mono.Security
-{
-	internal sealed class BitConverterLE
-	{
-		private BitConverterLE ()
-		{
-		}
-
-		unsafe private static byte[] GetUShortBytes (byte *bytes)
-		{
-			if (BitConverter.IsLittleEndian)
-				return new byte [] { bytes [0], bytes [1] };
-			else
-				return new byte [] { bytes [1], bytes [0] };
-		}
-
-		unsafe private static byte[] GetUIntBytes (byte *bytes)
-		{
-			if (BitConverter.IsLittleEndian)
-				return new byte [] { bytes [0], bytes [1], bytes [2], bytes [3] };
-			else
-				return new byte [] { bytes [3], bytes [2], bytes [1], bytes [0] };
-		}
-
-		unsafe private static byte[] GetULongBytes (byte *bytes)
-		{
-			if (BitConverter.IsLittleEndian)
-				return new byte [] { bytes [0], bytes [1], bytes [2], bytes [3],
-						     bytes [4], bytes [5], bytes [6], bytes [7] };
-			else
-				return new byte [] { bytes [7], bytes [6], bytes [5], bytes [4],
-						     bytes [3], bytes [2], bytes [1], bytes [0] };
-		}
-
-		unsafe internal static byte[] GetBytes (bool value)
-		{
-			return new byte [] { value ? (byte)1 : (byte)0 };
-		}
-
-		unsafe internal static byte[] GetBytes (char value)
-		{
-			return GetUShortBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (short value)
-		{
-			return GetUShortBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (int value)
-		{
-			return GetUIntBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (long value)
-		{
-			return GetULongBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (ushort value)
-		{
-			return GetUShortBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (uint value)
-		{
-			return GetUIntBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (ulong value)
-		{
-			return GetULongBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (float value)
-		{
-			return GetUIntBytes ((byte *) &value);
-		}
-
-		unsafe internal static byte[] GetBytes (double value)
-		{
-			return GetULongBytes ((byte *) &value);
-		}
-
-		unsafe private static void UShortFromBytes (byte *dst, byte[] src, int startIndex)
-		{
-			if (BitConverter.IsLittleEndian) {
-				dst [0] = src [startIndex];
-				dst [1] = src [startIndex + 1];
-			} else {
-				dst [0] = src [startIndex + 1];
-				dst [1] = src [startIndex];
-			}
-		}
-
-		unsafe private static void UIntFromBytes (byte *dst, byte[] src, int startIndex)
-		{
-			if (BitConverter.IsLittleEndian) {
-				dst [0] = src [startIndex];
-				dst [1] = src [startIndex + 1];
-				dst [2] = src [startIndex + 2];
-				dst [3] = src [startIndex + 3];
-			} else {
-				dst [0] = src [startIndex + 3];
-				dst [1] = src [startIndex + 2];
-				dst [2] = src [startIndex + 1];
-				dst [3] = src [startIndex];
-			}
-		}
-
-		unsafe private static void ULongFromBytes (byte *dst, byte[] src, int startIndex)
-		{
-			if (BitConverter.IsLittleEndian) {
-				for (int i = 0; i < 8; ++i)
-					dst [i] = src [startIndex + i];
-			} else {
-				for (int i = 0; i < 8; ++i)
-					dst [i] = src [startIndex + (7 - i)];
-			}
-		}
-
-		unsafe internal static bool ToBoolean (byte[] value, int startIndex)
-		{
-			return value [startIndex] != 0;
-		}
-
-		unsafe internal static char ToChar (byte[] value, int startIndex)
-		{
-			char ret;
-
-			UShortFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static short ToInt16 (byte[] value, int startIndex)
-		{
-			short ret;
-
-			UShortFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static int ToInt32 (byte[] value, int startIndex)
-		{
-			int ret;
-
-			UIntFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static long ToInt64 (byte[] value, int startIndex)
-		{
-			long ret;
-
-			ULongFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static ushort ToUInt16 (byte[] value, int startIndex)
-		{
-			ushort ret;
-
-			UShortFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static uint ToUInt32 (byte[] value, int startIndex)
-		{
-			uint ret;
-
-			UIntFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static ulong ToUInt64 (byte[] value, int startIndex)
-		{
-			ulong ret;
-
-			ULongFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static float ToSingle (byte[] value, int startIndex)
-		{
-			float ret;
-
-			UIntFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-
-		unsafe internal static double ToDouble (byte[] value, int startIndex)
-		{
-			double ret;
-
-			ULongFromBytes ((byte *) &ret, value, startIndex);
-
-			return ret;
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/CryptoConvert.cs b/MediaBrowser.Server.Mono/Security/CryptoConvert.cs
deleted file mode 100644
index 62c28bd27..000000000
--- a/MediaBrowser.Server.Mono/Security/CryptoConvert.cs
+++ /dev/null
@@ -1,744 +0,0 @@
-//
-// CryptoConvert.cs - Crypto Convertion Routines
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2006 Novell Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Globalization;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-    public sealed class CryptoConvert {
-
-		private CryptoConvert () 
-		{
-		}
-
-		static private int ToInt32LE (byte [] bytes, int offset)
-		{
-			return (bytes [offset+3] << 24) | (bytes [offset+2] << 16) | (bytes [offset+1] << 8) | bytes [offset];
-		}
-
-		static private uint ToUInt32LE (byte [] bytes, int offset)
-		{
-			return (uint)((bytes [offset+3] << 24) | (bytes [offset+2] << 16) | (bytes [offset+1] << 8) | bytes [offset]);
-		}
-
-		static private byte [] GetBytesLE (int val)
-		{
-			return new byte [] { 
-				(byte) (val & 0xff), 
-				(byte) ((val >> 8) & 0xff), 
-				(byte) ((val >> 16) & 0xff), 
-				(byte) ((val >> 24) & 0xff)
-			};
-                }
-
-		static private byte[] Trim (byte[] array) 
-		{
-			for (int i=0; i < array.Length; i++) {
-				if (array [i] != 0x00) {
-					byte[] result = new byte [array.Length - i];
-					Buffer.BlockCopy (array, i, result, 0, result.Length);
-					return result;
-				}
-			}
-			return null;
-		}
-
-		// convert the key from PRIVATEKEYBLOB to RSA
-		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/Security/private_key_blobs.asp
-		// e.g. SNK files, PVK files
-		static public RSA FromCapiPrivateKeyBlob (byte[] blob) 
-		{
-			return FromCapiPrivateKeyBlob (blob, 0);
-		}
-
-		static public RSA FromCapiPrivateKeyBlob (byte[] blob, int offset) 
-		{
-			if (blob == null)
-				throw new ArgumentNullException ("blob");
-			if (offset >= blob.Length)
-				throw new ArgumentException ("blob is too small.");
-
-			RSAParameters rsap = new RSAParameters ();
-			try {
-				if ((blob [offset]   != 0x07) ||				// PRIVATEKEYBLOB (0x07)
-				    (blob [offset+1] != 0x02) ||				// Version (0x02)
-				    (blob [offset+2] != 0x00) ||				// Reserved (word)
-				    (blob [offset+3] != 0x00) ||
-				    (ToUInt32LE (blob, offset+8) != 0x32415352))	// DWORD magic = RSA2
-					throw new CryptographicException ("Invalid blob header");
-				
-				// ALGID (CALG_RSA_SIGN, CALG_RSA_KEYX, ...)
-				// int algId = ToInt32LE (blob, offset+4);
-
-				// DWORD bitlen
-				int bitLen = ToInt32LE (blob, offset+12);
-
-				// DWORD public exponent
-				byte[] exp = new byte [4];
-				Buffer.BlockCopy (blob, offset+16, exp, 0, 4);
-				Array.Reverse (exp);
-				rsap.Exponent = Trim (exp);
-			
-				int pos = offset+20;
-				// BYTE modulus[rsapubkey.bitlen/8];
-				int byteLen = (bitLen >> 3);
-				rsap.Modulus = new byte [byteLen];
-				Buffer.BlockCopy (blob, pos, rsap.Modulus, 0, byteLen);
-				Array.Reverse (rsap.Modulus);
-				pos += byteLen;
-
-				// BYTE prime1[rsapubkey.bitlen/16];
-				int byteHalfLen = (byteLen >> 1);
-				rsap.P = new byte [byteHalfLen];
-				Buffer.BlockCopy (blob, pos, rsap.P, 0, byteHalfLen);
-				Array.Reverse (rsap.P);
-				pos += byteHalfLen;
-
-				// BYTE prime2[rsapubkey.bitlen/16];
-				rsap.Q = new byte [byteHalfLen];
-				Buffer.BlockCopy (blob, pos, rsap.Q, 0, byteHalfLen);
-				Array.Reverse (rsap.Q);
-				pos += byteHalfLen;
-
-				// BYTE exponent1[rsapubkey.bitlen/16];
-				rsap.DP = new byte [byteHalfLen];
-				Buffer.BlockCopy (blob, pos, rsap.DP, 0, byteHalfLen);
-				Array.Reverse (rsap.DP);
-				pos += byteHalfLen;
-
-				// BYTE exponent2[rsapubkey.bitlen/16];
-				rsap.DQ = new byte [byteHalfLen];
-				Buffer.BlockCopy (blob, pos, rsap.DQ, 0, byteHalfLen);
-				Array.Reverse (rsap.DQ);
-				pos += byteHalfLen;
-
-				// BYTE coefficient[rsapubkey.bitlen/16];
-				rsap.InverseQ = new byte [byteHalfLen];
-				Buffer.BlockCopy (blob, pos, rsap.InverseQ, 0, byteHalfLen);
-				Array.Reverse (rsap.InverseQ);
-				pos += byteHalfLen;
-
-				// ok, this is hackish but CryptoAPI support it so...
-				// note: only works because CRT is used by default
-				// http://bugzilla.ximian.com/show_bug.cgi?id=57941
-				rsap.D = new byte [byteLen]; // must be allocated
-				if (pos + byteLen + offset <= blob.Length) {
-					// BYTE privateExponent[rsapubkey.bitlen/8];
-					Buffer.BlockCopy (blob, pos, rsap.D, 0, byteLen);
-					Array.Reverse (rsap.D);
-				}
-			}
-			catch (Exception e) {
-				throw new CryptographicException ("Invalid blob.", e);
-			}
-
-            RSA rsa = null;
-            try
-            {
-                rsa = RSA.Create();
-                rsa.ImportParameters(rsap);
-            }
-            catch (CryptographicException ce)
-            {
-                // this may cause problem when this code is run under
-                // the SYSTEM identity on Windows (e.g. ASP.NET). See
-                // http://bugzilla.ximian.com/show_bug.cgi?id=77559
-                try
-                {
-                    CspParameters csp = new CspParameters();
-                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
-                    rsa = new RSACryptoServiceProvider(csp);
-                    rsa.ImportParameters(rsap);
-                }
-                catch
-                {
-                    // rethrow original, not the later, exception if this fails
-                    throw ce;
-                }
-            }
-            return rsa;
-		}
-
-		static public DSA FromCapiPrivateKeyBlobDSA (byte[] blob)
-		{
-			return FromCapiPrivateKeyBlobDSA (blob, 0);
-		}
-
-		static public DSA FromCapiPrivateKeyBlobDSA (byte[] blob, int offset)
-		{
-			if (blob == null)
-				throw new ArgumentNullException ("blob");
-			if (offset >= blob.Length)
-				throw new ArgumentException ("blob is too small.");
-
-			DSAParameters dsap = new DSAParameters ();
-			try {
-				if ((blob [offset] != 0x07) ||				// PRIVATEKEYBLOB (0x07)
-				    (blob [offset + 1] != 0x02) ||			// Version (0x02)
-				    (blob [offset + 2] != 0x00) ||			// Reserved (word)
-				    (blob [offset + 3] != 0x00) ||
-				    (ToUInt32LE (blob, offset + 8) != 0x32535344))	// DWORD magic
-					throw new CryptographicException ("Invalid blob header");
-
-				int bitlen = ToInt32LE (blob, offset + 12);
-				int bytelen = bitlen >> 3;
-				int pos = offset + 16;
-
-				dsap.P = new byte [bytelen];
-				Buffer.BlockCopy (blob, pos, dsap.P, 0, bytelen);
-				Array.Reverse (dsap.P);
-				pos += bytelen;
-
-				dsap.Q = new byte [20];
-				Buffer.BlockCopy (blob, pos, dsap.Q, 0, 20);
-				Array.Reverse (dsap.Q);
-				pos += 20;
-
-				dsap.G = new byte [bytelen];
-				Buffer.BlockCopy (blob, pos, dsap.G, 0, bytelen);
-				Array.Reverse (dsap.G);
-				pos += bytelen;
-
-				dsap.X = new byte [20];
-				Buffer.BlockCopy (blob, pos, dsap.X, 0, 20);
-				Array.Reverse (dsap.X);
-				pos += 20;
-
-				dsap.Counter = ToInt32LE (blob, pos);
-				pos += 4;
-
-				dsap.Seed = new byte [20];
-				Buffer.BlockCopy (blob, pos, dsap.Seed, 0, 20);
-				Array.Reverse (dsap.Seed);
-				pos += 20;
-			}
-			catch (Exception e) {
-				throw new CryptographicException ("Invalid blob.", e);
-			}
-
-            DSA dsa = null;
-            try
-            {
-                dsa = (DSA)DSA.Create();
-                dsa.ImportParameters(dsap);
-            }
-            catch (CryptographicException ce)
-            {
-                // this may cause problem when this code is run under
-                // the SYSTEM identity on Windows (e.g. ASP.NET). See
-                // http://bugzilla.ximian.com/show_bug.cgi?id=77559
-                try
-                {
-                    CspParameters csp = new CspParameters();
-                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
-                    dsa = new DSACryptoServiceProvider(csp);
-                    dsa.ImportParameters(dsap);
-                }
-                catch
-                {
-                    // rethrow original, not the later, exception if this fails
-                    throw ce;
-                }
-            }
-            return dsa;
-		}
-
-		static public byte[] ToCapiPrivateKeyBlob (RSA rsa) 
-		{
-			RSAParameters p = rsa.ExportParameters (true);
-			int keyLength = p.Modulus.Length; // in bytes
-			byte[] blob = new byte [20 + (keyLength << 2) + (keyLength >> 1)];
-
-			blob [0] = 0x07;	// Type - PRIVATEKEYBLOB (0x07)
-			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
-			// [2], [3]		// RESERVED - Always 0
-			blob [5] = 0x24;	// ALGID - Always 00 24 00 00 (for CALG_RSA_SIGN)
-			blob [8] = 0x52;	// Magic - RSA2 (ASCII in hex)
-			blob [9] = 0x53;
-			blob [10] = 0x41;
-			blob [11] = 0x32;
-
-			byte[] bitlen = GetBytesLE (keyLength << 3);
-			blob [12] = bitlen [0];	// bitlen
-			blob [13] = bitlen [1];	
-			blob [14] = bitlen [2];	
-			blob [15] = bitlen [3];
-
-			// public exponent (DWORD)
-			int pos = 16;
-			int n = p.Exponent.Length;
-			while (n > 0)
-				blob [pos++] = p.Exponent [--n];
-			// modulus
-			pos = 20;
-			byte[] part = p.Modulus;
-			int len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-			pos += len;
-			// private key
-			part = p.P;
-			len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-			pos += len;
-
-			part = p.Q;
-			len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-			pos += len;
-
-			part = p.DP;
-			len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-			pos += len;
-
-			part = p.DQ;
-			len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-			pos += len;
-
-			part = p.InverseQ;
-			len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-			pos += len;
-
-			part = p.D;
-			len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-
-			return blob;
-		}
-
-		static public byte[] ToCapiPrivateKeyBlob (DSA dsa)
-		{
-			DSAParameters p = dsa.ExportParameters (true);
-			int keyLength = p.P.Length; // in bytes
-
-			// header + P + Q + G + X + count + seed
-			byte[] blob = new byte [16 + keyLength + 20 + keyLength + 20 + 4 + 20];
-
-			blob [0] = 0x07;	// Type - PRIVATEKEYBLOB (0x07)
-			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
-			// [2], [3]		// RESERVED - Always 0
-			blob [5] = 0x22;	// ALGID
-			blob [8] = 0x44;	// Magic
-			blob [9] = 0x53;
-			blob [10] = 0x53;
-			blob [11] = 0x32;
-
-			byte[] bitlen = GetBytesLE (keyLength << 3);
-			blob [12] = bitlen [0];
-			blob [13] = bitlen [1];
-			blob [14] = bitlen [2];
-			blob [15] = bitlen [3];
-
-			int pos = 16;
-			byte[] part = p.P;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
-			pos += keyLength;
-
-			part = p.Q;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, 20);
-			pos += 20;
-
-			part = p.G;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
-			pos += keyLength;
-
-			part = p.X;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, 20);
-			pos += 20;
-
-			Buffer.BlockCopy (GetBytesLE (p.Counter), 0, blob, pos, 4);
-			pos += 4;
-
-			part = p.Seed;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, 20);
-
-			return blob;
-		}
-
-		static public RSA FromCapiPublicKeyBlob (byte[] blob) 
-		{
-			return FromCapiPublicKeyBlob (blob, 0);
-		}
-
-		static public RSA FromCapiPublicKeyBlob (byte[] blob, int offset) 
-		{
-			if (blob == null)
-				throw new ArgumentNullException ("blob");
-			if (offset >= blob.Length)
-				throw new ArgumentException ("blob is too small.");
-
-			try {
-				if ((blob [offset]   != 0x06) ||				// PUBLICKEYBLOB (0x06)
-				    (blob [offset+1] != 0x02) ||				// Version (0x02)
-				    (blob [offset+2] != 0x00) ||				// Reserved (word)
-				    (blob [offset+3] != 0x00) || 
-				    (ToUInt32LE (blob, offset+8) != 0x31415352))	// DWORD magic = RSA1
-					throw new CryptographicException ("Invalid blob header");
-
-				// ALGID (CALG_RSA_SIGN, CALG_RSA_KEYX, ...)
-				// int algId = ToInt32LE (blob, offset+4);
-
-				// DWORD bitlen
-				int bitLen = ToInt32LE (blob, offset+12);
-
-				// DWORD public exponent
-				RSAParameters rsap = new RSAParameters ();
-				rsap.Exponent = new byte [3];
-				rsap.Exponent [0] = blob [offset+18];
-				rsap.Exponent [1] = blob [offset+17];
-				rsap.Exponent [2] = blob [offset+16];
-			
-				int pos = offset+20;
-				// BYTE modulus[rsapubkey.bitlen/8];
-				int byteLen = (bitLen >> 3);
-				rsap.Modulus = new byte [byteLen];
-				Buffer.BlockCopy (blob, pos, rsap.Modulus, 0, byteLen);
-				Array.Reverse (rsap.Modulus);
-                RSA rsa = null;
-                try
-                {
-                    rsa = RSA.Create();
-                    rsa.ImportParameters(rsap);
-                }
-                catch (CryptographicException)
-                {
-                    // this may cause problem when this code is run under
-                    // the SYSTEM identity on Windows (e.g. ASP.NET). See
-                    // http://bugzilla.ximian.com/show_bug.cgi?id=77559
-                    CspParameters csp = new CspParameters();
-                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
-                    rsa = new RSACryptoServiceProvider(csp);
-                    rsa.ImportParameters(rsap);
-                }
-                return rsa;
-			}
-			catch (Exception e) {
-				throw new CryptographicException ("Invalid blob.", e);
-			}
-		}
-
-		static public DSA FromCapiPublicKeyBlobDSA (byte[] blob)
-		{
-			return FromCapiPublicKeyBlobDSA (blob, 0);
-		}
-
-		static public DSA FromCapiPublicKeyBlobDSA (byte[] blob, int offset)
-		{
-			if (blob == null)
-				throw new ArgumentNullException ("blob");
-			if (offset >= blob.Length)
-				throw new ArgumentException ("blob is too small.");
-
-			try {
-				if ((blob [offset] != 0x06) ||				// PUBLICKEYBLOB (0x06)
-				    (blob [offset + 1] != 0x02) ||			// Version (0x02)
-				    (blob [offset + 2] != 0x00) ||			// Reserved (word)
-				    (blob [offset + 3] != 0x00) ||
-				    (ToUInt32LE (blob, offset + 8) != 0x31535344))	// DWORD magic
-					throw new CryptographicException ("Invalid blob header");
-
-				int bitlen = ToInt32LE (blob, offset + 12);
-				DSAParameters dsap = new DSAParameters ();
-				int bytelen = bitlen >> 3;
-				int pos = offset + 16;
-
-				dsap.P = new byte [bytelen];
-				Buffer.BlockCopy (blob, pos, dsap.P, 0, bytelen);
-				Array.Reverse (dsap.P);
-				pos += bytelen;
-
-				dsap.Q = new byte [20];
-				Buffer.BlockCopy (blob, pos, dsap.Q, 0, 20);
-				Array.Reverse (dsap.Q);
-				pos += 20;
-
-				dsap.G = new byte [bytelen];
-				Buffer.BlockCopy (blob, pos, dsap.G, 0, bytelen);
-				Array.Reverse (dsap.G);
-				pos += bytelen;
-
-				dsap.Y = new byte [bytelen];
-				Buffer.BlockCopy (blob, pos, dsap.Y, 0, bytelen);
-				Array.Reverse (dsap.Y);
-				pos += bytelen;
-
-				dsap.Counter = ToInt32LE (blob, pos);
-				pos += 4;
-
-				dsap.Seed = new byte [20];
-				Buffer.BlockCopy (blob, pos, dsap.Seed, 0, 20);
-				Array.Reverse (dsap.Seed);
-				pos += 20;
-
-				DSA dsa = (DSA)DSA.Create ();
-				dsa.ImportParameters (dsap);
-				return dsa;
-			}
-			catch (Exception e) {
-				throw new CryptographicException ("Invalid blob.", e);
-			}
-		}
-
-		static public byte[] ToCapiPublicKeyBlob (RSA rsa) 
-		{
-			RSAParameters p = rsa.ExportParameters (false);
-			int keyLength = p.Modulus.Length; // in bytes
-			byte[] blob = new byte [20 + keyLength];
-
-			blob [0] = 0x06;	// Type - PUBLICKEYBLOB (0x06)
-			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
-			// [2], [3]		// RESERVED - Always 0
-			blob [5] = 0x24;	// ALGID - Always 00 24 00 00 (for CALG_RSA_SIGN)
-			blob [8] = 0x52;	// Magic - RSA1 (ASCII in hex)
-			blob [9] = 0x53;
-			blob [10] = 0x41;
-			blob [11] = 0x31;
-
-			byte[] bitlen = GetBytesLE (keyLength << 3);
-			blob [12] = bitlen [0];	// bitlen
-			blob [13] = bitlen [1];	
-			blob [14] = bitlen [2];	
-			blob [15] = bitlen [3];
-
-			// public exponent (DWORD)
-			int pos = 16;
-			int n = p.Exponent.Length;
-			while (n > 0)
-				blob [pos++] = p.Exponent [--n];
-			// modulus
-			pos = 20;
-			byte[] part = p.Modulus;
-			int len = part.Length;
-			Array.Reverse (part, 0, len);
-			Buffer.BlockCopy (part, 0, blob, pos, len);
-			pos += len;
-			return blob;
-		}
-
-		static public byte[] ToCapiPublicKeyBlob (DSA dsa)
-		{
-			DSAParameters p = dsa.ExportParameters (false);
-			int keyLength = p.P.Length; // in bytes
-
-			// header + P + Q + G + Y + count + seed
-			byte[] blob = new byte [16 + keyLength + 20 + keyLength + keyLength + 4 + 20];
-
-			blob [0] = 0x06;	// Type - PUBLICKEYBLOB (0x06)
-			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
-			// [2], [3]		// RESERVED - Always 0
-			blob [5] = 0x22;	// ALGID
-			blob [8] = 0x44;	// Magic
-			blob [9] = 0x53;
-			blob [10] = 0x53;
-			blob [11] = 0x31;
-
-			byte[] bitlen = GetBytesLE (keyLength << 3);
-			blob [12] = bitlen [0];
-			blob [13] = bitlen [1];
-			blob [14] = bitlen [2];
-			blob [15] = bitlen [3];
-
-			int pos = 16;
-			byte[] part;
-
-			part = p.P;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
-			pos += keyLength;
-
-			part = p.Q;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, 20);
-			pos += 20;
-
-			part = p.G;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
-			pos += keyLength;
-
-			part = p.Y;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
-			pos += keyLength;
-
-			Buffer.BlockCopy (GetBytesLE (p.Counter), 0, blob, pos, 4);
-			pos += 4;
-
-			part = p.Seed;
-			Array.Reverse (part);
-			Buffer.BlockCopy (part, 0, blob, pos, 20);
-
-			return blob;
-		}
-
-		// PRIVATEKEYBLOB
-		// PUBLICKEYBLOB
-		static public RSA FromCapiKeyBlob (byte[] blob) 
-		{
-			return FromCapiKeyBlob (blob, 0);
-		}
-
-		static public RSA FromCapiKeyBlob (byte[] blob, int offset) 
-		{
-			if (blob == null)
-				throw new ArgumentNullException ("blob");
-			if (offset >= blob.Length)
-				throw new ArgumentException ("blob is too small.");
-
-			switch (blob [offset]) {
-				case 0x00:
-					// this could be a public key inside an header
-					// like "sn -e" would produce
-					if (blob [offset + 12] == 0x06) {
-						return FromCapiPublicKeyBlob (blob, offset + 12);
-					}
-					break;
-				case 0x06:
-					return FromCapiPublicKeyBlob (blob, offset);
-				case 0x07:
-					return FromCapiPrivateKeyBlob (blob, offset);
-			}
-			throw new CryptographicException ("Unknown blob format.");
-		}
-
-		static public DSA FromCapiKeyBlobDSA (byte[] blob)
-		{
-			return FromCapiKeyBlobDSA (blob, 0);
-		}
-
-		static public DSA FromCapiKeyBlobDSA (byte[] blob, int offset)
-		{
-			if (blob == null)
-				throw new ArgumentNullException ("blob");
-			if (offset >= blob.Length)
-				throw new ArgumentException ("blob is too small.");
-
-			switch (blob [offset]) {
-				case 0x06:
-					return FromCapiPublicKeyBlobDSA (blob, offset);
-				case 0x07:
-					return FromCapiPrivateKeyBlobDSA (blob, offset);
-			}
-			throw new CryptographicException ("Unknown blob format.");
-		}
-
-		static public byte[] ToCapiKeyBlob (AsymmetricAlgorithm keypair, bool includePrivateKey) 
-		{
-			if (keypair == null)
-				throw new ArgumentNullException ("keypair");
-
-			// check between RSA and DSA (and potentially others like DH)
-			if (keypair is RSA)
-				return ToCapiKeyBlob ((RSA)keypair, includePrivateKey);
-			else if (keypair is DSA)
-				return ToCapiKeyBlob ((DSA)keypair, includePrivateKey);
-			else
-				return null;	// TODO
-		}
-
-		static public byte[] ToCapiKeyBlob (RSA rsa, bool includePrivateKey) 
-		{
-			if (rsa == null)
-				throw new ArgumentNullException ("rsa");
-
-			if (includePrivateKey)
-				return ToCapiPrivateKeyBlob (rsa);
-			else
-				return ToCapiPublicKeyBlob (rsa);
-		}
-
-		static public byte[] ToCapiKeyBlob (DSA dsa, bool includePrivateKey)
-		{
-			if (dsa == null)
-				throw new ArgumentNullException ("dsa");
-
-			if (includePrivateKey)
-				return ToCapiPrivateKeyBlob (dsa);
-			else
-				return ToCapiPublicKeyBlob (dsa);
-		}
-
-		static public string ToHex (byte[] input) 
-		{
-			if (input == null)
-				return null;
-
-			StringBuilder sb = new StringBuilder (input.Length * 2);
-			foreach (byte b in input) {
-				sb.Append (b.ToString ("X2", CultureInfo.InvariantCulture));
-			}
-			return sb.ToString ();
-		}
-
-		static private byte FromHexChar (char c) 
-		{
-			if ((c >= 'a') && (c <= 'f'))
-				return (byte) (c - 'a' + 10);
-			if ((c >= 'A') && (c <= 'F'))
-				return (byte) (c - 'A' + 10);
-			if ((c >= '0') && (c <= '9'))
-				return (byte) (c - '0');
-			throw new ArgumentException ("invalid hex char");
-		}
-
-		static public byte[] FromHex (string hex) 
-		{
-			if (hex == null)
-				return null;
-			if ((hex.Length & 0x1) == 0x1)
-				throw new ArgumentException ("Length must be a multiple of 2");
-
-			byte[] result = new byte [hex.Length >> 1];
-			int n = 0;
-			int i = 0;
-			while (n < result.Length) {
-				result [n] = (byte) (FromHexChar (hex [i++]) << 4);
-				result [n++] += FromHexChar (hex [i++]);
-			}
-			return result;
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/PKCS1.cs b/MediaBrowser.Server.Mono/Security/PKCS1.cs
deleted file mode 100644
index 86ed6f2d8..000000000
--- a/MediaBrowser.Server.Mono/Security/PKCS1.cs
+++ /dev/null
@@ -1,490 +0,0 @@
-//
-// PKCS1.cs - Implements PKCS#1 primitives.
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@xamarin.com>
-//
-// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Security.Cryptography;
-
-namespace MediaBrowser.Server.Mono.Security { 
-
-	// References:
-	// a.	PKCS#1: RSA Cryptography Standard 
-	//	http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/index.html
-	
-    public sealed class PKCS1 {
-
-		private PKCS1 () 
-		{
-		}
-
-		private static bool Compare (byte[] array1, byte[] array2) 
-		{
-			bool result = (array1.Length == array2.Length);
-			if (result) {
-				for (int i=0; i < array1.Length; i++)
-					if (array1[i] != array2[i])
-						return false;
-			}
-			return result;
-		}
-	
-		private static byte[] xor (byte[] array1, byte[] array2) 
-		{
-			byte[] result = new byte [array1.Length];
-			for (int i=0; i < result.Length; i++)
-				result[i] = (byte) (array1[i] ^ array2[i]);
-			return result;
-		}
-	
-		private static byte[] emptySHA1   = { 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09 };
-		private static byte[] emptySHA256 = { 0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55 };
-		private static byte[] emptySHA384 = { 0x38, 0xb0, 0x60, 0xa7, 0x51, 0xac, 0x96, 0x38, 0x4c, 0xd9, 0x32, 0x7e, 0xb1, 0xb1, 0xe3, 0x6a, 0x21, 0xfd, 0xb7, 0x11, 0x14, 0xbe, 0x07, 0x43, 0x4c, 0x0c, 0xc7, 0xbf, 0x63, 0xf6, 0xe1, 0xda, 0x27, 0x4e, 0xde, 0xbf, 0xe7, 0x6f, 0x65, 0xfb, 0xd5, 0x1a, 0xd2, 0xf1, 0x48, 0x98, 0xb9, 0x5b };
-		private static byte[] emptySHA512 = { 0xcf, 0x83, 0xe1, 0x35, 0x7e, 0xef, 0xb8, 0xbd, 0xf1, 0x54, 0x28, 0x50, 0xd6, 0x6d, 0x80, 0x07, 0xd6, 0x20, 0xe4, 0x05, 0x0b, 0x57, 0x15, 0xdc, 0x83, 0xf4, 0xa9, 0x21, 0xd3, 0x6c, 0xe9, 0xce, 0x47, 0xd0, 0xd1, 0x3c, 0x5d, 0x85, 0xf2, 0xb0, 0xff, 0x83, 0x18, 0xd2, 0x87, 0x7e, 0xec, 0x2f, 0x63, 0xb9, 0x31, 0xbd, 0x47, 0x41, 0x7a, 0x81, 0xa5, 0x38, 0x32, 0x7a, 0xf9, 0x27, 0xda, 0x3e };
-	
-		private static byte[] GetEmptyHash (HashAlgorithm hash) 
-		{
-			if (hash is SHA1)
-				return emptySHA1;
-			else if (hash is SHA256)
-				return emptySHA256;
-			else if (hash is SHA384)
-				return emptySHA384;
-			else if (hash is SHA512)
-				return emptySHA512;
-			else
-				return hash.ComputeHash ((byte[])null);
-		}
-	
-		// PKCS #1 v.2.1, Section 4.1
-		// I2OSP converts a non-negative integer to an octet string of a specified length.
-		public static byte[] I2OSP (int x, int size) 
-		{
-			byte[] array = BitConverterLE.GetBytes (x);
-			Array.Reverse (array, 0, array.Length);
-			return I2OSP (array, size);
-		}
-	
-		public static byte[] I2OSP (byte[] x, int size) 
-		{
-			byte[] result = new byte [size];
-			Buffer.BlockCopy (x, 0, result, (result.Length - x.Length), x.Length);
-			return result;
-		}
-	
-		// PKCS #1 v.2.1, Section 4.2
-		// OS2IP converts an octet string to a nonnegative integer.
-		public static byte[] OS2IP (byte[] x) 
-		{
-			int i = 0;
-			while ((x [i++] == 0x00) && (i < x.Length)) {
-				// confuse compiler into reporting a warning with {}
-			}
-			i--;
-			if (i > 0) {
-				byte[] result = new byte [x.Length - i];
-				Buffer.BlockCopy (x, i, result, 0, result.Length);
-				return result;
-			}
-			else
-				return x;
-		}
-	
-		// PKCS #1 v.2.1, Section 5.1.1
-		public static byte[] RSAEP (RSA rsa, byte[] m) 
-		{
-			// c = m^e mod n
-			return rsa.EncryptValue (m);
-		}
-	
-		// PKCS #1 v.2.1, Section 5.1.2
-		public static byte[] RSADP (RSA rsa, byte[] c) 
-		{
-			// m = c^d mod n
-			// Decrypt value may apply CRT optimizations
-			return rsa.DecryptValue (c);
-		}
-	
-		// PKCS #1 v.2.1, Section 5.2.1
-		public static byte[] RSASP1 (RSA rsa, byte[] m) 
-		{
-			// first form: s = m^d mod n
-			// Decrypt value may apply CRT optimizations
-			return rsa.DecryptValue (m);
-		}
-	
-		// PKCS #1 v.2.1, Section 5.2.2
-		public static byte[] RSAVP1 (RSA rsa, byte[] s) 
-		{
-			// m = s^e mod n
-			return rsa.EncryptValue (s);
-		}
-	
-		// PKCS #1 v.2.1, Section 7.1.1
-		// RSAES-OAEP-ENCRYPT ((n, e), M, L)
-		public static byte[] Encrypt_OAEP (RSA rsa, HashAlgorithm hash, RandomNumberGenerator rng, byte[] M) 
-		{
-			int size = rsa.KeySize / 8;
-			int hLen = hash.HashSize / 8;
-			if (M.Length > size - 2 * hLen - 2)
-				throw new CryptographicException ("message too long");
-			// empty label L SHA1 hash
-			byte[] lHash = GetEmptyHash (hash);
-			int PSLength = (size - M.Length - 2 * hLen - 2);
-			// DB = lHash || PS || 0x01 || M
-			byte[] DB = new byte [lHash.Length + PSLength + 1 + M.Length];
-			Buffer.BlockCopy (lHash, 0, DB, 0, lHash.Length);
-			DB [(lHash.Length + PSLength)] = 0x01;
-			Buffer.BlockCopy (M, 0, DB, (DB.Length - M.Length), M.Length);
-	
-			byte[] seed = new byte [hLen];
-			rng.GetBytes (seed);
-	
-			byte[] dbMask = MGF1 (hash, seed, size - hLen - 1);
-			byte[] maskedDB = xor (DB, dbMask);
-			byte[] seedMask = MGF1 (hash, maskedDB, hLen);
-			byte[] maskedSeed = xor (seed, seedMask);
-			// EM = 0x00 || maskedSeed || maskedDB
-			byte[] EM = new byte [maskedSeed.Length + maskedDB.Length + 1];
-			Buffer.BlockCopy (maskedSeed, 0, EM, 1, maskedSeed.Length);
-			Buffer.BlockCopy (maskedDB, 0, EM, maskedSeed.Length + 1, maskedDB.Length);
-	
-			byte[] m = OS2IP (EM);
-			byte[] c = RSAEP (rsa, m);
-			return I2OSP (c, size);
-		}
-	
-		// PKCS #1 v.2.1, Section 7.1.2
-		// RSAES-OAEP-DECRYPT (K, C, L)
-		public static byte[] Decrypt_OAEP (RSA rsa, HashAlgorithm hash, byte[] C) 
-		{
-			int size = rsa.KeySize / 8;
-			int hLen = hash.HashSize / 8;
-			if ((size < (2 * hLen + 2)) || (C.Length != size))
-				throw new CryptographicException ("decryption error");
-	
-			byte[] c = OS2IP (C);
-			byte[] m = RSADP (rsa, c);
-			byte[] EM = I2OSP (m, size);
-	
-			// split EM = Y || maskedSeed || maskedDB
-			byte[] maskedSeed = new byte [hLen];
-			Buffer.BlockCopy (EM, 1, maskedSeed, 0, maskedSeed.Length);
-			byte[] maskedDB = new byte [size - hLen - 1];
-			Buffer.BlockCopy (EM, (EM.Length - maskedDB.Length), maskedDB, 0, maskedDB.Length);
-	
-			byte[] seedMask = MGF1 (hash, maskedDB, hLen);
-			byte[] seed = xor (maskedSeed, seedMask);
-			byte[] dbMask = MGF1 (hash, seed, size - hLen - 1);
-			byte[] DB = xor (maskedDB, dbMask);
-	
-			byte[] lHash = GetEmptyHash (hash);
-			// split DB = lHash' || PS || 0x01 || M
-			byte[] dbHash = new byte [lHash.Length];
-			Buffer.BlockCopy (DB, 0, dbHash, 0, dbHash.Length);
-			bool h = Compare (lHash, dbHash);
-	
-			// find separator 0x01
-			int nPos = lHash.Length;
-			while (DB[nPos] == 0)
-				nPos++;
-	
-			int Msize = DB.Length - nPos - 1;
-			byte[] M = new byte [Msize];
-			Buffer.BlockCopy (DB, (nPos + 1), M, 0, Msize);
-	
-			// we could have returned EM[0] sooner but would be helping a timing attack
-			if ((EM[0] != 0) || (!h) || (DB[nPos] != 0x01))
-				return null;
-			return M;
-		}
-	
-		// PKCS #1 v.2.1, Section 7.2.1
-		// RSAES-PKCS1-V1_5-ENCRYPT ((n, e), M)
-		public static byte[] Encrypt_v15 (RSA rsa, RandomNumberGenerator rng, byte[] M) 
-		{
-			int size = rsa.KeySize / 8;
-			if (M.Length > size - 11)
-				throw new CryptographicException ("message too long");
-			int PSLength = System.Math.Max (8, (size - M.Length - 3));
-			byte[] PS = new byte [PSLength];
-			rng.GetNonZeroBytes (PS);
-			byte[] EM = new byte [size];
-			EM [1] = 0x02;
-			Buffer.BlockCopy (PS, 0, EM, 2, PSLength);
-			Buffer.BlockCopy (M, 0, EM, (size - M.Length), M.Length);
-	
-			byte[] m = OS2IP (EM);
-			byte[] c = RSAEP (rsa, m);
-			byte[] C = I2OSP (c, size);
-			return C;
-		}
-	
-		// PKCS #1 v.2.1, Section 7.2.2
-		// RSAES-PKCS1-V1_5-DECRYPT (K, C)
-		public static byte[] Decrypt_v15 (RSA rsa, byte[] C) 
-		{
-			int size = rsa.KeySize >> 3; // div by 8
-			if ((size < 11) || (C.Length > size))
-				throw new CryptographicException ("decryption error");
-			byte[] c = OS2IP (C);
-			byte[] m = RSADP (rsa, c);
-			byte[] EM = I2OSP (m, size);
-	
-			if ((EM [0] != 0x00) || (EM [1] != 0x02))
-				return null;
-	
-			int mPos = 10;
-			// PS is a minimum of 8 bytes + 2 bytes for header
-			while ((EM [mPos] != 0x00) && (mPos < EM.Length))
-				mPos++;
-			if (EM [mPos] != 0x00)
-				return null;
-			mPos++;
-			byte[] M = new byte [EM.Length - mPos];
-			Buffer.BlockCopy (EM, mPos, M, 0, M.Length);
-			return M;
-		}
-	
-		// PKCS #1 v.2.1, Section 8.2.1
-		// RSASSA-PKCS1-V1_5-SIGN (K, M)
-		public static byte[] Sign_v15 (RSA rsa, HashAlgorithm hash, byte[] hashValue) 
-		{
-			int size = (rsa.KeySize >> 3); // div 8
-			byte[] EM = Encode_v15 (hash, hashValue, size);
-			byte[] m = OS2IP (EM);
-			byte[] s = RSASP1 (rsa, m);
-			byte[] S = I2OSP (s, size);
-			return S;
-		}
-
-		internal static byte[] Sign_v15 (RSA rsa, string hashName, byte[] hashValue) 
-		{
-			using (var hash = CreateFromName (hashName))
-				return Sign_v15 (rsa, hash, hashValue);
-		}
-
-		// PKCS #1 v.2.1, Section 8.2.2
-		// RSASSA-PKCS1-V1_5-VERIFY ((n, e), M, S)
-		public static bool Verify_v15 (RSA rsa, HashAlgorithm hash, byte[] hashValue, byte[] signature) 
-		{
-			return Verify_v15 (rsa, hash, hashValue, signature, false);
-		}
-
-		internal static bool Verify_v15 (RSA rsa, string hashName, byte[] hashValue, byte[] signature) 
-		{
-			using (var hash = CreateFromName (hashName))
-				return Verify_v15 (rsa, hash, hashValue, signature, false);
-		}
-
-		// DO NOT USE WITHOUT A VERY GOOD REASON
-		public static bool Verify_v15 (RSA rsa, HashAlgorithm hash, byte [] hashValue, byte [] signature, bool tryNonStandardEncoding)
-		{
-			int size = (rsa.KeySize >> 3); // div 8
-			byte[] s = OS2IP (signature);
-			byte[] m = RSAVP1 (rsa, s);
-			byte[] EM2 = I2OSP (m, size);
-			byte[] EM = Encode_v15 (hash, hashValue, size);
-			bool result = Compare (EM, EM2);
-			if (result || !tryNonStandardEncoding)
-				return result;
-
-			// NOTE: some signatures don't include the hash OID (pretty lame but real)
-			// and compatible with MS implementation. E.g. Verisign Authenticode Timestamps
-
-			// we're making this "as safe as possible"
-			if ((EM2 [0] != 0x00) || (EM2 [1] != 0x01))
-				return false;
-			int i;
-			for (i = 2; i < EM2.Length - hashValue.Length - 1; i++) {
-				if (EM2 [i] != 0xFF)
-					return false;
-			}
-			if (EM2 [i++] != 0x00)
-				return false;
-
-			byte [] decryptedHash = new byte [hashValue.Length];
-			Buffer.BlockCopy (EM2, i, decryptedHash, 0, decryptedHash.Length);
-			return Compare (decryptedHash, hashValue);
-		}
-	
-		// PKCS #1 v.2.1, Section 9.2
-		// EMSA-PKCS1-v1_5-Encode
-		public static byte[] Encode_v15 (HashAlgorithm hash, byte[] hashValue, int emLength) 
-		{
-			if (hashValue.Length != (hash.HashSize >> 3))
-				throw new CryptographicException ("bad hash length for " + hash.ToString ());
-
-			// DigestInfo ::= SEQUENCE {
-			//	digestAlgorithm AlgorithmIdentifier,
-			//	digest OCTET STRING
-			// }
-		
-			byte[] t = null;
-
-			string oid = CryptoConfig.MapNameToOID (hash.ToString ());
-			if (oid != null)
-			{
-				ASN1 digestAlgorithm = new ASN1 (0x30);
-				digestAlgorithm.Add (new ASN1 (CryptoConfig.EncodeOID (oid)));
-				digestAlgorithm.Add (new ASN1 (0x05));		// NULL
-				ASN1 digest = new ASN1 (0x04, hashValue);
-				ASN1 digestInfo = new ASN1 (0x30);
-				digestInfo.Add (digestAlgorithm);
-				digestInfo.Add (digest);
-
-				t = digestInfo.GetBytes ();
-			}
-			else
-			{
-				// There are no valid OID, in this case t = hashValue
-				// This is the case of the MD5SHA hash algorithm
-				t = hashValue;
-			}
-
-			Buffer.BlockCopy (hashValue, 0, t, t.Length - hashValue.Length, hashValue.Length);
-	
-			int PSLength = System.Math.Max (8, emLength - t.Length - 3);
-			// PS = PSLength of 0xff
-	
-			// EM = 0x00 | 0x01 | PS | 0x00 | T
-			byte[] EM = new byte [PSLength + t.Length + 3];
-			EM [1] = 0x01;
-			for (int i=2; i < PSLength + 2; i++)
-				EM[i] = 0xff;
-			Buffer.BlockCopy (t, 0, EM, PSLength + 3, t.Length);
-	
-			return EM;
-		}
-	
-		// PKCS #1 v.2.1, Section B.2.1
-		public static byte[] MGF1 (HashAlgorithm hash, byte[] mgfSeed, int maskLen) 
-		{
-			// 1. If maskLen > 2^32 hLen, output "mask too long" and stop.
-			// easy - this is impossible by using a int (31bits) as parameter ;-)
-			// BUT with a signed int we do have to check for negative values!
-			if (maskLen < 0)
-				throw new OverflowException();
-	
-			int mgfSeedLength = mgfSeed.Length;
-			int hLen = (hash.HashSize >> 3); // from bits to bytes
-			int iterations = (maskLen / hLen);
-			if (maskLen % hLen != 0)
-				iterations++;
-			// 2. Let T be the empty octet string.
-			byte[] T = new byte [iterations * hLen];
-	
-			byte[] toBeHashed = new byte [mgfSeedLength + 4];
-			int pos = 0;
-			// 3. For counter from 0 to \ceil (maskLen / hLen) - 1, do the following:
-			for (int counter = 0; counter < iterations; counter++) {
-				// a.	Convert counter to an octet string C of length 4 octets
-				byte[] C = I2OSP (counter, 4); 
-	
-				// b.	Concatenate the hash of the seed mgfSeed and C to the octet string T:
-				//	T = T || Hash (mgfSeed || C)
-				Buffer.BlockCopy (mgfSeed, 0, toBeHashed, 0, mgfSeedLength);
-				Buffer.BlockCopy (C, 0, toBeHashed, mgfSeedLength, 4);
-				byte[] output = hash.ComputeHash (toBeHashed);
-				Buffer.BlockCopy (output, 0, T, pos, hLen);
-				pos += hLen;
-			}
-			
-			// 4. Output the leading maskLen octets of T as the octet string mask.
-			byte[] mask = new byte [maskLen];
-			Buffer.BlockCopy (T, 0, mask, 0, maskLen);
-			return mask;
-		}
-
-		static internal string HashNameFromOid (string oid, bool throwOnError = true)
-		{
-			switch (oid) {
-			case "1.2.840.113549.1.1.2":	// MD2 with RSA encryption 
-				return "MD2";
-			case "1.2.840.113549.1.1.3":	// MD4 with RSA encryption 
-				return "MD4";
-			case "1.2.840.113549.1.1.4":	// MD5 with RSA encryption 
-				return "MD5";
-			case "1.2.840.113549.1.1.5":	// SHA-1 with RSA Encryption 
-			case "1.3.14.3.2.29":		// SHA1 with RSA signature 
-			case "1.2.840.10040.4.3":	// SHA1-1 with DSA
-				return "SHA1";
-			case "1.2.840.113549.1.1.11":	// SHA-256 with RSA Encryption
-				return "SHA256";
-			case "1.2.840.113549.1.1.12":	// SHA-384 with RSA Encryption
-				return "SHA384";
-			case "1.2.840.113549.1.1.13":	// SHA-512 with RSA Encryption
-				return "SHA512";
-			case "1.3.36.3.3.1.2":
-				return "RIPEMD160";
-			default:
-				if (throwOnError)
-					throw new CryptographicException ("Unsupported hash algorithm: " + oid);
-				return null;
-			}
-		}
-		
-		static internal HashAlgorithm CreateFromOid (string oid)
-		{
-			return CreateFromName (HashNameFromOid (oid));
-		}
-		
-		static internal HashAlgorithm CreateFromName (string name)
-		{
-#if FULL_AOT_RUNTIME
-			switch (name) {
-			case "MD2":
-				return MD2.Create ();
-			case "MD4":
-				return MD4.Create ();
-			case "MD5":
-				return MD5.Create ();
-			case "SHA1":
-				return SHA1.Create ();
-			case "SHA256":
-				return SHA256.Create ();
-			case "SHA384":
-				return SHA384.Create ();
-			case "SHA512":
-				return SHA512.Create ();
-			case "RIPEMD160":
-				return RIPEMD160.Create ();
-			default:
-				try {
-					return (HashAlgorithm) Activator.CreateInstance (Type.GetType (name));
-				}
-				catch {
-					throw new CryptographicException ("Unsupported hash algorithm: " + name);
-				}
-			}
-#else
-			return HashAlgorithm.Create (name);
-#endif
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/PKCS12.cs b/MediaBrowser.Server.Mono/Security/PKCS12.cs
deleted file mode 100644
index b5da09c63..000000000
--- a/MediaBrowser.Server.Mono/Security/PKCS12.cs
+++ /dev/null
@@ -1,1933 +0,0 @@
-//
-// PKCS12.cs: PKCS 12 - Personal Information Exchange Syntax
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@xamarin.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004,2005,2006 Novell Inc. (http://www.novell.com)
-// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
-//
-// Key derivation translated from Bouncy Castle JCE (http://www.bouncycastle.org/)
-// See bouncycastle.txt for license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-    public class PKCS5 {
-
-		public const string pbeWithMD2AndDESCBC = "1.2.840.113549.1.5.1";
-		public const string pbeWithMD5AndDESCBC = "1.2.840.113549.1.5.3";
-		public const string pbeWithMD2AndRC2CBC = "1.2.840.113549.1.5.4";
-		public const string pbeWithMD5AndRC2CBC = "1.2.840.113549.1.5.6";
-		public const string pbeWithSHA1AndDESCBC = "1.2.840.113549.1.5.10";
-		public const string pbeWithSHA1AndRC2CBC = "1.2.840.113549.1.5.11";
-
-		public PKCS5 () {}
-	}
-
-    public class PKCS9 {
-
-		public const string friendlyName = "1.2.840.113549.1.9.20";
-		public const string localKeyId = "1.2.840.113549.1.9.21";
-
-		public PKCS9 () {}
-	}
-
-
-	internal class SafeBag {
-		private string _bagOID;
-		private ASN1 _asn1;
-
-		public SafeBag(string bagOID, ASN1 asn1) {
-			_bagOID = bagOID;
-			_asn1 = asn1;
-		}
-
-		public string BagOID {
-			get { return _bagOID; }
-		}
-
-		public ASN1 ASN1 {
-			get { return _asn1; }
-		}
-	}
-
-
-    public class PKCS12 : ICloneable {
-
-		public const string pbeWithSHAAnd128BitRC4 = "1.2.840.113549.1.12.1.1";
-		public const string pbeWithSHAAnd40BitRC4 = "1.2.840.113549.1.12.1.2";
-		public const string pbeWithSHAAnd3KeyTripleDESCBC = "1.2.840.113549.1.12.1.3";
-		public const string pbeWithSHAAnd2KeyTripleDESCBC = "1.2.840.113549.1.12.1.4";
-		public const string pbeWithSHAAnd128BitRC2CBC = "1.2.840.113549.1.12.1.5";
-		public const string pbeWithSHAAnd40BitRC2CBC = "1.2.840.113549.1.12.1.6";
-
-		// bags
-		public const string keyBag  = "1.2.840.113549.1.12.10.1.1";
-		public const string pkcs8ShroudedKeyBag  = "1.2.840.113549.1.12.10.1.2";
-		public const string certBag  = "1.2.840.113549.1.12.10.1.3";
-		public const string crlBag  = "1.2.840.113549.1.12.10.1.4";
-		public const string secretBag  = "1.2.840.113549.1.12.10.1.5";
-		public const string safeContentsBag  = "1.2.840.113549.1.12.10.1.6";
-
-		// types
-		public const string x509Certificate = "1.2.840.113549.1.9.22.1";
- 		public const string sdsiCertificate = "1.2.840.113549.1.9.22.2";
-		public const string x509Crl = "1.2.840.113549.1.9.23.1";
-
-		// Adapted from BouncyCastle PKCS12ParametersGenerator.java
-		public class DeriveBytes {
-
-			public enum Purpose {
-				Key,
-				IV,
-				MAC
-			}
-
-			static private byte[] keyDiversifier = { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 };
-			static private byte[] ivDiversifier  = { 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 };
-			static private byte[] macDiversifier = { 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 };
-
-			private string _hashName;
-			private int _iterations;
-			private byte[] _password;
-			private byte[] _salt;
-
-			public DeriveBytes () {}
-
-			public string HashName {
-				get { return _hashName; } 
-				set { _hashName = value; }
-			}
-
-			public int IterationCount {
-				get { return _iterations; }
-				set { _iterations = value; }
-			}
-
-			public byte[] Password {
-				get { return (byte[]) _password.Clone (); }
-				set { 
-					if (value == null)
-						_password = new byte [0];
-					else
-						_password = (byte[]) value.Clone ();
-				}
-			}
-
-			public byte[] Salt {
-				get { return (byte[]) _salt.Clone ();  }
-				set {
-					if (value != null)
-						_salt = (byte[]) value.Clone ();
-					else
-						_salt = null;
-				}
-			}
-
-			private void Adjust (byte[] a, int aOff, byte[] b) 
-			{
-				int x = (b[b.Length - 1] & 0xff) + (a [aOff + b.Length - 1] & 0xff) + 1;
-
-				a [aOff + b.Length - 1] = (byte) x;
-				x >>= 8;
-
-				for (int i = b.Length - 2; i >= 0; i--) {
-					x += (b [i] & 0xff) + (a [aOff + i] & 0xff);
-					a [aOff + i] = (byte) x;
-					x >>= 8;
-				}
-			}
-
-			private byte[] Derive (byte[] diversifier, int n) 
-			{
-				HashAlgorithm digest = PKCS1.CreateFromName (_hashName);
-				int u = (digest.HashSize >> 3); // div 8
-				int v = 64;
-				byte[] dKey = new byte [n];
-
-				byte[] S;
-				if ((_salt != null) && (_salt.Length != 0)) {
-					S = new byte[v * ((_salt.Length + v - 1) / v)];
-
-					for (int i = 0; i != S.Length; i++) {
-						S[i] = _salt[i % _salt.Length];
-					}
-				}
-				else {
-					S = new byte[0];
-				}
-
-				byte[] P;
-				if ((_password != null) && (_password.Length != 0)) {
-					P = new byte[v * ((_password.Length + v - 1) / v)];
-
-					for (int i = 0; i != P.Length; i++) {
-						P[i] = _password[i % _password.Length];
-					}
-				}
-				else {
-					P = new byte[0];
-				}
-
-				byte[] I = new byte [S.Length + P.Length];
-
-				Buffer.BlockCopy (S, 0, I, 0, S.Length);
-				Buffer.BlockCopy (P, 0, I, S.Length, P.Length);
-
-				byte[]  B = new byte[v];
-				int     c = (n + u - 1) / u;
-
-				for (int i = 1; i <= c; i++) {
-					digest.TransformBlock (diversifier, 0, diversifier.Length, diversifier, 0);
-					digest.TransformFinalBlock (I, 0, I.Length);
-					byte[] A = digest.Hash;
-					digest.Initialize ();
-					for (int j = 1; j != _iterations; j++) {
-						A = digest.ComputeHash (A, 0, A.Length);
-					}
-
-					for (int j = 0; j != B.Length; j++) {
-						B [j] = A [j % A.Length];
-					}
-
-					for (int j = 0; j != I.Length / v; j++) {
-						Adjust (I, j * v, B);
-					}
-
-					if (i == c) {
-						Buffer.BlockCopy(A, 0, dKey, (i - 1) * u, dKey.Length - ((i - 1) * u));
-					}
-					else {
-						Buffer.BlockCopy(A, 0, dKey, (i - 1) * u, A.Length);
-					}
-				}
-
-				return dKey;
-			}
-
-			public byte[] DeriveKey (int size) 
-			{
-				return Derive (keyDiversifier, size);
-			}
-
-			public byte[] DeriveIV (int size) 
-			{
-				return Derive (ivDiversifier, size);
-			}
-
-			public byte[] DeriveMAC (int size) 
-			{
-				return Derive (macDiversifier, size);
-			}
-		}
-
-		const int recommendedIterationCount = 2000;
-
-		//private int _version;
-		private byte[] _password;
-		private ArrayList _keyBags;
-		private ArrayList _secretBags;
-		private X509CertificateCollection _certs;
-		private bool _keyBagsChanged;
-		private bool _secretBagsChanged;
-		private bool _certsChanged;
-		private int _iterations;
-		private ArrayList _safeBags;
-		private RandomNumberGenerator _rng;
-
-		// constructors
-
-		public PKCS12 () 
-		{
-			_iterations = recommendedIterationCount;
-			_keyBags = new ArrayList ();
-			_secretBags = new ArrayList ();
-			_certs = new X509CertificateCollection ();
-			_keyBagsChanged = false;
-			_secretBagsChanged = false;
-			_certsChanged = false;
-			_safeBags = new ArrayList ();
-		}
-
-		public PKCS12 (byte[] data)
-			: this ()
-		{
-			Password = null;
-			Decode (data);
-		}
-
-		/*
-		 * PFX ::= SEQUENCE {
-		 *	version INTEGER {v3(3)}(v3,...),
-		 *	authSafe ContentInfo,
-		 *	macData MacData OPTIONAL
-		 * }
-		 * 
-		 * MacData ::= SEQUENCE {
-		 *	mac DigestInfo,
-		 *	macSalt OCTET STRING,
-		 *	iterations INTEGER DEFAULT 1
-		 *	-- Note: The default is for historical reasons and its use is deprecated. A higher
-		 *	-- value, like 1024 is recommended.
-		 * }
-		 * 
-		 * SafeContents ::= SEQUENCE OF SafeBag
-		 * 
-		 * SafeBag ::= SEQUENCE {
-		 *	bagId BAG-TYPE.&id ({PKCS12BagSet}),
-		 *	bagValue [0] EXPLICIT BAG-TYPE.&Type({PKCS12BagSet}{@bagId}),
-		 *	bagAttributes SET OF PKCS12Attribute OPTIONAL
-		 * }
-		 */
-		public PKCS12 (byte[] data, string password)
-			: this ()
-		{
-			Password = password;
-			Decode (data);
-		}
-
-		public PKCS12 (byte[] data, byte[] password)
-			: this ()
-		{
-			_password = password;
-			Decode (data);
-		}
-
-		private void Decode (byte[] data)
-		{
-			ASN1 pfx = new ASN1 (data);
-			if (pfx.Tag != 0x30)
-				throw new ArgumentException ("invalid data");
-			
-			ASN1 version = pfx [0];
-			if (version.Tag != 0x02)
-				throw new ArgumentException ("invalid PFX version");
-			//_version = version.Value [0];
-
-			PKCS7.ContentInfo authSafe = new PKCS7.ContentInfo (pfx [1]);
-			if (authSafe.ContentType != PKCS7.Oid.data)
-				throw new ArgumentException ("invalid authenticated safe");
-
-			// now that we know it's a PKCS#12 file, check the (optional) MAC
-			// before decoding anything else in the file
-			if (pfx.Count > 2) {
-				ASN1 macData = pfx [2];
-				if (macData.Tag != 0x30)
-					throw new ArgumentException ("invalid MAC");
-				
-				ASN1 mac = macData [0];
-				if (mac.Tag != 0x30)
-					throw new ArgumentException ("invalid MAC");
-				ASN1 macAlgorithm = mac [0];
-				string macOid = ASN1Convert.ToOid (macAlgorithm [0]);
-				if (macOid != "1.3.14.3.2.26")
-					throw new ArgumentException ("unsupported HMAC");
-				byte[] macValue = mac [1].Value;
-
-				ASN1 macSalt = macData [1];
-				if (macSalt.Tag != 0x04)
-					throw new ArgumentException ("missing MAC salt");
-
-				_iterations = 1; // default value
-				if (macData.Count > 2) {
-					ASN1 iters = macData [2];
-					if (iters.Tag != 0x02)
-						throw new ArgumentException ("invalid MAC iteration");
-					_iterations = ASN1Convert.ToInt32 (iters);
-				}
-
-				byte[] authSafeData = authSafe.Content [0].Value;
-				byte[] calculatedMac = MAC (_password, macSalt.Value, _iterations, authSafeData);
-				if (!Compare (macValue, calculatedMac)) {
-					byte[] nullPassword = {0, 0};
-					calculatedMac = MAC(nullPassword, macSalt.Value, _iterations, authSafeData);
-					if (!Compare (macValue, calculatedMac))
-						throw new CryptographicException ("Invalid MAC - file may have been tampe red!");
-					_password = nullPassword;
-				}
-			}
-
-			// we now returns to our original presentation - PFX
-			ASN1 authenticatedSafe = new ASN1 (authSafe.Content [0].Value);
-			for (int i=0; i < authenticatedSafe.Count; i++) {
-				PKCS7.ContentInfo ci = new PKCS7.ContentInfo (authenticatedSafe [i]);
-				switch (ci.ContentType) {
-					case PKCS7.Oid.data:
-						// unencrypted (by PKCS#12)
-						ASN1 safeContents = new ASN1 (ci.Content [0].Value);
-						for (int j=0; j < safeContents.Count; j++) {
-							ASN1 safeBag = safeContents [j];
-							ReadSafeBag (safeBag);
-						}
-						break;
-					case PKCS7.Oid.encryptedData:
-						// password encrypted
-						PKCS7.EncryptedData ed = new PKCS7.EncryptedData (ci.Content [0]);
-						ASN1 decrypted = new ASN1 (Decrypt (ed));
-						for (int j=0; j < decrypted.Count; j++) {
-							ASN1 safeBag = decrypted [j];
-							ReadSafeBag (safeBag);
-						}
-						break;
-					case PKCS7.Oid.envelopedData:
-						// public key encrypted
-						throw new NotImplementedException ("public key encrypted");
-					default:
-						throw new ArgumentException ("unknown authenticatedSafe");
-				}
-			}
-		}
-
-		~PKCS12 () 
-		{
-			if (_password != null) {
-				Array.Clear (_password, 0, _password.Length);
-			}
-			_password = null;
-		}
-
-		// properties
-
-		public string Password {
-			set {
-				// Clear old password.
-				if (_password != null)
-					Array.Clear (_password, 0, _password.Length);
-				_password = null;
-				if (value != null) {
-					if (value.Length > 0) {
-						int size = value.Length;
-						int nul = 0;
-						if (size < MaximumPasswordLength) {
-							// if not present, add space for a NULL (0x00) character
-							if (value[size - 1] != 0x00)
-								nul = 1;
-						} else {
-							size = MaximumPasswordLength;
-						}
-						_password = new byte[(size + nul) << 1]; // double for unicode
-						Encoding.BigEndianUnicode.GetBytes (value, 0, size, _password, 0);
-					} else {
-						// double-byte (Unicode) NULL (0x00) - see bug #79617
-						_password = new byte[2];
-					}
-				}
-			}
-		}
-
-		public int IterationCount {
-			get { return _iterations; }
-			set { _iterations = value; }
-		}
-
-		public ArrayList Keys {
-			get {
-				if (_keyBagsChanged) {
-					_keyBags.Clear ();
-					foreach (SafeBag sb in _safeBags) {
-						if (sb.BagOID.Equals (keyBag)) {
-							ASN1 safeBag = sb.ASN1;
-							ASN1 bagValue = safeBag [1];
-							PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
-							byte[] privateKey = pki.PrivateKey;
-							switch (privateKey [0]) {
-							case 0x02:
-								DSAParameters p = new DSAParameters (); // FIXME
-								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p));
-								break;
-							case 0x30:
-								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeRSA (privateKey));
-								break;
-							default:
-								break;
-							}
-							Array.Clear (privateKey, 0, privateKey.Length);
-
-						} else if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-							ASN1 safeBag = sb.ASN1;
-							ASN1 bagValue = safeBag [1];
-							PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
-							byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
-							PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
-							byte[] privateKey = pki.PrivateKey;
-							switch (privateKey [0]) {
-							case 0x02:
-								DSAParameters p = new DSAParameters (); // FIXME
-								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p));
-								break;
-							case 0x30:
-								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeRSA (privateKey));
-								break;
-							default:
-								break;
-							}
-							Array.Clear (privateKey, 0, privateKey.Length);
-							Array.Clear (decrypted, 0, decrypted.Length);
-						}
-					}
-					_keyBagsChanged = false;
-				}
-				return ArrayList.ReadOnly(_keyBags);
-			}
-		}
-
-		public ArrayList Secrets {
-			get {
-				if (_secretBagsChanged) {
-					_secretBags.Clear ();
-					foreach (SafeBag sb in _safeBags) {
-						if (sb.BagOID.Equals (secretBag)) {
-							ASN1 safeBag = sb.ASN1;
-							ASN1 bagValue = safeBag [1];
-							byte[] secret = bagValue.Value;
-							_secretBags.Add(secret);
-						}
-					}
-					_secretBagsChanged = false;
-				}
-				return ArrayList.ReadOnly(_secretBags);
-			}
-		}
-
-		public X509CertificateCollection Certificates {
-			get {
-				if (_certsChanged) {
-					_certs.Clear ();
-					foreach (SafeBag sb in _safeBags) {
-						if (sb.BagOID.Equals (certBag)) {
-							ASN1 safeBag = sb.ASN1;
-							ASN1 bagValue = safeBag [1];
-							PKCS7.ContentInfo cert = new PKCS7.ContentInfo (bagValue.Value);
-							_certs.Add (new X509Certificate (cert.Content [0].Value));
-						}
-					}
-					_certsChanged = false;
-				}
-				return _certs;
-			}
-		}
-
-		internal RandomNumberGenerator RNG {
-			get {
-				if (_rng == null)
-					_rng = RandomNumberGenerator.Create ();
-				return _rng;
-			}
-		}
-
-		// private methods
-
-		private bool Compare (byte[] expected, byte[] actual) 
-		{
-			bool compare = false;
-			if (expected.Length == actual.Length) {
-				for (int i=0; i < expected.Length; i++) {
-					if (expected [i] != actual [i])
-						return false;
-				}
-				compare = true;
-			}
-			return compare;
-		}
-
-		private SymmetricAlgorithm GetSymmetricAlgorithm (string algorithmOid, byte[] salt, int iterationCount)
-		{
-			string algorithm = null;
-			int keyLength = 8;	// 64 bits (default)
-			int ivLength = 8;	// 64 bits (default)
-
-			PKCS12.DeriveBytes pd = new PKCS12.DeriveBytes ();
-			pd.Password = _password; 
-			pd.Salt = salt;
-			pd.IterationCount = iterationCount;
-
-			switch (algorithmOid) {
-				case PKCS5.pbeWithMD2AndDESCBC:			// no unit test available
-					pd.HashName = "MD2";
-					algorithm = "DES";
-					break;
-				case PKCS5.pbeWithMD5AndDESCBC:			// no unit test available
-					pd.HashName = "MD5";
-					algorithm = "DES";
-					break;
-				case PKCS5.pbeWithMD2AndRC2CBC:			// no unit test available
-					// TODO - RC2-CBC-Parameter (PKCS5)
-					// if missing default to 32 bits !!!
-					pd.HashName = "MD2";
-					algorithm = "RC2";
-					keyLength = 4;		// default
-					break;
-				case PKCS5.pbeWithMD5AndRC2CBC:			// no unit test available
-					// TODO - RC2-CBC-Parameter (PKCS5)
-					// if missing default to 32 bits !!!
-					pd.HashName = "MD5";
-					algorithm = "RC2";
-					keyLength = 4;		// default
-					break;
-				case PKCS5.pbeWithSHA1AndDESCBC: 		// no unit test available
-					pd.HashName = "SHA1";
-					algorithm = "DES";
-					break;
-				case PKCS5.pbeWithSHA1AndRC2CBC:		// no unit test available
-					// TODO - RC2-CBC-Parameter (PKCS5)
-					// if missing default to 32 bits !!!
-					pd.HashName = "SHA1";
-					algorithm = "RC2";
-					keyLength = 4;		// default
-					break;
-				case PKCS12.pbeWithSHAAnd128BitRC4: 		// no unit test available
-					pd.HashName = "SHA1";
-					algorithm = "RC4";
-					keyLength = 16;
-					ivLength = 0;		// N/A
-					break;
-				case PKCS12.pbeWithSHAAnd40BitRC4: 		// no unit test available
-					pd.HashName = "SHA1";
-					algorithm = "RC4";
-					keyLength = 5;
-					ivLength = 0;		// N/A
-					break;
-				case PKCS12.pbeWithSHAAnd3KeyTripleDESCBC: 
-					pd.HashName = "SHA1";
-					algorithm = "TripleDES";
-					keyLength = 24;
-					break;
-				case PKCS12.pbeWithSHAAnd2KeyTripleDESCBC:	// no unit test available
-					pd.HashName = "SHA1";
-					algorithm = "TripleDES";
-					keyLength = 16;
-					break;
-				case PKCS12.pbeWithSHAAnd128BitRC2CBC: 		// no unit test available
-					pd.HashName = "SHA1";
-					algorithm = "RC2";
-					keyLength = 16;
-					break;
-				case PKCS12.pbeWithSHAAnd40BitRC2CBC: 
-					pd.HashName = "SHA1";
-					algorithm = "RC2";
-					keyLength = 5;
-					break;
-				default:
-					throw new NotSupportedException ("unknown oid " + algorithm);
-			}
-
-			SymmetricAlgorithm sa = null;
-            sa = SymmetricAlgorithm.Create(algorithm);
-            sa.Key = pd.DeriveKey (keyLength);
-			// IV required only for block ciphers (not stream ciphers)
-			if (ivLength > 0) {
-				sa.IV = pd.DeriveIV (ivLength);
-				sa.Mode = CipherMode.CBC;
-			}
-			return sa;
-		}
-
-		public byte[] Decrypt (string algorithmOid, byte[] salt, int iterationCount, byte[] encryptedData) 
-		{
-			SymmetricAlgorithm sa = null;
-			byte[] result = null;
-			try {
-				sa = GetSymmetricAlgorithm (algorithmOid, salt, iterationCount);
-				ICryptoTransform ct = sa.CreateDecryptor ();
-				result = ct.TransformFinalBlock (encryptedData, 0, encryptedData.Length);
-			}
-			finally {
-				if (sa != null)
-					sa.Clear ();
-			}
-			return result;
-		}
-
-		public byte[] Decrypt (PKCS7.EncryptedData ed)
-		{
-			return Decrypt (ed.EncryptionAlgorithm.ContentType, 
-				ed.EncryptionAlgorithm.Content [0].Value, 
-				ASN1Convert.ToInt32 (ed.EncryptionAlgorithm.Content [1]),
-				ed.EncryptedContent);
-		}
-
-		public byte[] Encrypt (string algorithmOid, byte[] salt, int iterationCount, byte[] data) 
-		{
-			byte[] result = null;
-			using (SymmetricAlgorithm sa = GetSymmetricAlgorithm (algorithmOid, salt, iterationCount)) {
-				ICryptoTransform ct = sa.CreateEncryptor ();
-				result = ct.TransformFinalBlock (data, 0, data.Length);
-			}
-			return result;
-		}
-
-		private DSAParameters GetExistingParameters (out bool found)
-		{
-			foreach (X509Certificate cert in Certificates) {
-				// FIXME: that won't work if parts of the parameters are missing
-				if (cert.KeyAlgorithmParameters != null) {
-					DSA dsa = cert.DSA;
-					if (dsa != null) {
-						found = true;
-						return dsa.ExportParameters (false);
-					}
-				}
-			}
-			found = false;
-			return new DSAParameters ();
-		}
-
-		private void AddPrivateKey (PKCS8.PrivateKeyInfo pki) 
-		{
-			byte[] privateKey = pki.PrivateKey;
-			switch (privateKey [0]) {
-				case 0x02:
-					bool found;
-					DSAParameters p = GetExistingParameters (out found);
-					if (found) {
-						_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p));
-					}
-					break;
-				case 0x30:
-					_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeRSA (privateKey));
-					break;
-				default:
-					Array.Clear (privateKey, 0, privateKey.Length);
-					throw new CryptographicException ("Unknown private key format");
-			}
-			Array.Clear (privateKey, 0, privateKey.Length);
-		}
-
-		private void ReadSafeBag (ASN1 safeBag) 
-		{
-			if (safeBag.Tag != 0x30)
-				throw new ArgumentException ("invalid safeBag");
-
-			ASN1 bagId = safeBag [0];
-			if (bagId.Tag != 0x06)
-				throw new ArgumentException ("invalid safeBag id");
-
-			ASN1 bagValue = safeBag [1];
-			string oid = ASN1Convert.ToOid (bagId);
-			switch (oid) {
-				case keyBag:
-					// NEED UNIT TEST
-					AddPrivateKey (new PKCS8.PrivateKeyInfo (bagValue.Value));
-					break;
-				case pkcs8ShroudedKeyBag:
-					PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
-					byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
-					AddPrivateKey (new PKCS8.PrivateKeyInfo (decrypted));
-					Array.Clear (decrypted, 0, decrypted.Length);
-					break;
-				case certBag:
-					PKCS7.ContentInfo cert = new PKCS7.ContentInfo (bagValue.Value);
-					if (cert.ContentType != x509Certificate)
-						throw new NotSupportedException ("unsupport certificate type");
-					X509Certificate x509 = new X509Certificate (cert.Content [0].Value);
-					_certs.Add (x509);
-					break;
-				case crlBag:
-					// TODO
-					break;
-				case secretBag: 
-					byte[] secret = bagValue.Value;
-					_secretBags.Add(secret);
-					break;
-				case safeContentsBag:
-					// TODO - ? recurse ?
-					break;
-				default:
-					throw new ArgumentException ("unknown safeBag oid");
-			}
-
-			if (safeBag.Count > 2) {
-				ASN1 bagAttributes = safeBag [2];
-				if (bagAttributes.Tag != 0x31)
-					throw new ArgumentException ("invalid safeBag attributes id");
-
-				for (int i = 0; i < bagAttributes.Count; i++) {
-					ASN1 pkcs12Attribute = bagAttributes[i];
-						
-					if (pkcs12Attribute.Tag != 0x30)
-						throw new ArgumentException ("invalid PKCS12 attributes id");
-
-					ASN1 attrId = pkcs12Attribute [0];
-					if (attrId.Tag != 0x06)
-						throw new ArgumentException ("invalid attribute id");
-						
-					string attrOid = ASN1Convert.ToOid (attrId);
-
-					ASN1 attrValues = pkcs12Attribute[1];
-					for (int j = 0; j < attrValues.Count; j++) {
-						ASN1 attrValue = attrValues[j];
-
-						switch (attrOid) {
-						case PKCS9.friendlyName:
-							if (attrValue.Tag != 0x1e)
-								throw new ArgumentException ("invalid attribute value id");
-							break;
-						case PKCS9.localKeyId:
-							if (attrValue.Tag != 0x04)
-								throw new ArgumentException ("invalid attribute value id");
-							break;
-						default:
-							// Unknown OID -- don't check Tag
-							break;
-						}
-					}
-				}
-			}
-
-			_safeBags.Add (new SafeBag(oid, safeBag));
-		}
-
-		private ASN1 Pkcs8ShroudedKeyBagSafeBag (AsymmetricAlgorithm aa, IDictionary attributes) 
-		{
-			PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo ();
-			if (aa is RSA) {
-				pki.Algorithm = "1.2.840.113549.1.1.1";
-				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((RSA)aa);
-			}
-			else if (aa is DSA) {
-				pki.Algorithm = null;
-				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((DSA)aa);
-			}
-			else
-				throw new CryptographicException ("Unknown asymmetric algorithm {0}", aa.ToString ());
-
-			PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo ();
-			epki.Algorithm = pbeWithSHAAnd3KeyTripleDESCBC;
-			epki.IterationCount = _iterations;
-			epki.EncryptedData = Encrypt (pbeWithSHAAnd3KeyTripleDESCBC, epki.Salt, _iterations, pki.GetBytes ());
-
-			ASN1 safeBag = new ASN1 (0x30);
-			safeBag.Add (ASN1Convert.FromOid (pkcs8ShroudedKeyBag));
-			ASN1 bagValue = new ASN1 (0xA0);
-			bagValue.Add (new ASN1 (epki.GetBytes ()));
-			safeBag.Add (bagValue);
-
-			if (attributes != null) {
-				ASN1 bagAttributes = new ASN1 (0x31);
-				IDictionaryEnumerator de = attributes.GetEnumerator ();
-
-				while (de.MoveNext ()) {
-					string oid = (string)de.Key;
-					switch (oid) {
-					case PKCS9.friendlyName:
-						ArrayList names = (ArrayList)de.Value;
-						if (names.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] name in names) {
-								ASN1 attrValue = new ASN1 (0x1e);
-								attrValue.Value = name;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					case PKCS9.localKeyId:
-						ArrayList keys = (ArrayList)de.Value;
-						if (keys.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] key in keys) {
-								ASN1 attrValue = new ASN1 (0x04);
-								attrValue.Value = key;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					default:
-						break;
-					}
-				}
-
-				if (bagAttributes.Count > 0) {
-					safeBag.Add (bagAttributes);
-				}
-			}
-
-			return safeBag;
-		}
-
-		private ASN1 KeyBagSafeBag (AsymmetricAlgorithm aa, IDictionary attributes) 
-		{
-			PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo ();
-			if (aa is RSA) {
-				pki.Algorithm = "1.2.840.113549.1.1.1";
-				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((RSA)aa);
-			}
-			else if (aa is DSA) {
-				pki.Algorithm = null;
-				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((DSA)aa);
-			}
-			else
-				throw new CryptographicException ("Unknown asymmetric algorithm {0}", aa.ToString ());
-
-			ASN1 safeBag = new ASN1 (0x30);
-			safeBag.Add (ASN1Convert.FromOid (keyBag));
-			ASN1 bagValue = new ASN1 (0xA0);
-			bagValue.Add (new ASN1 (pki.GetBytes ()));
-			safeBag.Add (bagValue);
-
-			if (attributes != null) {
-				ASN1 bagAttributes = new ASN1 (0x31);
-				IDictionaryEnumerator de = attributes.GetEnumerator ();
-
-				while (de.MoveNext ()) {
-					string oid = (string)de.Key;
-					switch (oid) {
-					case PKCS9.friendlyName:
-						ArrayList names = (ArrayList)de.Value;
-						if (names.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] name in names) {
-								ASN1 attrValue = new ASN1 (0x1e);
-								attrValue.Value = name;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					case PKCS9.localKeyId:
-						ArrayList keys = (ArrayList)de.Value;
-						if (keys.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] key in keys) {
-								ASN1 attrValue = new ASN1 (0x04);
-								attrValue.Value = key;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					default:
-						break;
-					}
-				}
-
-				if (bagAttributes.Count > 0) {
-					safeBag.Add (bagAttributes);
-				}
-			}
-
-			return safeBag;
-		}
-
-		private ASN1 SecretBagSafeBag (byte[] secret, IDictionary attributes) 
-		{
-			ASN1 safeBag = new ASN1 (0x30);
-			safeBag.Add (ASN1Convert.FromOid (secretBag));
-			ASN1 bagValue = new ASN1 (0x80, secret);
-			safeBag.Add (bagValue);
-
-			if (attributes != null) {
-				ASN1 bagAttributes = new ASN1 (0x31);
-				IDictionaryEnumerator de = attributes.GetEnumerator ();
-
-				while (de.MoveNext ()) {
-					string oid = (string)de.Key;
-					switch (oid) {
-					case PKCS9.friendlyName:
-						ArrayList names = (ArrayList)de.Value;
-						if (names.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] name in names) {
-								ASN1 attrValue = new ASN1 (0x1e);
-								attrValue.Value = name;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					case PKCS9.localKeyId:
-						ArrayList keys = (ArrayList)de.Value;
-						if (keys.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] key in keys) {
-								ASN1 attrValue = new ASN1 (0x04);
-								attrValue.Value = key;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					default:
-						break;
-					}
-				}
-
-				if (bagAttributes.Count > 0) {
-					safeBag.Add (bagAttributes);
-				}
-			}
-
-			return safeBag;
-		}
-
-		private ASN1 CertificateSafeBag (X509Certificate x509, IDictionary attributes) 
-		{
-			ASN1 encapsulatedCertificate = new ASN1 (0x04, x509.RawData);
-
-			PKCS7.ContentInfo ci = new PKCS7.ContentInfo ();
-			ci.ContentType = x509Certificate;
-			ci.Content.Add (encapsulatedCertificate);
-
-			ASN1 bagValue = new ASN1 (0xA0);
-			bagValue.Add (ci.ASN1);
-
-			ASN1 safeBag = new ASN1 (0x30);
-			safeBag.Add (ASN1Convert.FromOid (certBag));
-			safeBag.Add (bagValue);
-
-			if (attributes != null) {
-				ASN1 bagAttributes = new ASN1 (0x31);
-				IDictionaryEnumerator de = attributes.GetEnumerator ();
-
-				while (de.MoveNext ()) {
-					string oid = (string)de.Key;
-					switch (oid) {
-					case PKCS9.friendlyName:
-						ArrayList names = (ArrayList)de.Value;
-						if (names.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] name in names) {
-								ASN1 attrValue = new ASN1 (0x1e);
-								attrValue.Value = name;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					case PKCS9.localKeyId:
-						ArrayList keys = (ArrayList)de.Value;
-						if (keys.Count > 0) {
-							ASN1 pkcs12Attribute = new ASN1 (0x30);
-							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
-							ASN1 attrValues = new ASN1 (0x31);
-							foreach (byte[] key in keys) {
-								ASN1 attrValue = new ASN1 (0x04);
-								attrValue.Value = key;
-								attrValues.Add (attrValue);
-							}
-							pkcs12Attribute.Add (attrValues);
-							bagAttributes.Add (pkcs12Attribute);
-						}
-						break;
-					default:
-						break;
-					}
-				}
-
-				if (bagAttributes.Count > 0) {
-					safeBag.Add (bagAttributes);
-				}
-			}
-
-			return safeBag;
-		}
-
-		private byte[] MAC (byte[] password, byte[] salt, int iterations, byte[] data) 
-		{
-			PKCS12.DeriveBytes pd = new PKCS12.DeriveBytes ();
-			pd.HashName = "SHA1";
-			pd.Password = password;
-			pd.Salt = salt;
-			pd.IterationCount = iterations;
-
-			HMACSHA1 hmac = (HMACSHA1) HMACSHA1.Create ();
-			hmac.Key = pd.DeriveMAC (20);
-			return hmac.ComputeHash (data, 0, data.Length);
-		}
-
-		/*
-		 * SafeContents ::= SEQUENCE OF SafeBag
-		 * 
-		 * SafeBag ::= SEQUENCE {
-		 *	bagId BAG-TYPE.&id ({PKCS12BagSet}),
-		 *	bagValue [0] EXPLICIT BAG-TYPE.&Type({PKCS12BagSet}{@bagId}),
-		 *	bagAttributes SET OF PKCS12Attribute OPTIONAL
-		 * }
-		 */
-		public byte[] GetBytes () 
-		{
-			// TODO (incomplete)
-			ASN1 safeBagSequence = new ASN1 (0x30);
-
-			// Sync Safe Bag list since X509CertificateCollection may be updated
-			ArrayList scs = new ArrayList ();
-			foreach (SafeBag sb in _safeBags) {
-				if (sb.BagOID.Equals (certBag)) {
-					ASN1 safeBag = sb.ASN1;
-					ASN1 bagValue = safeBag [1];
-					PKCS7.ContentInfo cert = new PKCS7.ContentInfo (bagValue.Value);
-					scs.Add (new X509Certificate (cert.Content [0].Value));
-				}
-			}
-
-			ArrayList addcerts = new ArrayList ();
-			ArrayList removecerts = new ArrayList ();
-
-			foreach (X509Certificate c in Certificates) {
-				bool found = false;
-
-				foreach (X509Certificate lc in scs) {
-					if (Compare (c.RawData, lc.RawData)) {
-						found = true;
-					}
-				}
-
-				if (!found) {
-					addcerts.Add (c);
-				}
-			}
-			foreach (X509Certificate c in scs) {
-				bool found = false;
-
-				foreach (X509Certificate lc in Certificates) {
-					if (Compare (c.RawData, lc.RawData)) {
-						found = true;
-					}
-				}
-
-				if (!found) {
-					removecerts.Add (c);
-				}
-			}
-
-			foreach (X509Certificate c in removecerts) {
-				RemoveCertificate (c);
-			}
-
-			foreach (X509Certificate c in addcerts) {
-				AddCertificate (c);
-			}
-			// Sync done
-
-			if (_safeBags.Count > 0) {
-				ASN1 certsSafeBag = new ASN1 (0x30);
-				foreach (SafeBag sb in _safeBags) {
-					if (sb.BagOID.Equals (certBag)) {
-						certsSafeBag.Add (sb.ASN1);
-					}
-				}
-
-				if (certsSafeBag.Count > 0) {
-					PKCS7.ContentInfo contentInfo = EncryptedContentInfo (certsSafeBag, pbeWithSHAAnd3KeyTripleDESCBC);
-					safeBagSequence.Add (contentInfo.ASN1);
-				}
-			}
-
-			if (_safeBags.Count > 0) {
-				ASN1 safeContents = new ASN1 (0x30);
-				foreach (SafeBag sb in _safeBags) {
-					if (sb.BagOID.Equals (keyBag) ||
-					    sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-						safeContents.Add (sb.ASN1);
-					}
-				}
-				if (safeContents.Count > 0) {
-					ASN1 content = new ASN1 (0xA0);
-					content.Add (new ASN1 (0x04, safeContents.GetBytes ()));
-				
-					PKCS7.ContentInfo keyBag = new PKCS7.ContentInfo (PKCS7.Oid.data);
-					keyBag.Content = content;
-					safeBagSequence.Add (keyBag.ASN1);
-				}
-			}
-
-			// Doing SecretBags separately in case we want to change their encryption independently.
-			if (_safeBags.Count > 0) {
-				ASN1 secretsSafeBag = new ASN1 (0x30);
-				foreach (SafeBag sb in _safeBags) {
-					if (sb.BagOID.Equals (secretBag)) {
-						secretsSafeBag.Add (sb.ASN1);
-					}
-				}
-
-				if (secretsSafeBag.Count > 0) {
-					PKCS7.ContentInfo contentInfo = EncryptedContentInfo (secretsSafeBag, pbeWithSHAAnd3KeyTripleDESCBC);
-					safeBagSequence.Add (contentInfo.ASN1);
-				}
-			}
-
-
-			ASN1 encapsulates = new ASN1 (0x04, safeBagSequence.GetBytes ());
-			ASN1 ci = new ASN1 (0xA0);
-			ci.Add (encapsulates);
-			PKCS7.ContentInfo authSafe = new PKCS7.ContentInfo (PKCS7.Oid.data);
-			authSafe.Content = ci;
-			
-			ASN1 macData = new ASN1 (0x30);
-			if (_password != null) {
-				// only for password based encryption
-				byte[] salt = new byte [20];
-				RNG.GetBytes (salt);
-				byte[] macValue = MAC (_password, salt, _iterations, authSafe.Content [0].Value);
-				ASN1 oidSeq = new ASN1 (0x30);
-				oidSeq.Add (ASN1Convert.FromOid ("1.3.14.3.2.26"));	// SHA1
-				oidSeq.Add (new ASN1 (0x05));
-
-				ASN1 mac = new ASN1 (0x30);
-				mac.Add (oidSeq);
-				mac.Add (new ASN1 (0x04, macValue));
-
-				macData.Add (mac);
-				macData.Add (new ASN1 (0x04, salt));
-				macData.Add (ASN1Convert.FromInt32 (_iterations));
-			}
-			
-			ASN1 version = new ASN1 (0x02, new byte [1] { 0x03 });
-			
-			ASN1 pfx = new ASN1 (0x30);
-			pfx.Add (version);
-			pfx.Add (authSafe.ASN1);
-			if (macData.Count > 0) {
-				// only for password based encryption
-				pfx.Add (macData);
-			}
-
-			return pfx.GetBytes ();
-		}
-
-		// Creates an encrypted PKCS#7 ContentInfo with safeBags as its SafeContents.  Used in GetBytes(), above.
-		private PKCS7.ContentInfo EncryptedContentInfo(ASN1 safeBags, string algorithmOid)
-		{
-			byte[] salt = new byte [8];
-			RNG.GetBytes (salt);
-
-			ASN1 seqParams = new ASN1 (0x30);
-			seqParams.Add (new ASN1 (0x04, salt));
-			seqParams.Add (ASN1Convert.FromInt32 (_iterations));
-
-			ASN1 seqPbe = new ASN1 (0x30);
-			seqPbe.Add (ASN1Convert.FromOid (algorithmOid));
-			seqPbe.Add (seqParams);
-
-			byte[] encrypted = Encrypt (algorithmOid, salt, _iterations, safeBags.GetBytes ());
-			ASN1 encryptedContent = new ASN1 (0x80, encrypted);
-
-			ASN1 seq = new ASN1 (0x30);
-			seq.Add (ASN1Convert.FromOid (PKCS7.Oid.data));
-			seq.Add (seqPbe);
-			seq.Add (encryptedContent);
-
-			ASN1 version = new ASN1 (0x02, new byte [1] { 0x00 });
-			ASN1 encData = new ASN1 (0x30);
-			encData.Add (version);
-			encData.Add (seq);
-
-			ASN1 finalContent = new ASN1 (0xA0);
-			finalContent.Add (encData);
-
-			PKCS7.ContentInfo bag = new PKCS7.ContentInfo (PKCS7.Oid.encryptedData);
-			bag.Content = finalContent;
-			return bag;
-		}
-
-		public void AddCertificate (X509Certificate cert)
-		{
-			AddCertificate (cert, null);
-		}
-
-		public void AddCertificate (X509Certificate cert, IDictionary attributes)
-		{
-			bool found = false;
-
-			for (int i = 0; !found && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (certBag)) {
-					ASN1 safeBag = sb.ASN1;
-					ASN1 bagValue = safeBag [1];
-					PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
-					X509Certificate c = new X509Certificate (crt.Content [0].Value);
-					if (Compare (cert.RawData, c.RawData)) {
-						found = true;
-					}
-				}
-			}
-
-			if (!found) {
-				_safeBags.Add (new SafeBag (certBag, CertificateSafeBag (cert, attributes)));
-				_certsChanged = true;
-			}
-		}
-
-		public void RemoveCertificate (X509Certificate cert)
-		{
-			RemoveCertificate (cert, null);
-		}
-
-		public void RemoveCertificate (X509Certificate cert, IDictionary attrs)
-		{
-			int certIndex = -1;
-
-			for (int i = 0; certIndex == -1 && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (certBag)) {
-					ASN1 safeBag = sb.ASN1;
-					ASN1 bagValue = safeBag [1];
-					PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
-					X509Certificate c = new X509Certificate (crt.Content [0].Value);
-					if (Compare (cert.RawData, c.RawData)) {
-						if (attrs != null) {
-							if (safeBag.Count == 3) {
-								ASN1 bagAttributes = safeBag [2];
-								int bagAttributesFound = 0;
-								for (int j = 0; j < bagAttributes.Count; j++) {
-									ASN1 pkcs12Attribute = bagAttributes [j];
-									ASN1 attrId = pkcs12Attribute [0];
-									string ao = ASN1Convert.ToOid (attrId);
-									ArrayList dattrValues = (ArrayList)attrs [ao];
-
-									if (dattrValues != null) {
-										ASN1 attrValues = pkcs12Attribute [1];
-
-										if (dattrValues.Count == attrValues.Count) {
-											int attrValuesFound = 0;
-											for (int k = 0; k < attrValues.Count; k++) {
-												ASN1 attrValue = attrValues [k];
-												byte[] value = (byte[])dattrValues [k];
-									
-												if (Compare (value, attrValue.Value)) {
-													attrValuesFound += 1;
-												}
-											}
-											if (attrValuesFound == attrValues.Count) {
-												bagAttributesFound += 1;
-											}
-										}
-									}
-								}
-								if (bagAttributesFound == bagAttributes.Count) {
-									certIndex = i;
-								}
-							}
-						} else {
-							certIndex = i;
-						}
-					}
-				}
-			}
-
-			if (certIndex != -1) {
-				_safeBags.RemoveAt (certIndex);
-				_certsChanged = true;
-			}
-		}
-
-		private bool CompareAsymmetricAlgorithm (AsymmetricAlgorithm a1, AsymmetricAlgorithm a2)
-		{
-			// fast path
-			if (a1.KeySize != a2.KeySize)
-				return false;
-			// compare public keys - if they match we can assume the private match too
-			return (a1.ToXmlString (false) == a2.ToXmlString (false));
-		}
-
-		public void AddPkcs8ShroudedKeyBag (AsymmetricAlgorithm aa)
-		{
-			AddPkcs8ShroudedKeyBag (aa, null);
-		}
-
-		public void AddPkcs8ShroudedKeyBag (AsymmetricAlgorithm aa, IDictionary attributes)
-		{
-			bool found = false;
-
-			for (int i = 0; !found && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-					ASN1 bagValue = sb.ASN1 [1];
-					PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
-					byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
-					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
-					byte[] privateKey = pki.PrivateKey;
-
-					AsymmetricAlgorithm saa = null;
-					switch (privateKey [0]) {
-					case 0x02:
-						DSAParameters p = new DSAParameters (); // FIXME
-						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-						break;
-					case 0x30:
-						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-						break;
-					default:
-						Array.Clear (decrypted, 0, decrypted.Length);
-						Array.Clear (privateKey, 0, privateKey.Length);
-						throw new CryptographicException ("Unknown private key format");
-					}
-
-					Array.Clear (decrypted, 0, decrypted.Length);
-					Array.Clear (privateKey, 0, privateKey.Length);
-
-					if (CompareAsymmetricAlgorithm (aa , saa)) {
-						found = true;
-					}
-				}
-			}
-
-			if (!found) {
-				_safeBags.Add (new SafeBag (pkcs8ShroudedKeyBag, Pkcs8ShroudedKeyBagSafeBag (aa, attributes)));
-				_keyBagsChanged = true;
-			}
-		}
-
-		public void RemovePkcs8ShroudedKeyBag (AsymmetricAlgorithm aa)
-		{
-			int aaIndex = -1;
-
-			for (int i = 0; aaIndex == -1 && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-					ASN1 bagValue = sb.ASN1 [1];
-					PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
-					byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
-					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
-					byte[] privateKey = pki.PrivateKey;
-
-					AsymmetricAlgorithm saa = null;
-					switch (privateKey [0]) {
-					case 0x02:
-						DSAParameters p = new DSAParameters (); // FIXME
-						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-						break;
-					case 0x30:
-						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-						break;
-					default:
-						Array.Clear (decrypted, 0, decrypted.Length);
-						Array.Clear (privateKey, 0, privateKey.Length);
-						throw new CryptographicException ("Unknown private key format");
-					}
-
-					Array.Clear (decrypted, 0, decrypted.Length);
-					Array.Clear (privateKey, 0, privateKey.Length);
-
-					if (CompareAsymmetricAlgorithm (aa, saa)) {
-						aaIndex = i;
-					}
-				}
-			}
-
-			if (aaIndex != -1) {
-				_safeBags.RemoveAt (aaIndex);
-				_keyBagsChanged = true;
-			}
-		}
-
-		public void AddKeyBag (AsymmetricAlgorithm aa)
-		{
-			AddKeyBag (aa, null);
-		}
-
-		public void AddKeyBag (AsymmetricAlgorithm aa, IDictionary attributes)
-		{
-			bool found = false;
-
-			for (int i = 0; !found && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (keyBag)) {
-					ASN1 bagValue = sb.ASN1 [1];
-					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
-					byte[] privateKey = pki.PrivateKey;
-
-					AsymmetricAlgorithm saa = null;
-					switch (privateKey [0]) {
-					case 0x02:
-						DSAParameters p = new DSAParameters (); // FIXME
-						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-						break;
-					case 0x30:
-						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-						break;
-					default:
-						Array.Clear (privateKey, 0, privateKey.Length);
-						throw new CryptographicException ("Unknown private key format");
-					}
-
-					Array.Clear (privateKey, 0, privateKey.Length);
-
-					if (CompareAsymmetricAlgorithm (aa, saa)) {
-						found = true;
-					}
-				}
-			}
-
-			if (!found) {
-				_safeBags.Add (new SafeBag (keyBag, KeyBagSafeBag (aa, attributes)));
-				_keyBagsChanged = true;
-			}
-		}
-
-		public void RemoveKeyBag (AsymmetricAlgorithm aa)
-		{
-			int aaIndex = -1;
-
-			for (int i = 0; aaIndex == -1 && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (keyBag)) {
-					ASN1 bagValue = sb.ASN1 [1];
-					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
-					byte[] privateKey = pki.PrivateKey;
-
-					AsymmetricAlgorithm saa = null;
-					switch (privateKey [0]) {
-					case 0x02:
-						DSAParameters p = new DSAParameters (); // FIXME
-						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-						break;
-					case 0x30:
-						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-						break;
-					default:
-						Array.Clear (privateKey, 0, privateKey.Length);
-						throw new CryptographicException ("Unknown private key format");
-					}
-
-					Array.Clear (privateKey, 0, privateKey.Length);
-
-					if (CompareAsymmetricAlgorithm (aa, saa)) {
-						aaIndex = i;
-					}
-				}
-			}
-
-			if (aaIndex != -1) {
-				_safeBags.RemoveAt (aaIndex);
-				_keyBagsChanged = true;
-			}
-		}
-
-		public void AddSecretBag (byte[] secret)
-		{
-			AddSecretBag (secret, null);
-		}
-
-		public void AddSecretBag (byte[] secret, IDictionary attributes)
-		{
-			bool found = false;
-
-			for (int i = 0; !found && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (secretBag)) {
-					ASN1 bagValue = sb.ASN1 [1];
-					byte[] ssecret = bagValue.Value;
-
-					if (Compare (secret, ssecret)) {
-						found = true;
-					}
-				}
-			}
-
-			if (!found) {
-				_safeBags.Add (new SafeBag (secretBag, SecretBagSafeBag (secret, attributes)));
-				_secretBagsChanged = true;
-			}
-		}
-
-		public void RemoveSecretBag (byte[] secret)
-		{
-			int sIndex = -1;
-
-			for (int i = 0; sIndex == -1 && i < _safeBags.Count; i++) {
-				SafeBag sb = (SafeBag)_safeBags [i];
-
-				if (sb.BagOID.Equals (secretBag)) {
-					ASN1 bagValue = sb.ASN1 [1];
-					byte[] ssecret = bagValue.Value;
-
-					if (Compare (secret, ssecret)) {
-						sIndex = i;
-					}
-				}
-			}
-
-			if (sIndex != -1) {
-				_safeBags.RemoveAt (sIndex);
-				_secretBagsChanged = true;
-			}
-		}
-
-		public AsymmetricAlgorithm GetAsymmetricAlgorithm (IDictionary attrs)
-		{
-			foreach (SafeBag sb in _safeBags) {
-				if (sb.BagOID.Equals (keyBag) || sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-					ASN1 safeBag = sb.ASN1;
-
-					if (safeBag.Count == 3) {
-						ASN1 bagAttributes = safeBag [2];
-
-						int bagAttributesFound = 0;
-						for (int i = 0; i < bagAttributes.Count; i++) {
-							ASN1 pkcs12Attribute = bagAttributes [i];
-							ASN1 attrId = pkcs12Attribute [0];
-							string ao = ASN1Convert.ToOid (attrId);
-							ArrayList dattrValues = (ArrayList)attrs [ao];
-
-							if (dattrValues != null) {
-								ASN1 attrValues = pkcs12Attribute [1];
-
-								if (dattrValues.Count == attrValues.Count) {
-									int attrValuesFound = 0;
-									for (int j = 0; j < attrValues.Count; j++) {
-										ASN1 attrValue = attrValues [j];
-										byte[] value = (byte[])dattrValues [j];
-									
-										if (Compare (value, attrValue.Value)) {
-											attrValuesFound += 1;
-										}
-									}
-									if (attrValuesFound == attrValues.Count) {
-										bagAttributesFound += 1;
-									}
-								}
-							}
-						}
-						if (bagAttributesFound == bagAttributes.Count) {
-							ASN1 bagValue = safeBag [1];
-							AsymmetricAlgorithm aa = null;
-							if (sb.BagOID.Equals (keyBag)) {
-								PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
-								byte[] privateKey = pki.PrivateKey;
-								switch (privateKey [0]) {
-								case 0x02:
-									DSAParameters p = new DSAParameters (); // FIXME
-									aa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-									break;
-								case 0x30:
-									aa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-									break;
-								default:
-									break;
-								}
-								Array.Clear (privateKey, 0, privateKey.Length);
-							} else if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-								PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
-								byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
-								PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
-								byte[] privateKey = pki.PrivateKey;
-								switch (privateKey [0]) {
-								case 0x02:
-									DSAParameters p = new DSAParameters (); // FIXME
-									aa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-									break;
-								case 0x30:
-									aa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-									break;
-								default:
-									break;
-								}
-								Array.Clear (privateKey, 0, privateKey.Length);
-								Array.Clear (decrypted, 0, decrypted.Length);
-							}
-							return aa;
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-
-		public byte[] GetSecret (IDictionary attrs)
-		{
-			foreach (SafeBag sb in _safeBags) {
-				if (sb.BagOID.Equals (secretBag)) {
-					ASN1 safeBag = sb.ASN1;
-
-					if (safeBag.Count == 3) {
-						ASN1 bagAttributes = safeBag [2];
-
-						int bagAttributesFound = 0;
-						for (int i = 0; i < bagAttributes.Count; i++) {
-							ASN1 pkcs12Attribute = bagAttributes [i];
-							ASN1 attrId = pkcs12Attribute [0];
-							string ao = ASN1Convert.ToOid (attrId);
-							ArrayList dattrValues = (ArrayList)attrs [ao];
-
-							if (dattrValues != null) {
-								ASN1 attrValues = pkcs12Attribute [1];
-
-								if (dattrValues.Count == attrValues.Count) {
-									int attrValuesFound = 0;
-									for (int j = 0; j < attrValues.Count; j++) {
-										ASN1 attrValue = attrValues [j];
-										byte[] value = (byte[])dattrValues [j];
-									
-										if (Compare (value, attrValue.Value)) {
-											attrValuesFound += 1;
-										}
-									}
-									if (attrValuesFound == attrValues.Count) {
-										bagAttributesFound += 1;
-									}
-								}
-							}
-						}
-						if (bagAttributesFound == bagAttributes.Count) {
-							ASN1 bagValue = safeBag [1];
-							return bagValue.Value;
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-
-		public X509Certificate GetCertificate (IDictionary attrs)
-		{
-			foreach (SafeBag sb in _safeBags) {
-				if (sb.BagOID.Equals (certBag)) {
-					ASN1 safeBag = sb.ASN1;
-
-					if (safeBag.Count == 3) {
-						ASN1 bagAttributes = safeBag [2];
-
-						int bagAttributesFound = 0;
-						for (int i = 0; i < bagAttributes.Count; i++) {
-							ASN1 pkcs12Attribute = bagAttributes [i];
-							ASN1 attrId = pkcs12Attribute [0];
-							string ao = ASN1Convert.ToOid (attrId);
-							ArrayList dattrValues = (ArrayList)attrs [ao];
-
-							if (dattrValues != null) {
-								ASN1 attrValues = pkcs12Attribute [1];
-								
-								if (dattrValues.Count == attrValues.Count) {
-									int attrValuesFound = 0;
-									for (int j = 0; j < attrValues.Count; j++) {
-										ASN1 attrValue = attrValues [j];
-										byte[] value = (byte[])dattrValues [j];
-									
-										if (Compare (value, attrValue.Value)) {
-											attrValuesFound += 1;
-										}
-									}
-									if (attrValuesFound == attrValues.Count) {
-										bagAttributesFound += 1;
-									}
-								}
-							}
-						}
-						if (bagAttributesFound == bagAttributes.Count) {
-							ASN1 bagValue = safeBag [1];
-							PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
-							return new X509Certificate (crt.Content [0].Value);
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-
-		public IDictionary GetAttributes (AsymmetricAlgorithm aa)
-		{
-			IDictionary result = new Hashtable ();
-
-			foreach (SafeBag sb in _safeBags) {
-				if (sb.BagOID.Equals (keyBag) || sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-					ASN1 safeBag = sb.ASN1;
-
-					ASN1 bagValue = safeBag [1];
-					AsymmetricAlgorithm saa = null;
-					if (sb.BagOID.Equals (keyBag)) {
-						PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
-						byte[] privateKey = pki.PrivateKey;
-						switch (privateKey [0]) {
-						case 0x02:
-							DSAParameters p = new DSAParameters (); // FIXME
-							saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-							break;
-						case 0x30:
-							saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-							break;
-						default:
-							break;
-						}
-						Array.Clear (privateKey, 0, privateKey.Length);
-					} else if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
-						PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
-						byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
-						PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
-						byte[] privateKey = pki.PrivateKey;
-						switch (privateKey [0]) {
-						case 0x02:
-							DSAParameters p = new DSAParameters (); // FIXME
-							saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
-							break;
-						case 0x30:
-							saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
-							break;
-						default:
-							break;
-						}
-						Array.Clear (privateKey, 0, privateKey.Length);
-						Array.Clear (decrypted, 0, decrypted.Length);
-					}
-
-					if (saa != null && CompareAsymmetricAlgorithm (saa, aa)) {
-						if (safeBag.Count == 3) {
-							ASN1 bagAttributes = safeBag [2];
-							
-							for (int i = 0; i < bagAttributes.Count; i++) {
-								ASN1 pkcs12Attribute = bagAttributes [i];
-								ASN1 attrId = pkcs12Attribute [0];
-								string aOid = ASN1Convert.ToOid (attrId);
-								ArrayList aValues = new ArrayList ();
-
-								ASN1 attrValues = pkcs12Attribute [1];
-									
-								for (int j = 0; j < attrValues.Count; j++) {
-									ASN1 attrValue = attrValues [j];
-									aValues.Add (attrValue.Value);
-								}
-								result.Add (aOid, aValues);
-							}
-						}
-					}
-				}
-			}
-
-			return result;
-		}
-
-		public IDictionary GetAttributes (X509Certificate cert)
-		{
-			IDictionary result = new Hashtable ();
-
-			foreach (SafeBag sb in _safeBags) {
-				if (sb.BagOID.Equals (certBag)) {
-					ASN1 safeBag = sb.ASN1;
-					ASN1 bagValue = safeBag [1];
-					PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
-					X509Certificate xc = new X509Certificate (crt.Content [0].Value);
-
-					if (Compare (cert.RawData, xc.RawData)) {
-						if (safeBag.Count == 3) {
-							ASN1 bagAttributes = safeBag [2];
-
-							for (int i = 0; i < bagAttributes.Count; i++) {
-								ASN1 pkcs12Attribute = bagAttributes [i];
-								ASN1 attrId = pkcs12Attribute [0];
-
-								string aOid = ASN1Convert.ToOid (attrId);
-								ArrayList aValues = new ArrayList ();
-
-								ASN1 attrValues = pkcs12Attribute [1];
-									
-								for (int j = 0; j < attrValues.Count; j++) {
-									ASN1 attrValue = attrValues [j];
-									aValues.Add (attrValue.Value);
-								}
-								result.Add (aOid, aValues);
-							}
-						}
-					}
-				}
-			}
-
-			return result;
-		}
-
-		public void SaveToFile (string filename)
-		{
-			if (filename == null)
-				throw new ArgumentNullException ("filename");
-
-			using (FileStream fs = File.Create (filename)) {
-				byte[] data = GetBytes ();
-				fs.Write (data, 0, data.Length);
-			}
-		}
-
-		public object Clone ()
-		{
-			PKCS12 clone = null;
-			if (_password != null) {
-				clone = new PKCS12 (GetBytes (), Encoding.BigEndianUnicode.GetString (_password));
-			} else {
-				clone = new PKCS12 (GetBytes ());
-			}
-			clone.IterationCount = this.IterationCount;
-
-			return clone;
-		}
-
-		// static
-
-		public const int CryptoApiPasswordLimit = 32;
-		
-		static private int password_max_length = Int32.MaxValue;
-
-		// static properties
-		
-		// MS CryptoAPI limits the password to a maximum of 31 characters
-		// other implementations, like OpenSSL, have no such limitation.
-		// Setting a maximum value will truncate the password length to 
-		// ensure compatibility with MS's PFXImportCertStore API.
-		static public int MaximumPasswordLength {
-			get { return password_max_length; }
-			set {
-				if (value < CryptoApiPasswordLimit) {
-					string msg = string.Format ("Maximum password length cannot be less than {0}.", CryptoApiPasswordLimit);
-					throw new ArgumentOutOfRangeException (msg);
-				}
-				password_max_length = value;
-			}
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/PKCS7.cs b/MediaBrowser.Server.Mono/Security/PKCS7.cs
deleted file mode 100644
index 7a34580e9..000000000
--- a/MediaBrowser.Server.Mono/Security/PKCS7.cs
+++ /dev/null
@@ -1,1011 +0,0 @@
-//
-// PKCS7.cs: PKCS #7 - Cryptographic Message Syntax Standard 
-//	http://www.rsasecurity.com/rsalabs/pkcs/pkcs-7/index.html
-//
-// Authors:
-//	Sebastien Pouliot <sebastien@ximian.com>
-//	Daniel Granath <dgranath#gmail.com>
-//
-// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Security.Cryptography;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-    public sealed class PKCS7 {
-
-		public class Oid {
-			// pkcs 1
-			public const string rsaEncryption = "1.2.840.113549.1.1.1";
-			// pkcs 7
-			public const string data = "1.2.840.113549.1.7.1";
-			public const string signedData = "1.2.840.113549.1.7.2";
-			public const string envelopedData = "1.2.840.113549.1.7.3";
-			public const string signedAndEnvelopedData = "1.2.840.113549.1.7.4";
-			public const string digestedData = "1.2.840.113549.1.7.5";
-			public const string encryptedData = "1.2.840.113549.1.7.6";
-			// pkcs 9
-			public const string contentType = "1.2.840.113549.1.9.3";
-			public const string messageDigest  = "1.2.840.113549.1.9.4";
-			public const string signingTime = "1.2.840.113549.1.9.5";
-			public const string countersignature = "1.2.840.113549.1.9.6";
-
-			public Oid () 
-			{
-			}
-		}
-
-		private PKCS7 ()
-		{
-		}
-
-		static public ASN1 Attribute (string oid, ASN1 value) 
-		{
-			ASN1 attr = new ASN1 (0x30);
-			attr.Add (ASN1Convert.FromOid (oid));
-			ASN1 aset = attr.Add (new ASN1 (0x31));
-			aset.Add (value);
-			return attr;
-		}
-
-		static public ASN1 AlgorithmIdentifier (string oid)
-		{
-			ASN1 ai = new ASN1 (0x30);
-			ai.Add (ASN1Convert.FromOid (oid));
-			ai.Add (new ASN1 (0x05));	// NULL
-			return ai;
-		}
-
-		static public ASN1 AlgorithmIdentifier (string oid, ASN1 parameters) 
-		{
-			ASN1 ai = new ASN1 (0x30);
-			ai.Add (ASN1Convert.FromOid (oid));
-			ai.Add (parameters);
-			return ai;
-		}
-
-		/*
-		 * IssuerAndSerialNumber ::= SEQUENCE {
-		 *	issuer Name,
-		 *	serialNumber CertificateSerialNumber 
-		 * }
-		 */
-		static public ASN1 IssuerAndSerialNumber (X509Certificate x509) 
-		{
-			ASN1 issuer = null;
-			ASN1 serial = null;
-			ASN1 cert = new ASN1 (x509.RawData);
-			int tbs = 0;
-			bool flag = false;
-			while (tbs < cert[0].Count) {
-				ASN1 e = cert[0][tbs++];
-				if (e.Tag == 0x02)
-					serial = e;
-				else if (e.Tag == 0x30) {
-					if (flag) {
-						issuer = e;
-						break;
-					}
-					flag = true;
-				}
-			}
-			ASN1 iasn = new ASN1 (0x30);
-			iasn.Add (issuer);
-			iasn.Add (serial);
-			return iasn;
-		}
-
-		/*
-		 * ContentInfo ::= SEQUENCE {
-		 *	contentType ContentType,
-		 *	content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL 
-		 * }
-		 * ContentType ::= OBJECT IDENTIFIER
-		 */
-		public class ContentInfo {
-
-			private string contentType;
-			private ASN1 content;
-
-			public ContentInfo () 
-			{
-				content = new ASN1 (0xA0);
-			}
-
-			public ContentInfo (string oid) : this ()
-			{
-				contentType = oid;
-			}
-
-			public ContentInfo (byte[] data) 
-				: this (new ASN1 (data)) {}
-
-			public ContentInfo (ASN1 asn1) 
-			{
-				// SEQUENCE with 1 or 2 elements
-				if ((asn1.Tag != 0x30) || ((asn1.Count < 1) && (asn1.Count > 2)))
-					throw new ArgumentException ("Invalid ASN1");
-				if (asn1[0].Tag != 0x06)
-					throw new ArgumentException ("Invalid contentType");
-				contentType = ASN1Convert.ToOid (asn1[0]);
-				if (asn1.Count > 1) {
-					if (asn1[1].Tag != 0xA0)
-						throw new ArgumentException ("Invalid content");
-					content = asn1[1];
-				}
-			}
-
-			public ASN1 ASN1 {
-				get { return GetASN1(); }
-			}
-
-			public ASN1 Content {
-				get { return content; }
-				set { content = value; }
-			}
-
-			public string ContentType {
-				get { return contentType; }
-				set { contentType = value; }
-			}
-
-			internal ASN1 GetASN1 () 
-			{
-				// ContentInfo ::= SEQUENCE {
-				ASN1 contentInfo = new ASN1 (0x30);
-				// contentType ContentType, -> ContentType ::= OBJECT IDENTIFIER
-				contentInfo.Add (ASN1Convert.FromOid (contentType));
-				// content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL 
-				if ((content != null) && (content.Count > 0))
-					contentInfo.Add (content);
-				return contentInfo;
-			}
-
-			public byte[] GetBytes () 
-			{
-				return GetASN1 ().GetBytes ();
-			}
-		}
-
-		/*
-		 * EncryptedData ::= SEQUENCE {
-		 *	version		INTEGER {edVer0(0)} (edVer0),
-		 *	 encryptedContentInfo  EncryptedContentInfo
-		 * }
-		 */
-		public class EncryptedData {
-			private byte _version;
-			private ContentInfo _content;
-			private ContentInfo _encryptionAlgorithm;
-			private byte[] _encrypted;
-
-			public EncryptedData () 
-			{
-				_version = 0;
-			}
-
-			public EncryptedData (byte[] data) 
-				: this (new ASN1 (data))
-			{
-			}
-
-			public EncryptedData (ASN1 asn1) : this () 
-			{
-				if ((asn1.Tag != 0x30) || (asn1.Count < 2))
-					throw new ArgumentException ("Invalid EncryptedData");
-
-				if (asn1 [0].Tag != 0x02)
-					throw new ArgumentException ("Invalid version");
-				_version = asn1 [0].Value [0];
-
-				ASN1 encryptedContentInfo = asn1 [1];
-				if (encryptedContentInfo.Tag != 0x30)
-					throw new ArgumentException ("missing EncryptedContentInfo");
-
-				ASN1 contentType = encryptedContentInfo [0];
-				if (contentType.Tag != 0x06)
-					throw new ArgumentException ("missing EncryptedContentInfo.ContentType");
-				_content = new ContentInfo (ASN1Convert.ToOid (contentType));
-
-				ASN1 contentEncryptionAlgorithm = encryptedContentInfo [1];
-				if (contentEncryptionAlgorithm.Tag != 0x30)
-					throw new ArgumentException ("missing EncryptedContentInfo.ContentEncryptionAlgorithmIdentifier");
-				_encryptionAlgorithm = new ContentInfo (ASN1Convert.ToOid (contentEncryptionAlgorithm [0]));
-				_encryptionAlgorithm.Content = contentEncryptionAlgorithm [1];
-				
-				ASN1 encryptedContent = encryptedContentInfo [2];
-				if (encryptedContent.Tag != 0x80)
-					throw new ArgumentException ("missing EncryptedContentInfo.EncryptedContent");
-				_encrypted = encryptedContent.Value;
-			}
-
-			public ASN1 ASN1 {
-				get { return GetASN1(); }
-			}
-
-			public ContentInfo ContentInfo {
-				get { return _content; }
-			}
-
-			public ContentInfo EncryptionAlgorithm {
-				get { return _encryptionAlgorithm; }
-			}
-
-			public byte[] EncryptedContent {
-				get {
-					if (_encrypted == null)
-						return null;
-					return (byte[]) _encrypted.Clone ();
-				}
-			}
-
-			public byte Version {
-				get { return _version; }
-				set { _version = value; }
-			}
-
-			// methods
-
-			internal ASN1 GetASN1 () 
-			{
-				return null;
-			}
-
-			public byte[] GetBytes () 
-			{
-				return GetASN1 ().GetBytes ();
-			}
-		}
-
-		/*
-		 * EnvelopedData ::= SEQUENCE {
-		 *	version Version,
-		 *	recipientInfos RecipientInfos,
-		 *	encryptedContentInfo EncryptedContentInfo 
-		 * }
-		 * 
-		 * RecipientInfos ::= SET OF RecipientInfo
-		 * 
-		 * EncryptedContentInfo ::= SEQUENCE {
-		 *	contentType ContentType,
-		 *	contentEncryptionAlgorithm ContentEncryptionAlgorithmIdentifier,
-		 *	encryptedContent [0] IMPLICIT EncryptedContent OPTIONAL 
-		 * }
-		 * 
-		 * EncryptedContent ::= OCTET STRING
-		 * 
-		 */
-		public class EnvelopedData {
-			private byte _version;
-			private ContentInfo _content;
-			private ContentInfo _encryptionAlgorithm;
-			private ArrayList _recipientInfos;
-			private byte[] _encrypted;
-
-			public EnvelopedData () 
-			{
-				_version = 0;
-				_content = new ContentInfo ();
-				_encryptionAlgorithm = new ContentInfo ();
-				_recipientInfos = new ArrayList ();
-			}
-
-			public EnvelopedData (byte[] data) 
-				: this (new ASN1 (data))
-			{
-			}
-
-			public EnvelopedData (ASN1 asn1) : this ()
-			{
-				if ((asn1[0].Tag != 0x30) || (asn1[0].Count < 3))
-					throw new ArgumentException ("Invalid EnvelopedData");
-
-				if (asn1[0][0].Tag != 0x02)
-					throw new ArgumentException ("Invalid version");
-				_version = asn1[0][0].Value[0];
-
-				// recipientInfos
-
-				ASN1 recipientInfos = asn1 [0][1];
-				if (recipientInfos.Tag != 0x31)
-					throw new ArgumentException ("missing RecipientInfos");
-				for (int i=0; i < recipientInfos.Count; i++) {
-					ASN1 recipientInfo = recipientInfos [i];
-					_recipientInfos.Add (new RecipientInfo (recipientInfo));
-				}
-
-				ASN1 encryptedContentInfo = asn1[0][2];
-				if (encryptedContentInfo.Tag != 0x30)
-					throw new ArgumentException ("missing EncryptedContentInfo");
-
-				ASN1 contentType = encryptedContentInfo [0];
-				if (contentType.Tag != 0x06)
-					throw new ArgumentException ("missing EncryptedContentInfo.ContentType");
-				_content = new ContentInfo (ASN1Convert.ToOid (contentType));
-
-				ASN1 contentEncryptionAlgorithm = encryptedContentInfo [1];
-				if (contentEncryptionAlgorithm.Tag != 0x30)
-					throw new ArgumentException ("missing EncryptedContentInfo.ContentEncryptionAlgorithmIdentifier");
-				_encryptionAlgorithm = new ContentInfo (ASN1Convert.ToOid (contentEncryptionAlgorithm [0]));
-				_encryptionAlgorithm.Content = contentEncryptionAlgorithm [1];
-				
-				ASN1 encryptedContent = encryptedContentInfo [2];
-				if (encryptedContent.Tag != 0x80)
-					throw new ArgumentException ("missing EncryptedContentInfo.EncryptedContent");
-				_encrypted = encryptedContent.Value;
-			}
-
-			public ArrayList RecipientInfos {
-				  get { return _recipientInfos; }
-			}
-
-			public ASN1 ASN1 {
-				get { return GetASN1(); }
-			}
-
-			public ContentInfo ContentInfo {
-				get { return _content; }
-			}
-
-			public ContentInfo EncryptionAlgorithm {
-				get { return _encryptionAlgorithm; }
-			}
-
-			public byte[] EncryptedContent {
-				get { 
-					if (_encrypted == null)
-						return null;
-					return (byte[]) _encrypted.Clone ();
-				}
-			}
-
-			public byte Version {
-				get { return _version; }
-				set { _version = value; }
-			}
-
-			internal ASN1 GetASN1 () 
-			{
-				// SignedData ::= SEQUENCE {
-				ASN1 signedData = new ASN1 (0x30);
-				// version Version -> Version ::= INTEGER
-/*				byte[] ver = { _version };
-				signedData.Add (new ASN1 (0x02, ver));
-				// digestAlgorithms DigestAlgorithmIdentifiers -> DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
-				ASN1 digestAlgorithms = signedData.Add (new ASN1 (0x31));
-				if (hashAlgorithm != null) {
-					string hashOid = CryptoConfig.MapNameToOid (hashAlgorithm);
-					digestAlgorithms.Add (AlgorithmIdentifier (hashOid));
-				}
-
-				// contentInfo ContentInfo,
-				ASN1 ci = contentInfo.ASN1;
-				signedData.Add (ci);
-				if ((mda == null) && (hashAlgorithm != null)) {
-					// automatically add the messageDigest authenticated attribute
-					HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
-					byte[] idcHash = ha.ComputeHash (ci[1][0].Value);
-					ASN1 md = new ASN1 (0x30);
-					mda = Attribute (messageDigest, md.Add (new ASN1 (0x04, idcHash)));
-					signerInfo.AuthenticatedAttributes.Add (mda);
-				}
-
-				// certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
-				if (certs.Count > 0) {
-					ASN1 a0 = signedData.Add (new ASN1 (0xA0));
-					foreach (X509Certificate x in certs)
-						a0.Add (new ASN1 (x.RawData));
-				}
-				// crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
-				if (crls.Count > 0) {
-					ASN1 a1 = signedData.Add (new ASN1 (0xA1));
-					foreach (byte[] crl in crls)
-						a1.Add (new ASN1 (crl));
-				}
-				// signerInfos SignerInfos -> SignerInfos ::= SET OF SignerInfo
-				ASN1 signerInfos = signedData.Add (new ASN1 (0x31));
-				if (signerInfo.Key != null)
-					signerInfos.Add (signerInfo.ASN1);*/
-				return signedData;
-			}
-
-			public byte[] GetBytes () {
-				return GetASN1 ().GetBytes ();
-			}
-		}
-
-		/* RecipientInfo ::= SEQUENCE {
-		 *	version Version,
-		 *	issuerAndSerialNumber IssuerAndSerialNumber,
-		 *	keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier,
-		 *	encryptedKey EncryptedKey 
-		 * }
-		 * 
-		 * KeyEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
-		 * 
-		 * EncryptedKey ::= OCTET STRING
-		 */
-		public class RecipientInfo {
-
-			private int _version;
-			private string _oid;
-			private byte[] _key;
-			private byte[] _ski;
-			private string _issuer;
-			private byte[] _serial;
-
-			public RecipientInfo () {}
-
-			public RecipientInfo (ASN1 data) 
-			{
-				if (data.Tag != 0x30)
-					throw new ArgumentException ("Invalid RecipientInfo");
-				
-				ASN1 version = data [0];
-				if (version.Tag != 0x02)
-					throw new ArgumentException ("missing Version");
-				_version = version.Value [0];
-
-				// issuerAndSerialNumber IssuerAndSerialNumber
-				ASN1 subjectIdentifierType = data [1];
-				if ((subjectIdentifierType.Tag == 0x80) && (_version == 3)) {
-					_ski = subjectIdentifierType.Value;
-				}
-				else {
-					_issuer = X501.ToString (subjectIdentifierType [0]);
-					_serial = subjectIdentifierType [1].Value;
-				}
-
-				ASN1 keyEncryptionAlgorithm = data [2];
-				_oid = ASN1Convert.ToOid (keyEncryptionAlgorithm [0]);
-
-				ASN1 encryptedKey = data [3];
-				_key = encryptedKey.Value;
-			}
-
-			public string Oid {
-				get { return _oid; }
-			}
-
-			public byte[] Key {
-				get { 
-					if (_key == null)
-						return null;
-                                        return (byte[]) _key.Clone ();
-				}
-			}
-
-			public byte[] SubjectKeyIdentifier {
-				get { 
-					if (_ski == null)
-						return null;
-					return (byte[]) _ski.Clone ();
-				}
-			}
-
-			public string Issuer {
-				get { return _issuer; }
-			}
-
-			public byte[] Serial {
-				get { 
-					if (_serial == null)
-						return null;
-					return (byte[]) _serial.Clone ();
-				}
-			}
-
-			public int Version {
-				get { return _version; }
-			}
-		}
-
-		/*
-		 * SignedData ::= SEQUENCE {
-		 *	version Version,
-		 *	digestAlgorithms DigestAlgorithmIdentifiers,
-		 *	contentInfo ContentInfo,
-		 *	certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
-		 *	crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
-		 *	signerInfos SignerInfos 
-		 * }
-		 */
-		public class SignedData {
-			private byte version;
-			private string hashAlgorithm;
-			private ContentInfo contentInfo;
-			private X509CertificateCollection certs;
-			private ArrayList crls;
-			private SignerInfo signerInfo;
-			private bool mda;
-			private bool signed;
-
-			public SignedData () 
-			{
-				version = 1;
-				contentInfo = new ContentInfo ();
-				certs = new X509CertificateCollection ();
-				crls = new ArrayList ();
-				signerInfo = new SignerInfo ();
-				mda = true;
-				signed = false;
-			}
-
-			public SignedData (byte[] data) 
-				: this (new ASN1 (data)) 
-			{
-			}
-
-			public SignedData (ASN1 asn1) 
-			{
-				if ((asn1[0].Tag != 0x30) || (asn1[0].Count < 4))
-					throw new ArgumentException ("Invalid SignedData");
-
-				if (asn1[0][0].Tag != 0x02)
-					throw new ArgumentException ("Invalid version");
-				version = asn1[0][0].Value[0];
-
-				contentInfo = new ContentInfo (asn1[0][2]);
-
-				int n = 3;
-				certs = new X509CertificateCollection ();
-				if (asn1[0][n].Tag == 0xA0) {
-					for (int i=0; i < asn1[0][n].Count; i++)
-						certs.Add (new X509Certificate (asn1[0][n][i].GetBytes ()));
-					n++;
-				}
-
-				crls = new ArrayList ();
-				if (asn1[0][n].Tag == 0xA1) {
-					for (int i=0; i < asn1[0][n].Count; i++)
-						crls.Add (asn1[0][n][i].GetBytes ());
-					n++;
-				}
-
-				if (asn1[0][n].Count > 0)
-					signerInfo = new SignerInfo (asn1[0][n]);
-				else
-					signerInfo = new SignerInfo ();
-
-				// Exchange hash algorithm Oid from SignerInfo
-				if (signerInfo.HashName != null) {
-					HashName = OidToName(signerInfo.HashName);
-				}
-				
-				// Check if SignerInfo has authenticated attributes
-				mda = (signerInfo.AuthenticatedAttributes.Count > 0);
-			}
-
-			public ASN1 ASN1 {
-				get { return GetASN1(); }
-			}
-
-			public X509CertificateCollection Certificates {
-				get { return certs; }
-			}
-
-			public ContentInfo ContentInfo {
-				get { return contentInfo; }
-			}
-
-			public ArrayList Crls {
-				get { return crls; }
-			}
-
-			public string HashName {
-				get { return hashAlgorithm; }
-				// todo add validation
-				set { 
-					hashAlgorithm = value; 
-					signerInfo.HashName = value;
-				}
-			}
-
-			public SignerInfo SignerInfo {
-				get { return signerInfo; }
-			}
-
-			public byte Version {
-				get { return version; }
-				set { version = value; }
-			}
-
-			public bool UseAuthenticatedAttributes {
-				get { return mda; }
-				set { mda = value; }
-			}
-
-			public bool VerifySignature (AsymmetricAlgorithm aa)
-			{
-				if (aa == null) {
-					return false;
-				}
-
-				RSAPKCS1SignatureDeformatter r = new RSAPKCS1SignatureDeformatter (aa);
-				r.SetHashAlgorithm (hashAlgorithm);
-				HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
-
-				byte[] signature = signerInfo.Signature;
-				byte[] hash = null;
-
-				if (mda) {
-					ASN1 asn = new ASN1 (0x31);
-					foreach (ASN1 attr in signerInfo.AuthenticatedAttributes)
-						asn.Add (attr);
-
-					hash = ha.ComputeHash (asn.GetBytes ());
-				} else {
-					hash = ha.ComputeHash (contentInfo.Content[0].Value);
-				}
-
-				if (hash != null && signature != null) {
-					return r.VerifySignature (hash, signature);
-				}
-				return false;
-			}
-
-			internal string OidToName (string oid)
-			{
-				switch (oid) {
-				case "1.3.14.3.2.26" :
-					return "SHA1";
-				case "1.2.840.113549.2.2" :
-					return "MD2";
-				case "1.2.840.113549.2.5" :
-					return "MD5";
-				case "2.16.840.1.101.3.4.1" :
-					return "SHA256";
-				case "2.16.840.1.101.3.4.2" :
-					return "SHA384";
-				case "2.16.840.1.101.3.4.3" :
-					return "SHA512";
-				default :
-					break;
-				}
-				// Unknown Oid
-				return oid;
-			}
-
-			internal ASN1 GetASN1 () 
-			{
-				// SignedData ::= SEQUENCE {
-				ASN1 signedData = new ASN1 (0x30);
-				// version Version -> Version ::= INTEGER
-				byte[] ver = { version };
-				signedData.Add (new ASN1 (0x02, ver));
-				// digestAlgorithms DigestAlgorithmIdentifiers -> DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
-				ASN1 digestAlgorithms = signedData.Add (new ASN1 (0x31));
-				if (hashAlgorithm != null) {
-					string hashOid = CryptoConfig.MapNameToOID (hashAlgorithm);
-					digestAlgorithms.Add (AlgorithmIdentifier (hashOid));
-				}
-
-				// contentInfo ContentInfo,
-				ASN1 ci = contentInfo.ASN1;
-				signedData.Add (ci);
-				if (!signed && (hashAlgorithm != null)) {
-					if (mda) {
-						// Use authenticated attributes for signature
-						
-						// Automatically add the contentType authenticated attribute
-						ASN1 ctattr = Attribute (Oid.contentType, ci[0]);
-						signerInfo.AuthenticatedAttributes.Add (ctattr);
-						
-						// Automatically add the messageDigest authenticated attribute
-						HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
-						byte[] idcHash = ha.ComputeHash (ci[1][0].Value);
-						ASN1 md = new ASN1 (0x30);
-						ASN1 mdattr = Attribute (Oid.messageDigest, md.Add (new ASN1 (0x04, idcHash)));
-						signerInfo.AuthenticatedAttributes.Add (mdattr);
-					} else {
-						// Don't use authenticated attributes for signature -- signature is content
-						RSAPKCS1SignatureFormatter r = new RSAPKCS1SignatureFormatter (signerInfo.Key);
-						r.SetHashAlgorithm (hashAlgorithm);
-						HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
-						byte[] sig = ha.ComputeHash (ci[1][0].Value);
-						signerInfo.Signature = r.CreateSignature (sig);
-					}
-					signed = true;
-				}
-
-				// certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
-				if (certs.Count > 0) {
-					ASN1 a0 = signedData.Add (new ASN1 (0xA0));
-					foreach (X509Certificate x in certs)
-						a0.Add (new ASN1 (x.RawData));
-				}
-				// crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
-				if (crls.Count > 0) {
-					ASN1 a1 = signedData.Add (new ASN1 (0xA1));
-					foreach (byte[] crl in crls)
-						a1.Add (new ASN1 (crl));
-				}
-				// signerInfos SignerInfos -> SignerInfos ::= SET OF SignerInfo
-				ASN1 signerInfos = signedData.Add (new ASN1 (0x31));
-				if (signerInfo.Key != null)
-					signerInfos.Add (signerInfo.ASN1);
-				return signedData;
-			}
-
-			public byte[] GetBytes () 
-			{
-				return GetASN1 ().GetBytes ();
-			}
-		}
-
-		/*
-		 * SignerInfo ::= SEQUENCE {
-		 *	version Version,
-		 * 	issuerAndSerialNumber IssuerAndSerialNumber,
-		 * 	digestAlgorithm DigestAlgorithmIdentifier,
-		 * 	authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL,
-		 * 	digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier,
-		 * 	encryptedDigest EncryptedDigest,
-		 * 	unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL 
-		 * }
-		 * 
-		 * For version == 3 issuerAndSerialNumber may be replaced by ...
-		 */
-		public class SignerInfo {
-
-			private byte version;
-			private X509Certificate x509;
-			private string hashAlgorithm;
-			private AsymmetricAlgorithm key;
-			private ArrayList authenticatedAttributes;
-			private ArrayList unauthenticatedAttributes;
-			private byte[] signature;
-			private string issuer;
-			private byte[] serial;
-			private byte[] ski;
-
-			public SignerInfo () 
-			{
-				version = 1;
-				authenticatedAttributes = new ArrayList ();
-				unauthenticatedAttributes = new ArrayList ();
-			}
-
-			public SignerInfo (byte[] data) 
-				: this (new ASN1 (data)) {}
-
-			// TODO: INCOMPLETE
-			public SignerInfo (ASN1 asn1) : this () 
-			{
-				if ((asn1[0].Tag != 0x30) || (asn1[0].Count < 5))
-					throw new ArgumentException ("Invalid SignedData");
-
-				// version Version
-				if (asn1[0][0].Tag != 0x02)
-					throw new ArgumentException ("Invalid version");
-				version = asn1[0][0].Value[0];
-
-				// issuerAndSerialNumber IssuerAndSerialNumber
-				ASN1 subjectIdentifierType = asn1 [0][1];
-				if ((subjectIdentifierType.Tag == 0x80) && (version == 3)) {
-					ski = subjectIdentifierType.Value;
-				}
-				else {
-					issuer = X501.ToString (subjectIdentifierType [0]);
-					serial = subjectIdentifierType [1].Value;
-				}
-
-				// digestAlgorithm DigestAlgorithmIdentifier
-				ASN1 digestAlgorithm = asn1 [0][2];
-				hashAlgorithm = ASN1Convert.ToOid (digestAlgorithm [0]);
-
-				// authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL
-				int n = 3;
-				ASN1 authAttributes = asn1 [0][n];
-				if (authAttributes.Tag == 0xA0) {
-					n++;
-					for (int i=0; i < authAttributes.Count; i++)
-						authenticatedAttributes.Add (authAttributes [i]);
-				}
-
-				// digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier
-				n++;
-				// ASN1 digestEncryptionAlgorithm = asn1 [0][n++];
-				// string digestEncryptionAlgorithmOid = ASN1Convert.ToOid (digestEncryptionAlgorithm [0]);
-
-				// encryptedDigest EncryptedDigest
-				ASN1 encryptedDigest = asn1 [0][n++];
-				if (encryptedDigest.Tag == 0x04)
-					signature = encryptedDigest.Value;
-
-				// unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL
-				ASN1 unauthAttributes = asn1 [0][n];
-				if ((unauthAttributes != null) && (unauthAttributes.Tag == 0xA1)) {
-					for (int i=0; i < unauthAttributes.Count; i++)
-						unauthenticatedAttributes.Add (unauthAttributes [i]);
-				}
-			}
-
-			public string IssuerName {
-				get { return issuer; }
-			}
-
-			public byte[] SerialNumber {
-				get { 
-					if (serial == null)
-						return null;
-					return (byte[]) serial.Clone (); 
-				}
-			}
-
-			public byte[] SubjectKeyIdentifier {
-				get { 
-					if (ski == null)
-						return null;
-					return (byte[]) ski.Clone (); 
-				}
-			}
-
-			public ASN1 ASN1 {
-				get { return GetASN1(); }
-			}
-
-			public ArrayList AuthenticatedAttributes {
-				get { return authenticatedAttributes; }
-			}
-
-			public X509Certificate Certificate {
-				get { return x509; }
-				set { x509 = value; }
-			}
-
-			public string HashName {
-				get { return hashAlgorithm; }
-				set { hashAlgorithm = value; }
-			}
-
-			public AsymmetricAlgorithm Key {
-				get { return key; }
-				set { key = value; }
-			}
-
-			public byte[] Signature {
-				get { 
-					if (signature == null)
-						return null;
-					return (byte[]) signature.Clone (); 
-				}
-
-				set {
-					if (value != null) {
-						signature = (byte[]) value.Clone ();
-					}
-				}
-			}
-
-			public ArrayList UnauthenticatedAttributes {
-				get { return unauthenticatedAttributes; }
-			}
-
-			public byte Version {
-				get { return version; }
-				set { version = value; }
-			}
-
-			internal ASN1 GetASN1 () 
-			{
-				if ((key == null) || (hashAlgorithm == null))
-					return null;
-				byte[] ver = { version };
-				ASN1 signerInfo = new ASN1 (0x30);
-				// version Version -> Version ::= INTEGER
-				signerInfo.Add (new ASN1 (0x02, ver));
-				// issuerAndSerialNumber IssuerAndSerialNumber,
-				signerInfo.Add (PKCS7.IssuerAndSerialNumber (x509));
-				// digestAlgorithm DigestAlgorithmIdentifier,
-				string hashOid = CryptoConfig.MapNameToOID (hashAlgorithm);
-				signerInfo.Add (AlgorithmIdentifier (hashOid));
-				// authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL,
-				ASN1 aa = null;
-				if (authenticatedAttributes.Count > 0) {
-					aa = signerInfo.Add (new ASN1 (0xA0));
-					authenticatedAttributes.Sort(new SortedSet ());
-					foreach (ASN1 attr in authenticatedAttributes)
-						aa.Add (attr);
-				}
-				// digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier,
-				if (key is RSA) {
-					signerInfo.Add (AlgorithmIdentifier (PKCS7.Oid.rsaEncryption));
-
-					if (aa != null) {
-						// Calculate the signature here; otherwise it must be set from SignedData
-						RSAPKCS1SignatureFormatter r = new RSAPKCS1SignatureFormatter (key);
-						r.SetHashAlgorithm (hashAlgorithm);
-						byte[] tbs = aa.GetBytes ();
-						tbs [0] = 0x31; // not 0xA0 for signature
-						HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
-						byte[] tbsHash = ha.ComputeHash (tbs);
-						signature = r.CreateSignature (tbsHash);
-					}
-				}
-				else if (key is DSA) {
-					throw new NotImplementedException ("not yet");
-				}
-				else
-					throw new CryptographicException ("Unknown assymetric algorithm");
-				// encryptedDigest EncryptedDigest,
-				signerInfo.Add (new ASN1 (0x04, signature));
-				// unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL 
-				if (unauthenticatedAttributes.Count > 0) {
-					ASN1 ua = signerInfo.Add (new ASN1 (0xA1));
-					unauthenticatedAttributes.Sort(new SortedSet ());
-					foreach (ASN1 attr in unauthenticatedAttributes)
-						ua.Add (attr);
-				}
-				return signerInfo;
-			}
-
-			public byte[] GetBytes () 
-			{
-				return GetASN1 ().GetBytes ();
-			}
-		}
-
-		internal class SortedSet : IComparer {
-
-			public int Compare (object x, object y)
-			{
-				if (x == null)
-					return (y == null) ? 0 : -1;
-				else if (y == null)
-					return 1;
-
-				ASN1 xx = x as ASN1;
-				ASN1 yy = y as ASN1;
-				
-				if ((xx == null) || (yy == null)) {
-					throw new ArgumentException (("Invalid objects."));
-				}
-
-				byte[] xb = xx.GetBytes ();
-				byte[] yb = yy.GetBytes ();
-
-				for (int i = 0; i < xb.Length; i++) {
-					if (i == yb.Length)
-						break;
-
-					if (xb[i] == yb[i]) 
-						continue;
-						
-					return (xb[i] < yb[i]) ? -1 : 1; 
-				}
-
-				// The arrays are equal up to the shortest of them.
-				if (xb.Length > yb.Length)
-					return 1;
-				else if (xb.Length < yb.Length)
-					return -1;
-
-				return 0;
-			}
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/PKCS8.cs b/MediaBrowser.Server.Mono/Security/PKCS8.cs
deleted file mode 100644
index b2f28f318..000000000
--- a/MediaBrowser.Server.Mono/Security/PKCS8.cs
+++ /dev/null
@@ -1,494 +0,0 @@
-//
-// PKCS8.cs: PKCS #8 - Private-Key Information Syntax Standard
-//	ftp://ftp.rsasecurity.com/pub/pkcs/doc/pkcs-8.doc
-//
-// Author:
-//	Sebastien Pouliot <sebastien@xamarin.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2006 Novell Inc. (http://www.novell.com)
-// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Security.Cryptography;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-    public sealed class PKCS8 {
-
-		public enum KeyInfo {
-			PrivateKey,
-			EncryptedPrivateKey,
-			Unknown
-		}
-
-		private PKCS8 () 
-		{
-		}
-
-		static public KeyInfo GetType (byte[] data) 
-		{
-			if (data == null)
-				throw new ArgumentNullException ("data");
-
-			KeyInfo ki = KeyInfo.Unknown;
-			try {
-				ASN1 top = new ASN1 (data);
-				if ((top.Tag == 0x30) && (top.Count > 0)) {
-					ASN1 firstLevel = top [0];
-					switch (firstLevel.Tag) {
-						case 0x02:
-							ki = KeyInfo.PrivateKey;
-							break;
-						case 0x30:
-							ki = KeyInfo.EncryptedPrivateKey;
-							break;
-					}
-				}
-			}
-			catch {
-				throw new CryptographicException ("invalid ASN.1 data");
-			}
-			return ki;
-		}
-
-		/*
-		 * PrivateKeyInfo ::= SEQUENCE {
-		 *	version Version,
-		 *	privateKeyAlgorithm PrivateKeyAlgorithmIdentifier,
-		 *	privateKey PrivateKey,
-		 *	attributes [0] IMPLICIT Attributes OPTIONAL 
-		 * }
-		 * 
-		 * Version ::= INTEGER
-		 * 
-		 * PrivateKeyAlgorithmIdentifier ::= AlgorithmIdentifier
-		 * 
-		 * PrivateKey ::= OCTET STRING
-		 * 
-		 * Attributes ::= SET OF Attribute
-		 */
-		public class PrivateKeyInfo {
-
-			private int _version;
-			private string _algorithm;
-			private byte[] _key;
-			private ArrayList _list;
-
-			public PrivateKeyInfo () 
-			{
-				_version = 0;
-				_list = new ArrayList ();
-			}
-
-			public PrivateKeyInfo (byte[] data) : this () 
-			{
-				Decode (data);
-			}
-
-			// properties
-
-			public string Algorithm {
-				get { return _algorithm; }
-				set { _algorithm = value; }
-			}
-
-			public ArrayList Attributes {
-				get { return _list; }
-			}
-
-			public byte[] PrivateKey {
-				get {
-					if (_key == null)
-						return null;
-					return (byte[]) _key.Clone (); 
-				}
-				set { 
-					if (value == null)
-						throw new ArgumentNullException ("PrivateKey");
-					_key = (byte[]) value.Clone (); 
-				}
-			}
-
-			public int Version {
-				get { return _version; }
-				set { 
-					if (value < 0)
-						throw new ArgumentOutOfRangeException ("negative version");
-					_version = value; 
-				}
-			}
-
-			// methods
-
-			private void Decode (byte[] data) 
-			{
-				ASN1 privateKeyInfo = new ASN1 (data);
-				if (privateKeyInfo.Tag != 0x30)
-					throw new CryptographicException ("invalid PrivateKeyInfo");
-
-				ASN1 version = privateKeyInfo [0];
-				if (version.Tag != 0x02)
-					throw new CryptographicException ("invalid version");
-				_version = version.Value [0];
-
-				ASN1 privateKeyAlgorithm = privateKeyInfo [1];
-				if (privateKeyAlgorithm.Tag != 0x30)
-					throw new CryptographicException ("invalid algorithm");
-				
-				ASN1 algorithm = privateKeyAlgorithm [0];
-				if (algorithm.Tag != 0x06)
-					throw new CryptographicException ("missing algorithm OID");
-				_algorithm = ASN1Convert.ToOid (algorithm);
-
-				ASN1 privateKey = privateKeyInfo [2];
-				_key = privateKey.Value;
-
-				// attributes [0] IMPLICIT Attributes OPTIONAL
-				if (privateKeyInfo.Count > 3) {
-					ASN1 attributes = privateKeyInfo [3];
-					for (int i=0; i < attributes.Count; i++) {
-						_list.Add (attributes [i]);
-					}
-				}
-			}
-
-			public byte[] GetBytes () 
-			{
-				ASN1 privateKeyAlgorithm = new ASN1 (0x30);
-				privateKeyAlgorithm.Add (ASN1Convert.FromOid (_algorithm));
-				privateKeyAlgorithm.Add (new ASN1 (0x05)); // ASN.1 NULL
-
-				ASN1 pki = new ASN1 (0x30);
-				pki.Add (new ASN1 (0x02, new byte [1] { (byte) _version }));
-				pki.Add (privateKeyAlgorithm);
-				pki.Add (new ASN1 (0x04, _key));
-
-				if (_list.Count > 0) {
-					ASN1 attributes = new ASN1 (0xA0);
-					foreach (ASN1 attribute in _list) {
-						attributes.Add (attribute);
-					}
-					pki.Add (attributes);
-				}
-
-				return pki.GetBytes ();
-			}
-
-			// static methods
-
-			static private byte[] RemoveLeadingZero (byte[] bigInt) 
-			{
-				int start = 0;
-				int length = bigInt.Length;
-				if (bigInt [0] == 0x00) {
-					start = 1;
-					length--;
-				}
-				byte[] bi = new byte [length];
-				Buffer.BlockCopy (bigInt, start, bi, 0, length);
-				return bi;
-			}
-
-			static private byte[] Normalize (byte[] bigInt, int length) 
-			{
-				if (bigInt.Length == length)
-					return bigInt;
-				else if (bigInt.Length > length)
-					return RemoveLeadingZero (bigInt);
-				else {
-					// pad with 0
-					byte[] bi = new byte [length];
-					Buffer.BlockCopy (bigInt, 0, bi, (length - bigInt.Length), bigInt.Length);
-					return bi;
-				}
-			}
-			
-			/*
-			 * RSAPrivateKey ::= SEQUENCE {
-			 *	version           Version, 
-			 *	modulus           INTEGER,  -- n
-			 *	publicExponent    INTEGER,  -- e
-			 *	privateExponent   INTEGER,  -- d
-			 *	prime1            INTEGER,  -- p
-			 *	prime2            INTEGER,  -- q
-			 *	exponent1         INTEGER,  -- d mod (p-1)
-			 *	exponent2         INTEGER,  -- d mod (q-1) 
-			 *	coefficient       INTEGER,  -- (inverse of q) mod p
-			 *	otherPrimeInfos   OtherPrimeInfos OPTIONAL 
-			 * }
-			 */
-			static public RSA DecodeRSA (byte[] keypair) 
-			{
-				ASN1 privateKey = new ASN1 (keypair);
-				if (privateKey.Tag != 0x30)
-					throw new CryptographicException ("invalid private key format");
-
-				ASN1 version = privateKey [0];
-				if (version.Tag != 0x02)
-					throw new CryptographicException ("missing version");
-
-				if (privateKey.Count < 9)
-					throw new CryptographicException ("not enough key parameters");
-
-				RSAParameters param = new RSAParameters ();
-				// note: MUST remove leading 0 - else MS wont import the key
-				param.Modulus = RemoveLeadingZero (privateKey [1].Value);
-				int keysize = param.Modulus.Length;
-				int keysize2 = (keysize >> 1); // half-size
-				// size must be normalized - else MS wont import the key
-				param.D = Normalize (privateKey [3].Value, keysize);
-				param.DP = Normalize (privateKey [6].Value, keysize2);
-				param.DQ = Normalize (privateKey [7].Value, keysize2);
-				param.Exponent = RemoveLeadingZero (privateKey [2].Value);
-				param.InverseQ = Normalize (privateKey [8].Value, keysize2);
-				param.P = Normalize (privateKey [4].Value, keysize2);
-				param.Q = Normalize (privateKey [5].Value, keysize2);
-
-				RSA rsa = null;
-				try {
-					rsa = RSA.Create ();
-					rsa.ImportParameters (param);
-				}
-				catch (CryptographicException) {
-                    // this may cause problem when this code is run under
-                    // the SYSTEM identity on Windows (e.g. ASP.NET). See
-                    // http://bugzilla.ximian.com/show_bug.cgi?id=77559
-                    CspParameters csp = new CspParameters();
-                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
-                    rsa = new RSACryptoServiceProvider(csp);
-                    rsa.ImportParameters(param);
-                }
-                return rsa;
-			}
-
-			/*
-			 * RSAPrivateKey ::= SEQUENCE {
-			 *	version           Version, 
-			 *	modulus           INTEGER,  -- n
-			 *	publicExponent    INTEGER,  -- e
-			 *	privateExponent   INTEGER,  -- d
-			 *	prime1            INTEGER,  -- p
-			 *	prime2            INTEGER,  -- q
-			 *	exponent1         INTEGER,  -- d mod (p-1)
-			 *	exponent2         INTEGER,  -- d mod (q-1) 
-			 *	coefficient       INTEGER,  -- (inverse of q) mod p
-			 *	otherPrimeInfos   OtherPrimeInfos OPTIONAL 
-			 * }
-			 */
-			static public byte[] Encode (RSA rsa) 
-			{
-				RSAParameters param = rsa.ExportParameters (true);
-
-				ASN1 rsaPrivateKey = new ASN1 (0x30);
-				rsaPrivateKey.Add (new ASN1 (0x02, new byte [1] { 0x00 }));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.Modulus));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.Exponent));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.D));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.P));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.Q));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.DP));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.DQ));
-				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.InverseQ));
-
-				return rsaPrivateKey.GetBytes ();
-			}
-
-			// DSA only encode it's X private key inside an ASN.1 INTEGER (Hint: Tag == 0x02)
-			// which isn't enough for rebuilding the keypair. The other parameters
-			// can be found (98% of the time) in the X.509 certificate associated
-			// with the private key or (2% of the time) the parameters are in it's
-			// issuer X.509 certificate (not supported in the .NET framework).
-			static public DSA DecodeDSA (byte[] privateKey, DSAParameters dsaParameters) 
-			{
-				ASN1 pvk = new ASN1 (privateKey);
-				if (pvk.Tag != 0x02)
-					throw new CryptographicException ("invalid private key format");
-
-				// X is ALWAYS 20 bytes (no matter if the key length is 512 or 1024 bits)
-				dsaParameters.X = Normalize (pvk.Value, 20);
-				DSA dsa = DSA.Create ();
-				dsa.ImportParameters (dsaParameters);
-				return dsa;
-			}
-
-			static public byte[] Encode (DSA dsa) 
-			{
-				DSAParameters param = dsa.ExportParameters (true);
-				return ASN1Convert.FromUnsignedBigInteger (param.X).GetBytes ();
-			}
-
-			static public byte[] Encode (AsymmetricAlgorithm aa) 
-			{
-				if (aa is RSA)
-					return Encode ((RSA)aa);
-				else if (aa is DSA)
-					return Encode ((DSA)aa);
-				else
-					throw new CryptographicException ("Unknown asymmetric algorithm {0}", aa.ToString ());
-			}
-		}
-
-		/*
-		 * EncryptedPrivateKeyInfo ::= SEQUENCE {
-		 *	encryptionAlgorithm EncryptionAlgorithmIdentifier,
-		 *	encryptedData EncryptedData 
-		 * }
-		 * 
-		 * EncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
-		 * 
-		 * EncryptedData ::= OCTET STRING
-		 * 
-		 * --
-		 *  AlgorithmIdentifier  ::= SEQUENCE {
-		 *	algorithm  OBJECT IDENTIFIER,
-		 *	parameters ANY DEFINED BY algorithm OPTIONAL
-		 * }
-		 * 
-		 * -- from PKCS#5
-		 * PBEParameter ::= SEQUENCE {
-		 *	salt OCTET STRING SIZE(8),
-		 *	iterationCount INTEGER 
-		 * }
-		 */
-		public class EncryptedPrivateKeyInfo {
-
-			private string _algorithm;
-			private byte[] _salt;
-			private int _iterations;
-			private byte[] _data;
-
-			public EncryptedPrivateKeyInfo () {}
-
-			public EncryptedPrivateKeyInfo (byte[] data) : this () 
-			{
-				Decode (data);
-			}
-
-			// properties
-
-			public string Algorithm {
-				get { return _algorithm; }
-				set { _algorithm = value; }
-			}
-
-			public byte[] EncryptedData {
-				get { return (_data == null) ? null : (byte[]) _data.Clone (); }
-				set { _data = (value == null) ? null : (byte[]) value.Clone (); }
-			}
-
-			public byte[] Salt {
-				get { 
-					if (_salt == null) {
-						RandomNumberGenerator rng = RandomNumberGenerator.Create ();
-						_salt = new byte [8];
-						rng.GetBytes (_salt);
-					}
-					return (byte[]) _salt.Clone (); 
-				}
-				set { _salt = (byte[]) value.Clone (); }
-			}
-
-			public int IterationCount {
-				get { return _iterations; }
-				set { 
-					if (value < 0)
-						throw new ArgumentOutOfRangeException ("IterationCount", "Negative");
-					_iterations = value; 
-				}
-			}
-
-			// methods
-
-			private void Decode (byte[] data) 
-			{
-				ASN1 encryptedPrivateKeyInfo = new ASN1 (data);
-				if (encryptedPrivateKeyInfo.Tag != 0x30)
-					throw new CryptographicException ("invalid EncryptedPrivateKeyInfo");
-
-				ASN1 encryptionAlgorithm = encryptedPrivateKeyInfo [0];
-				if (encryptionAlgorithm.Tag != 0x30)
-					throw new CryptographicException ("invalid encryptionAlgorithm");
-				ASN1 algorithm = encryptionAlgorithm [0];
-				if (algorithm.Tag != 0x06)
-					throw new CryptographicException ("invalid algorithm");
-				_algorithm = ASN1Convert.ToOid (algorithm);
-				// parameters ANY DEFINED BY algorithm OPTIONAL
-				if (encryptionAlgorithm.Count > 1) {
-					ASN1 parameters = encryptionAlgorithm [1];
-					if (parameters.Tag != 0x30)
-						throw new CryptographicException ("invalid parameters");
-
-					ASN1 salt = parameters [0];
-					if (salt.Tag != 0x04)
-						throw new CryptographicException ("invalid salt");
-					_salt = salt.Value;
-
-					ASN1 iterationCount = parameters [1];
-					if (iterationCount.Tag != 0x02)
-						throw new CryptographicException ("invalid iterationCount");
-					_iterations = ASN1Convert.ToInt32 (iterationCount);
-				}
-
-				ASN1 encryptedData = encryptedPrivateKeyInfo [1];
-				if (encryptedData.Tag != 0x04)
-					throw new CryptographicException ("invalid EncryptedData");
-				_data = encryptedData.Value;
-			}
-
-			// Note: PKCS#8 doesn't define how to generate the key required for encryption
-			// so you're on your own. Just don't try to copy the big guys too much ;)
-			// Netscape:	http://www.cs.auckland.ac.nz/~pgut001/pubs/netscape.txt
-			// Microsoft:	http://www.cs.auckland.ac.nz/~pgut001/pubs/breakms.txt
-			public byte[] GetBytes ()
-			{
-				if (_algorithm == null)
-					throw new CryptographicException ("No algorithm OID specified");
-
-				ASN1 encryptionAlgorithm = new ASN1 (0x30);
-				encryptionAlgorithm.Add (ASN1Convert.FromOid (_algorithm));
-
-				// parameters ANY DEFINED BY algorithm OPTIONAL
-				if ((_iterations > 0) || (_salt != null)) {
-					ASN1 salt = new ASN1 (0x04, _salt);
-					ASN1 iterations = ASN1Convert.FromInt32 (_iterations);
-
-					ASN1 parameters = new ASN1 (0x30);
-					parameters.Add (salt);
-					parameters.Add (iterations);
-					encryptionAlgorithm.Add (parameters);
-				}
-
-				// encapsulates EncryptedData into an OCTET STRING
-				ASN1 encryptedData = new ASN1 (0x04, _data);
-
-				ASN1 encryptedPrivateKeyInfo = new ASN1 (0x30);
-				encryptedPrivateKeyInfo.Add (encryptionAlgorithm);
-				encryptedPrivateKeyInfo.Add (encryptedData);
-
-				return encryptedPrivateKeyInfo.GetBytes ();
-			}
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X501Name.cs b/MediaBrowser.Server.Mono/Security/X501Name.cs
deleted file mode 100644
index d77158e45..000000000
--- a/MediaBrowser.Server.Mono/Security/X501Name.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-//
-// X501Name.cs: X.501 Distinguished Names stuff 
-//
-// Author:
-//	Sebastien Pouliot <sebastien@ximian.com>
-//
-// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Globalization;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-	// References:
-	// 1.	Information technology - Open Systems Interconnection - The Directory: Models
-	//	http://www.itu.int/rec/recommendation.asp?type=items&lang=e&parent=T-REC-X.501-200102-I
-	// 2.	RFC2253: Lightweight Directory Access Protocol (v3): UTF-8 String Representation of Distinguished Names
-	//	http://www.ietf.org/rfc/rfc2253.txt
-
-	/*
-	 * Name ::= CHOICE { RDNSequence }
-	 * 
-	 * RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
-	 * 
-	 * RelativeDistinguishedName ::= SET OF AttributeTypeAndValue
-	 */
-    public sealed class X501 {
-
-		static byte[] countryName = { 0x55, 0x04, 0x06 };
-		static byte[] organizationName = { 0x55, 0x04, 0x0A };
-		static byte[] organizationalUnitName = { 0x55, 0x04, 0x0B };
-		static byte[] commonName = { 0x55, 0x04, 0x03 };
-		static byte[] localityName = { 0x55, 0x04, 0x07 };
-		static byte[] stateOrProvinceName = { 0x55, 0x04, 0x08 };
-		static byte[] streetAddress = { 0x55, 0x04, 0x09 };
-		//static byte[] serialNumber = { 0x55, 0x04, 0x05 };
-		static byte[] domainComponent = { 0x09, 0x92, 0x26, 0x89, 0x93, 0xF2, 0x2C, 0x64, 0x01, 0x19 };
-		static byte[] userid = { 0x09, 0x92, 0x26, 0x89, 0x93, 0xF2, 0x2C, 0x64, 0x01, 0x01 };
-		static byte[] email = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01 };
-		static byte[] dnQualifier = { 0x55, 0x04, 0x2E };
-		static byte[] title = { 0x55, 0x04, 0x0C };
-		static byte[] surname = { 0x55, 0x04, 0x04 };
-		static byte[] givenName = { 0x55, 0x04, 0x2A };
-		static byte[] initial = { 0x55, 0x04, 0x2B };
-
-		private X501 () 
-		{
-		}
-
-		static public string ToString (ASN1 seq) 
-		{
-			StringBuilder sb = new StringBuilder ();
-			for (int i = 0; i < seq.Count; i++) {
-				ASN1 entry = seq [i];
-				AppendEntry (sb, entry, true);
-
-				// separator (not on last iteration)
-				if (i < seq.Count - 1)
-					sb.Append (", ");
-			}
-			return sb.ToString ();
-		}
-
-		static public string ToString (ASN1 seq, bool reversed, string separator, bool quotes)
-		{
-			StringBuilder sb = new StringBuilder ();
-
-			if (reversed) {
-				for (int i = seq.Count - 1; i >= 0; i--) {
-					ASN1 entry = seq [i];
-					AppendEntry (sb, entry, quotes);
-
-					// separator (not on last iteration)
-					if (i > 0)
-						sb.Append (separator);
-				}
-			} else {
-				for (int i = 0; i < seq.Count; i++) {
-					ASN1 entry = seq [i];
-					AppendEntry (sb, entry, quotes);
-
-					// separator (not on last iteration)
-					if (i < seq.Count - 1)
-						sb.Append (separator);
-				}
-			}
-			return sb.ToString ();
-		}
-
-		static private void AppendEntry (StringBuilder sb, ASN1 entry, bool quotes)
-		{
-			// multiple entries are valid
-			for (int k = 0; k < entry.Count; k++) {
-				ASN1 pair = entry [k];
-				ASN1 s = pair [1];
-				if (s == null)
-					continue;
-
-				ASN1 poid = pair [0];
-				if (poid == null)
-					continue;
-
-				if (poid.CompareValue (countryName))
-					sb.Append ("C=");
-				else if (poid.CompareValue (organizationName))
-					sb.Append ("O=");
-				else if (poid.CompareValue (organizationalUnitName))
-					sb.Append ("OU=");
-				else if (poid.CompareValue (commonName))
-					sb.Append ("CN=");
-				else if (poid.CompareValue (localityName))
-					sb.Append ("L=");
-				else if (poid.CompareValue (stateOrProvinceName))
-					sb.Append ("S=");	// NOTE: RFC2253 uses ST=
-				else if (poid.CompareValue (streetAddress))
-					sb.Append ("STREET=");
-				else if (poid.CompareValue (domainComponent))
-					sb.Append ("DC=");
-				else if (poid.CompareValue (userid))
-					sb.Append ("UID=");
-				else if (poid.CompareValue (email))
-					sb.Append ("E=");	// NOTE: Not part of RFC2253
-				else if (poid.CompareValue (dnQualifier))
-					sb.Append ("dnQualifier=");
-				else if (poid.CompareValue (title))
-					sb.Append ("T=");
-				else if (poid.CompareValue (surname))
-					sb.Append ("SN=");
-				else if (poid.CompareValue (givenName))
-					sb.Append ("G=");
-				else if (poid.CompareValue (initial))
-					sb.Append ("I=");
-				else {
-					// unknown OID
-					sb.Append ("OID.");	// NOTE: Not present as RFC2253
-					sb.Append (ASN1Convert.ToOid (poid));
-					sb.Append ("=");
-				}
-
-				string sValue = null;
-				// 16bits or 8bits string ? TODO not complete (+special chars!)
-				if (s.Tag == 0x1E) {
-					// BMPSTRING
-					StringBuilder sb2 = new StringBuilder ();
-					for (int j = 1; j < s.Value.Length; j += 2)
-						sb2.Append ((char)s.Value[j]);
-					sValue = sb2.ToString ();
-				} else {
-					if (s.Tag == 0x14)
-						sValue = Encoding.UTF7.GetString (s.Value);
-					else
-						sValue = Encoding.UTF8.GetString (s.Value);
-					// in some cases we must quote (") the value
-					// Note: this doesn't seems to conform to RFC2253
-					char[] specials = { ',', '+', '"', '\\', '<', '>', ';' };
-					if (quotes) {
-						if ((sValue.IndexOfAny (specials, 0, sValue.Length) > 0) ||
-						    sValue.StartsWith (" ") || (sValue.EndsWith (" ")))
-							sValue = "\"" + sValue + "\"";
-					}
-				}
-
-				sb.Append (sValue);
-
-				// separator (not on last iteration)
-				if (k < entry.Count - 1)
-					sb.Append (", ");
-			}
-		}
-
-		static private X520.AttributeTypeAndValue GetAttributeFromOid (string attributeType) 
-		{
-			string s = attributeType.ToUpper (CultureInfo.InvariantCulture).Trim ();
-			switch (s) {
-				case "C":
-					return new X520.CountryName ();
-				case "O":
-					return new X520.OrganizationName ();
-				case "OU":
-					return new X520.OrganizationalUnitName ();
-				case "CN":
-					return new X520.CommonName ();
-				case "L":
-					return new X520.LocalityName ();
-				case "S":	// Microsoft
-				case "ST":	// RFC2253
-					return new X520.StateOrProvinceName ();
-				case "E":	// NOTE: Not part of RFC2253
-					return new X520.EmailAddress ();
-				case "DC":	// RFC2247
-					return new X520.DomainComponent ();
-				case "UID":	// RFC1274
-					return new X520.UserId ();
-				case "DNQUALIFIER":
-					return new X520.DnQualifier ();
-				case "T":
-					return new X520.Title ();
-				case "SN":
-					return new X520.Surname ();
-				case "G":
-					return new X520.GivenName ();
-				case "I":
-					return new X520.Initial ();
-				default:
-					if (s.StartsWith ("OID.")) {
-						// MUST support it but it OID may be without it
-						return new X520.Oid (s.Substring (4));
-					} else {
-						if (IsOid (s))
-							return new X520.Oid (s);
-						else
-							return null;
-					}
-			}
-		}
-
-		static private bool IsOid (string oid)
-		{
-			try {
-				ASN1 asn = ASN1Convert.FromOid (oid);
-				return (asn.Tag == 0x06);
-			}
-			catch {
-				return false;
-			}
-		}
-
-		// no quote processing
-		static private X520.AttributeTypeAndValue ReadAttribute (string value, ref int pos)
-		{
-			while ((value[pos] == ' ') && (pos < value.Length))
-				pos++;
-
-			// get '=' position in substring
-			int equal = value.IndexOf ('=', pos);
-			if (equal == -1) {
-				string msg =  ("No attribute found.");
-				throw new FormatException (msg);
-			}
-
-			string s = value.Substring (pos, equal - pos);
-			X520.AttributeTypeAndValue atv = GetAttributeFromOid (s);
-			if (atv == null) {
-				string msg =  ("Unknown attribute '{0}'.");
-				throw new FormatException (String.Format (msg, s));
-			}
-			pos = equal + 1; // skip the '='
-			return atv;
-		}
-
-		static private bool IsHex (char c)
-		{
-			if (Char.IsDigit (c))
-				return true;
-			char up = Char.ToUpper (c, CultureInfo.InvariantCulture);
-			return ((up >= 'A') && (up <= 'F'));
-		}
-
-		static string ReadHex (string value, ref int pos)
-		{
-			StringBuilder sb = new StringBuilder ();
-			// it is (at least an) 8 bits char
-			sb.Append (value[pos++]);
-			sb.Append (value[pos]);
-			// look ahead for a 16 bits char
-			if ((pos < value.Length - 4) && (value[pos+1] == '\\') && IsHex (value[pos+2])) {
-				pos += 2; // pass last char and skip \
-				sb.Append (value[pos++]);
-				sb.Append (value[pos]);
-			}
-			byte[] data = CryptoConvert.FromHex (sb.ToString ());
-			return Encoding.UTF8.GetString (data);
-		}
-
-		static private int ReadEscaped (StringBuilder sb, string value, int pos)
-		{
-			switch (value[pos]) {
-			case '\\':
-			case '"':
-			case '=':
-			case ';':
-			case '<':
-			case '>':
-			case '+':
-			case '#':
-			case ',':
-				sb.Append (value[pos]);
-				return pos;
-			default:
-				if (pos >= value.Length - 2) {
-					string msg = ("Malformed escaped value '{0}'.");
-					throw new FormatException (string.Format (msg, value.Substring (pos)));
-				}
-				// it's either a 8 bits or 16 bits char
-				sb.Append (ReadHex (value, ref pos));
-				return pos;
-			}
-		}
-
-		static private int ReadQuoted (StringBuilder sb, string value, int pos)
-		{
-			int original = pos;
-			while (pos <= value.Length) {
-				switch (value[pos]) {
-				case '"':
-					return pos;
-				case '\\':
-					return ReadEscaped (sb, value, pos);
-				default:
-					sb.Append (value[pos]);
-					pos++;
-					break;
-				}
-			}
-			string msg = ("Malformed quoted value '{0}'.");
-			throw new FormatException (string.Format (msg, value.Substring (original)));
-		}
-
-		static private string ReadValue (string value, ref int pos)
-		{
-			int original = pos;
-			StringBuilder sb = new StringBuilder ();
-			while (pos < value.Length) {
-				switch (value [pos]) {
-				case '\\':
-					pos = ReadEscaped (sb, value, ++pos);
-					break;
-				case '"':
-					pos = ReadQuoted (sb, value, ++pos);
-					break;
-				case '=':
-				case ';':
-				case '<':
-				case '>':
-					string msg =("Malformed value '{0}' contains '{1}' outside quotes.");
-					throw new FormatException (string.Format (msg, value.Substring (original), value[pos]));
-				case '+':
-				case '#':
-					throw new NotImplementedException ();
-				case ',':
-					pos++;
-					return sb.ToString ();
-				default:
-					sb.Append (value[pos]);
-					break;
-				}
-				pos++;
-			}
-			return sb.ToString ();
-		}
-
-		static public ASN1 FromString (string rdn) 
-		{
-			if (rdn == null)
-				throw new ArgumentNullException ("rdn");
-
-			int pos = 0;
-			ASN1 asn1 = new ASN1 (0x30);
-			while (pos < rdn.Length) {
-				X520.AttributeTypeAndValue atv = ReadAttribute (rdn, ref pos);
-				atv.Value = ReadValue (rdn, ref pos);
-
-				ASN1 sequence = new ASN1 (0x31);
-				sequence.Add (atv.GetASN1 ());
-				asn1.Add (sequence); 
-			}
-			return asn1;
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X509Builder.cs b/MediaBrowser.Server.Mono/Security/X509Builder.cs
deleted file mode 100644
index 4801f3d8a..000000000
--- a/MediaBrowser.Server.Mono/Security/X509Builder.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// X509Builder.cs: Abstract builder class for X509 objects
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell (http://www.novell.com) 
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Globalization;
-using System.Security.Cryptography;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-	public abstract class X509Builder {
-
-		private const string defaultHash = "SHA1";
-		private string hashName;
-
-		protected X509Builder ()
-		{
-			hashName = defaultHash;
-		}
-
-		protected abstract ASN1 ToBeSigned (string hashName);
-
-		// move to PKCS1
-		protected string GetOid (string hashName) 
-		{
-			switch (hashName.ToLower (CultureInfo.InvariantCulture)) {
-				case "md2":
-					// md2withRSAEncryption (1 2 840 113549 1 1 2)
-					return "1.2.840.113549.1.1.2";
-				case "md4":
-					// md4withRSAEncryption (1 2 840 113549 1 1 3)
-					return "1.2.840.113549.1.1.3";
-				case "md5":
-					// md5withRSAEncryption (1 2 840 113549 1 1 4)
-					return "1.2.840.113549.1.1.4";
-				case "sha1":
-					// sha1withRSAEncryption (1 2 840 113549 1 1 5)
-					return "1.2.840.113549.1.1.5";
-				case "sha256":
-					// sha256WithRSAEncryption 	OBJECT IDENTIFIER ::= { pkcs-1 11 }
-					return "1.2.840.113549.1.1.11";
-				case "sha384":
-					// sha384WithRSAEncryption 	OBJECT IDENTIFIER ::= { pkcs-1 12 }
-					return "1.2.840.113549.1.1.12";
-				case "sha512":
-					// sha512WithRSAEncryption 	OBJECT IDENTIFIER ::= { pkcs-1 13 }
-					return "1.2.840.113549.1.1.13";
-				default:
-					throw new NotSupportedException ("Unknown hash algorithm " + hashName);
-			}
-		}
-
-		public string Hash {
-			get { return hashName; }
-			set { 
-				if (hashName == null)
-					hashName = defaultHash;
-				else
-					hashName = value;
-			}
-		}
-
-		public virtual byte[] Sign (AsymmetricAlgorithm aa) 
-		{
-			if (aa is RSA)
-				return Sign (aa as RSA);
-			else if (aa is DSA)
-				return Sign (aa as DSA);
-			else
-				throw new NotSupportedException ("Unknown Asymmetric Algorithm " + aa.ToString());
-		}
-
-		private byte[] Build (ASN1 tbs, string hashoid, byte[] signature) 
-		{
-			ASN1 builder = new ASN1 (0x30);
-			builder.Add (tbs);
-			builder.Add (PKCS7.AlgorithmIdentifier (hashoid));
-			// first byte of BITSTRING is the number of unused bits in the first byte
-			byte[] bitstring = new byte [signature.Length + 1];
-			Buffer.BlockCopy (signature, 0, bitstring, 1, signature.Length);
-			builder.Add (new ASN1 (0x03, bitstring));
-			return builder.GetBytes ();
-		}
-
-		public virtual byte[] Sign (RSA key)
-		{
-			string oid = GetOid (hashName);
-			ASN1 tbs = ToBeSigned (oid);
-			HashAlgorithm ha = HashAlgorithm.Create (hashName);
-			byte[] hash = ha.ComputeHash (tbs.GetBytes ());
-
-			RSAPKCS1SignatureFormatter pkcs1 = new RSAPKCS1SignatureFormatter (key);
-			pkcs1.SetHashAlgorithm (hashName);
-			byte[] signature = pkcs1.CreateSignature (hash);
-
-			return Build (tbs, oid, signature);
-		}
-
-		public virtual byte[] Sign (DSA key) 
-		{
-			string oid = "1.2.840.10040.4.3";
-			ASN1 tbs = ToBeSigned (oid);
-			HashAlgorithm ha = HashAlgorithm.Create (hashName);
-			if (!(ha is SHA1))
-				throw new NotSupportedException ("Only SHA-1 is supported for DSA");
-			byte[] hash = ha.ComputeHash (tbs.GetBytes ());
-
-			DSASignatureFormatter dsa = new DSASignatureFormatter (key);
-			dsa.SetHashAlgorithm (hashName);
-			byte[] rs = dsa.CreateSignature (hash);
-
-			// split R and S
-			byte[] r = new byte [20];
-			Buffer.BlockCopy (rs, 0, r, 0, 20);
-			byte[] s = new byte [20];
-			Buffer.BlockCopy (rs, 20, s, 0, 20);
-			ASN1 signature = new ASN1 (0x30);
-			signature.Add (new ASN1 (0x02, r));
-			signature.Add (new ASN1 (0x02, s));
-
-			// dsaWithSha1 (1 2 840 10040 4 3)
-			return Build (tbs, oid, signature.GetBytes ());
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X509Certificate.cs b/MediaBrowser.Server.Mono/Security/X509Certificate.cs
deleted file mode 100644
index fa817d959..000000000
--- a/MediaBrowser.Server.Mono/Security/X509Certificate.cs
+++ /dev/null
@@ -1,562 +0,0 @@
-//
-// X509Certificates.cs: Handles X.509 certificates.
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@xamarin.com>
-//
-// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
-// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-using System.Security.Cryptography;
-using System.Security.Permissions;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-    // References:
-    // a.	Internet X.509 Public Key Infrastructure Certificate and CRL Profile
-    //	http://www.ietf.org/rfc/rfc3280.txt
-    // b.	ITU ASN.1 standards (free download)
-    //	http://www.itu.int/ITU-T/studygroups/com17/languages/
-
-    public class X509Certificate : ISerializable
-    {
-
-        private ASN1 decoder;
-
-		private byte[] m_encodedcert;
-		private DateTime m_from;
-		private DateTime m_until;
-		private ASN1 issuer;
-		private string m_issuername;
-		private string m_keyalgo;
-		private byte[] m_keyalgoparams;
-		private ASN1 subject;
-		private string m_subject;
-		private byte[] m_publickey;
-		private byte[] signature;
-		private string m_signaturealgo;
-		private byte[] m_signaturealgoparams;
-		private byte[] certhash;
-		private RSA _rsa;
-		private DSA _dsa;
-
-		// from http://msdn.microsoft.com/en-gb/library/ff635835.aspx
-		private const string OID_DSA = "1.2.840.10040.4.1";
-		private const string OID_RSA = "1.2.840.113549.1.1.1";
-		
-		// from http://www.ietf.org/rfc/rfc2459.txt
-		//
-		//Certificate  ::=  SEQUENCE  {
-		//     tbsCertificate       TBSCertificate,
-		//     signatureAlgorithm   AlgorithmIdentifier,
-		//     signature            BIT STRING  }
-		//
-		//TBSCertificate  ::=  SEQUENCE  {
-		//     version         [0]  Version DEFAULT v1,
-		//     serialNumber         CertificateSerialNumber,
-		//     signature            AlgorithmIdentifier,
-		//     issuer               Name,
-		//     validity             Validity,
-		//     subject              Name,
-		//     subjectPublicKeyInfo SubjectPublicKeyInfo,
-		//     issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
-		//                          -- If present, version shall be v2 or v3
-		//     subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
-		//                          -- If present, version shall be v2 or v3
-		//     extensions      [3]  Extensions OPTIONAL
-		//                          -- If present, version shall be v3 --  }
-		private int version;
-		private byte[] serialnumber;
-
-		private byte[] issuerUniqueID;
-		private byte[] subjectUniqueID;
-		private X509ExtensionCollection extensions;
-
-		private static string encoding_error = ("Input data cannot be coded as a valid certificate.");
-
-
-		// that's were the real job is!
-		private void Parse (byte[] data) 
-		{
-			try {
-				decoder = new ASN1 (data);
-				// Certificate 
-				if (decoder.Tag != 0x30)
-					throw new CryptographicException (encoding_error);
-				// Certificate / TBSCertificate
-				if (decoder [0].Tag != 0x30)
-					throw new CryptographicException (encoding_error);
-
-				ASN1 tbsCertificate = decoder [0];
-
-				int tbs = 0;
-				// Certificate / TBSCertificate / Version
-				ASN1 v = decoder [0][tbs];
-				version = 1;			// DEFAULT v1
-				if ((v.Tag == 0xA0) && (v.Count > 0)) {
-					// version (optional) is present only in v2+ certs
-					version += v [0].Value [0];	// zero based
-					tbs++;
-				}
-
-				// Certificate / TBSCertificate / CertificateSerialNumber
-				ASN1 sn = decoder [0][tbs++];
-				if (sn.Tag != 0x02) 
-					throw new CryptographicException (encoding_error);
-				serialnumber = sn.Value;
-				Array.Reverse (serialnumber, 0, serialnumber.Length);
-		
-				// Certificate / TBSCertificate / AlgorithmIdentifier
-				tbs++;
-				// ASN1 signatureAlgo = tbsCertificate.Element (tbs++, 0x30); 
-		
-				issuer = tbsCertificate.Element (tbs++, 0x30); 
-				m_issuername = X501.ToString (issuer);
-		
-				ASN1 validity = tbsCertificate.Element (tbs++, 0x30);
-				ASN1 notBefore = validity [0];
-				m_from = ASN1Convert.ToDateTime (notBefore);
-				ASN1 notAfter = validity [1];
-				m_until = ASN1Convert.ToDateTime (notAfter);
-		
-				subject = tbsCertificate.Element (tbs++, 0x30);
-				m_subject = X501.ToString (subject);
-		
-				ASN1 subjectPublicKeyInfo = tbsCertificate.Element (tbs++, 0x30);
-		
-				ASN1 algorithm = subjectPublicKeyInfo.Element (0, 0x30);
-				ASN1 algo = algorithm.Element (0, 0x06);
-				m_keyalgo = ASN1Convert.ToOid (algo);
-				// parameters ANY DEFINED BY algorithm OPTIONAL
-				// so we dont ask for a specific (Element) type and return DER
-				ASN1 parameters = algorithm [1];
-				m_keyalgoparams = ((algorithm.Count > 1) ? parameters.GetBytes () : null);
-		
-				ASN1 subjectPublicKey = subjectPublicKeyInfo.Element (1, 0x03); 
-				// we must drop th first byte (which is the number of unused bits
-				// in the BITSTRING)
-				int n = subjectPublicKey.Length - 1;
-				m_publickey = new byte [n];
-				Buffer.BlockCopy (subjectPublicKey.Value, 1, m_publickey, 0, n);
-
-				// signature processing
-				byte[] bitstring = decoder [2].Value;
-				// first byte contains unused bits in first byte
-				signature = new byte [bitstring.Length - 1];
-				Buffer.BlockCopy (bitstring, 1, signature, 0, signature.Length);
-
-				algorithm = decoder [1];
-				algo = algorithm.Element (0, 0x06);
-				m_signaturealgo = ASN1Convert.ToOid (algo);
-				parameters = algorithm [1];
-				if (parameters != null)
-					m_signaturealgoparams = parameters.GetBytes ();
-				else
-					m_signaturealgoparams = null;
-
-				// Certificate / TBSCertificate / issuerUniqueID
-				ASN1 issuerUID = tbsCertificate.Element (tbs, 0x81);
-				if (issuerUID != null) {
-					tbs++;
-					issuerUniqueID = issuerUID.Value;
-				}
-
-				// Certificate / TBSCertificate / subjectUniqueID
-				ASN1 subjectUID = tbsCertificate.Element (tbs, 0x82);
-				if (subjectUID != null) {
-					tbs++;
-					subjectUniqueID = subjectUID.Value;
-				}
-
-				// Certificate / TBSCertificate / Extensions
-				ASN1 extns = tbsCertificate.Element (tbs, 0xA3);
-				if ((extns != null) && (extns.Count == 1))
-					extensions = new X509ExtensionCollection (extns [0]);
-				else
-					extensions = new X509ExtensionCollection (null);
-
-				// keep a copy of the original data
-				m_encodedcert = (byte[]) data.Clone ();
-			}
-			catch (Exception ex) {
-				throw new CryptographicException (encoding_error, ex);
-			}
-		}
-
-		// constructors
-
-		public X509Certificate (byte[] data) 
-		{
-			if (data != null) {
-				// does it looks like PEM ?
-				if ((data.Length > 0) && (data [0] != 0x30)) {
-					try {
-						data = PEM ("CERTIFICATE", data);
-					}
-					catch (Exception ex) {
-						throw new CryptographicException (encoding_error, ex);
-					}
-				}
-				Parse (data);
-			}
-		}
-
-		private byte[] GetUnsignedBigInteger (byte[] integer) 
-		{
-			if (integer [0] == 0x00) {
-				// this first byte is added so we're sure it's an unsigned integer
-				// however we can't feed it into RSAParameters or DSAParameters
-				int length = integer.Length - 1;
-				byte[] uinteger = new byte [length];
-				Buffer.BlockCopy (integer, 1, uinteger, 0, length);
-				return uinteger;
-			}
-			else
-				return integer;
-		}
-
-		// public methods
-
-		public DSA DSA {
-			get {
-				if (m_keyalgoparams == null)
-					throw new CryptographicException ("Missing key algorithm parameters.");
-
-				if (_dsa == null && m_keyalgo == OID_DSA) {
-					DSAParameters dsaParams = new DSAParameters ();
-					// for DSA m_publickey contains 1 ASN.1 integer - Y
-					ASN1 pubkey = new ASN1 (m_publickey);
-					if ((pubkey == null) || (pubkey.Tag != 0x02))
-						return null;
-					dsaParams.Y = GetUnsignedBigInteger (pubkey.Value);
-
-					ASN1 param = new ASN1 (m_keyalgoparams);
-					if ((param == null) || (param.Tag != 0x30) || (param.Count < 3))
-						return null;
-					if ((param [0].Tag != 0x02) || (param [1].Tag != 0x02) || (param [2].Tag != 0x02))
-						return null;
-					dsaParams.P = GetUnsignedBigInteger (param [0].Value);
-					dsaParams.Q = GetUnsignedBigInteger (param [1].Value);
-					dsaParams.G = GetUnsignedBigInteger (param [2].Value);
-
-					// BUG: MS BCL 1.0 can't import a key which 
-					// isn't the same size as the one present in
-					// the container.
-					_dsa = (DSA) new DSACryptoServiceProvider (dsaParams.Y.Length << 3);
-					_dsa.ImportParameters (dsaParams);
-				}
-				return _dsa; 
-			}
-
-			set {
-				_dsa = value;
-				if (value != null)
-					_rsa = null;
-			}
-		}
-
-		public X509ExtensionCollection Extensions {
-			get { return extensions; }
-		}
-
-		public byte[] Hash {
-			get {
-				if (certhash == null) {
-					if ((decoder == null) || (decoder.Count < 1))
-						return null;
-					string algo = PKCS1.HashNameFromOid (m_signaturealgo, false);
-					if (algo == null)
-						return null;
-					byte[] toBeSigned = decoder [0].GetBytes ();
-					using (var hash = PKCS1.CreateFromName (algo))
-						certhash = hash.ComputeHash (toBeSigned, 0, toBeSigned.Length);
-				}
-				return (byte[]) certhash.Clone ();
-			}
-		}
-
-		public virtual string IssuerName {
-			get { return m_issuername; }
-		}
-
-		public virtual string KeyAlgorithm {
-			get { return m_keyalgo; }
-		}
-
-		public virtual byte[] KeyAlgorithmParameters {
-			get {
-				if (m_keyalgoparams == null)
-					return null;
-				return (byte[]) m_keyalgoparams.Clone (); 
-			}
-			set { m_keyalgoparams = value; }
-		}
-
-		public virtual byte[] PublicKey	{
-			get { 
-				if (m_publickey == null)
-					return null;
-				return (byte[]) m_publickey.Clone ();
-			}
-		}
-
-		public virtual RSA RSA {
-			get {
-				if (_rsa == null && m_keyalgo == OID_RSA) {
-					RSAParameters rsaParams = new RSAParameters ();
-					// for RSA m_publickey contains 2 ASN.1 integers
-					// the modulus and the public exponent
-					ASN1 pubkey = new ASN1 (m_publickey);
-					ASN1 modulus = pubkey [0];
-					if ((modulus == null) || (modulus.Tag != 0x02))
-						return null;
-					ASN1 exponent = pubkey [1];
-					if (exponent.Tag != 0x02)
-						return null;
-
-					rsaParams.Modulus = GetUnsignedBigInteger (modulus.Value);
-					rsaParams.Exponent = exponent.Value;
-
-					// BUG: MS BCL 1.0 can't import a key which 
-					// isn't the same size as the one present in
-					// the container.
-					int keySize = (rsaParams.Modulus.Length << 3);
-					_rsa = (RSA) new RSACryptoServiceProvider (keySize);
-					_rsa.ImportParameters (rsaParams);
-				}
-				return _rsa; 
-			}
-
-			set {
-				if (value != null)
-					_dsa = null;
-				_rsa = value;
-			}
-		}
-	        
-		public virtual byte[] RawData {
-			get {
-				if (m_encodedcert == null)
-					return null;
-				return (byte[]) m_encodedcert.Clone ();
-			}
-		}
-
-		public virtual byte[] SerialNumber {
-			get { 
-				if (serialnumber == null)
-					return null;
-				return (byte[]) serialnumber.Clone (); 
-			}
-		}
-
-		public virtual byte[] Signature {
-			get { 
-				if (signature == null)
-					return null;
-
-				switch (m_signaturealgo) {
-					case "1.2.840.113549.1.1.2":	// MD2 with RSA encryption 
-					case "1.2.840.113549.1.1.3":	// MD4 with RSA encryption 
-					case "1.2.840.113549.1.1.4":	// MD5 with RSA encryption 
-					case "1.2.840.113549.1.1.5":	// SHA-1 with RSA Encryption 
-					case "1.3.14.3.2.29":		// SHA1 with RSA signature
-					case "1.2.840.113549.1.1.11":	// SHA-256 with RSA Encryption
-					case "1.2.840.113549.1.1.12":	// SHA-384 with RSA Encryption
-					case "1.2.840.113549.1.1.13":	// SHA-512 with RSA Encryption
-					case "1.3.36.3.3.1.2":			// RIPEMD160 with RSA Encryption
-						return (byte[]) signature.Clone ();
-
-					case "1.2.840.10040.4.3":	// SHA-1 with DSA
-						ASN1 sign = new ASN1 (signature);
-						if ((sign == null) || (sign.Count != 2))
-							return null;
-						byte[] part1 = sign [0].Value;
-						byte[] part2 = sign [1].Value;
-						byte[] sig = new byte [40];
-						// parts may be less than 20 bytes (i.e. first bytes were 0x00)
-						// parts may be more than 20 bytes (i.e. first byte > 0x80, negative)
-						int s1 = System.Math.Max (0, part1.Length - 20);
-						int e1 = System.Math.Max (0, 20 - part1.Length);
-						Buffer.BlockCopy (part1, s1, sig, e1, part1.Length - s1);
-						int s2 = System.Math.Max (0, part2.Length - 20);
-						int e2 = System.Math.Max (20, 40 - part2.Length);
-						Buffer.BlockCopy (part2, s2, sig, e2, part2.Length - s2);
-						return sig;
-
-					default:
-						throw new CryptographicException ("Unsupported hash algorithm: " + m_signaturealgo);
-				}
-			}
-		}
-
-		public virtual string SignatureAlgorithm {
-			get { return m_signaturealgo; }
-		}
-
-		public virtual byte[] SignatureAlgorithmParameters {
-			get { 
-				if (m_signaturealgoparams == null)
-					return m_signaturealgoparams;
-				return (byte[]) m_signaturealgoparams.Clone ();
-			}
-		}
-
-		public virtual string SubjectName {
-			get { return m_subject; }
-		}
-
-		public virtual DateTime ValidFrom {
-			get { return m_from; }
-		}
-
-		public virtual DateTime ValidUntil {
-			get { return m_until; }
-		}
-
-		public int Version {
-			get { return version; }
-		}
-
-		public bool IsCurrent {
-			get { return WasCurrent (DateTime.UtcNow); }
-		}
-
-		public bool WasCurrent (DateTime instant) 
-		{
-			return ((instant > ValidFrom) && (instant <= ValidUntil));
-		}
-
-		// uncommon v2 "extension"
-		public byte[] IssuerUniqueIdentifier {
-			get {
-				if (issuerUniqueID == null)
-					return null;
-				return (byte[]) issuerUniqueID.Clone ();
-			}
-		}
-
-		// uncommon v2 "extension"
-		public byte[] SubjectUniqueIdentifier {
-			get {
-				if (subjectUniqueID == null)
-					return null;
-				return (byte[]) subjectUniqueID.Clone ();
-			}
-		}
-
-		internal bool VerifySignature (DSA dsa) 
-		{
-			// signatureOID is check by both this.Hash and this.Signature
-			DSASignatureDeformatter v = new DSASignatureDeformatter (dsa);
-			// only SHA-1 is supported
-			v.SetHashAlgorithm ("SHA1");
-			return v.VerifySignature (this.Hash, this.Signature);
-		}
-
-		internal bool VerifySignature (RSA rsa) 
-		{
-			// SHA1-1 with DSA
-			if (m_signaturealgo == "1.2.840.10040.4.3")
-				return false;
-			RSAPKCS1SignatureDeformatter v = new RSAPKCS1SignatureDeformatter (rsa);
-			v.SetHashAlgorithm (PKCS1.HashNameFromOid (m_signaturealgo));
-			return v.VerifySignature (this.Hash, this.Signature);
-		}
-
-		public bool VerifySignature (AsymmetricAlgorithm aa) 
-		{
-			if (aa == null)
-				throw new ArgumentNullException ("aa");
-
-			if (aa is RSA)
-				return VerifySignature (aa as RSA);
-			else if (aa is DSA)
-				return VerifySignature (aa as DSA);
-			else 
-				throw new NotSupportedException ("Unknown Asymmetric Algorithm " + aa.ToString ());
-		}
-
-		public bool CheckSignature (byte[] hash, string hashAlgorithm, byte[] signature) 
-		{
-			RSACryptoServiceProvider r = (RSACryptoServiceProvider) RSA;
-			return r.VerifyHash (hash, hashAlgorithm, signature);
-		}
-
-		public bool IsSelfSigned {
-			get { 
-				if (m_issuername != m_subject)
-					return false;
-
-				try {
-					if (RSA != null)
-						return VerifySignature (RSA);
-					else if (DSA != null)
-						return VerifySignature (DSA);
-					else
-						return false; // e.g. a certificate with only DSA parameters
-				}
-				catch (CryptographicException) {
-					return false;
-				}
-			}
-		}
-
-		public ASN1 GetIssuerName ()
-		{
-			return issuer;
-		}
-
-		public ASN1 GetSubjectName ()
-		{
-			return subject;
-		}
-
-		protected X509Certificate (SerializationInfo info, StreamingContext context)
-		{
-			Parse ((byte[]) info.GetValue ("raw", typeof (byte[])));
-		}
-
-		[SecurityPermission (SecurityAction.Demand, SerializationFormatter = true)]
-		public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			info.AddValue ("raw", m_encodedcert);
-			// note: we NEVER serialize the private key
-		}
-
-		static byte[] PEM (string type, byte[] data) 
-		{
-			string pem = Encoding.ASCII.GetString (data);
-			string header = String.Format ("-----BEGIN {0}-----", type);
-			string footer = String.Format ("-----END {0}-----", type);
-			int start = pem.IndexOf (header) + header.Length;
-			int end = pem.IndexOf (footer, start);
-			string base64 = pem.Substring (start, (end - start));
-			return Convert.FromBase64String (base64);
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X509CertificateBuilder.cs b/MediaBrowser.Server.Mono/Security/X509CertificateBuilder.cs
deleted file mode 100644
index 9b51d9e4e..000000000
--- a/MediaBrowser.Server.Mono/Security/X509CertificateBuilder.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-//
-// X509CertificateBuilder.cs: Handles building of X.509 certificates.
-//
-// Author:
-//	Sebastien Pouliot <sebastien@ximian.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Security.Cryptography;
-
-namespace MediaBrowser.Server.Mono.Security {
-	// From RFC3280
-	/*
-	 * Certificate  ::=  SEQUENCE  {
-	 *      tbsCertificate       TBSCertificate,
-	 *      signatureAlgorithm   AlgorithmIdentifier,
-	 *      signature            BIT STRING  
-	 * }
-	 * TBSCertificate  ::=  SEQUENCE  {
-	 *      version         [0]  Version DEFAULT v1,
-	 *      serialNumber         CertificateSerialNumber,
-	 *      signature            AlgorithmIdentifier,
-	 *      issuer               Name,
-	 *      validity             Validity,
-	 *      subject              Name,
-	 *      subjectPublicKeyInfo SubjectPublicKeyInfo,
-	 *      issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
-	 *                           -- If present, version MUST be v2 or v3
-	 *      subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
-	 *                           -- If present, version MUST be v2 or v3
-	 *      extensions      [3]  Extensions OPTIONAL
-	 *                           -- If present, version MUST be v3 --  
-	 * }
-	 * Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
-	 * CertificateSerialNumber  ::=  INTEGER
-	 * Validity ::= SEQUENCE {
-	 *      notBefore      Time,
-	 *      notAfter       Time  
-	 * }
-	 * Time ::= CHOICE {
-	 *      utcTime        UTCTime,
-	 *      generalTime    GeneralizedTime 
-	 * }
-	 */
-	public class X509CertificateBuilder : X509Builder {
- 
-		private byte version;
-		private byte[] sn;
-		private string issuer;
-		private DateTime notBefore;
-		private DateTime notAfter;
-		private string subject;
-		private AsymmetricAlgorithm aa;
-		private byte[] issuerUniqueID;
-		private byte[] subjectUniqueID;
-		private X509ExtensionCollection extensions;
-
-		public X509CertificateBuilder () : this (3) {}
-	
-		public X509CertificateBuilder (byte version) 
-		{
-			if (version > 3)
-				throw new ArgumentException ("Invalid certificate version");
-			this.version = version;
-			extensions = new X509ExtensionCollection ();
-		}
-
-		public byte Version {
-			get { return version; }
-			set { version = value; }
-		}
-
-		public byte[] SerialNumber {
-			get { return sn; }
-			set { sn = value; }
-		}
-
-		public string IssuerName {
-			get { return issuer; }
-			set { issuer = value; }
-		}
-
-		public DateTime NotBefore {
-			get { return notBefore; }
-			set { notBefore = value; }
-		}
-
-		public DateTime NotAfter {
-			get { return notAfter; }
-			set { notAfter = value; }
-		}
-
-		public string SubjectName {
-			get { return subject; }
-			set { subject = value; }
-		}
-
-		public AsymmetricAlgorithm SubjectPublicKey {
-			get { return aa; }
-			set { aa = value; }
-		}
-
-		public byte[] IssuerUniqueId {
-			get { return issuerUniqueID; }
-			set { issuerUniqueID = value; }
-		}
-
-		public byte[] SubjectUniqueId {
-			get { return subjectUniqueID; }
-			set { subjectUniqueID = value; }
-		}
-
-		public X509ExtensionCollection Extensions {
-			get { return extensions; }
-		}
-
-
-		/* SubjectPublicKeyInfo  ::=  SEQUENCE  {
-		 *      algorithm            AlgorithmIdentifier,
-		 *      subjectPublicKey     BIT STRING  }
-		 */
-		private ASN1 SubjectPublicKeyInfo () 
-		{
-			ASN1 keyInfo = new ASN1 (0x30);
-			if (aa is RSA) {
-				keyInfo.Add (PKCS7.AlgorithmIdentifier ("1.2.840.113549.1.1.1"));
-				RSAParameters p = (aa as RSA).ExportParameters (false);
-				/* RSAPublicKey ::= SEQUENCE {
-				 *       modulus            INTEGER,    -- n
-				 *       publicExponent     INTEGER  }  -- e
-				 */
-				ASN1 key = new ASN1 (0x30);
-				key.Add (ASN1Convert.FromUnsignedBigInteger (p.Modulus));
-				key.Add (ASN1Convert.FromUnsignedBigInteger (p.Exponent));
-				keyInfo.Add (new ASN1 (UniqueIdentifier (key.GetBytes ())));
-			}
-			else if (aa is DSA) {
-				DSAParameters p = (aa as DSA).ExportParameters (false);
-				/* Dss-Parms  ::=  SEQUENCE  {
-				 *       p             INTEGER,
-				 *       q             INTEGER,
-				 *       g             INTEGER  }
-				 */
-				ASN1 param = new ASN1 (0x30);
-				param.Add (ASN1Convert.FromUnsignedBigInteger (p.P));
-				param.Add (ASN1Convert.FromUnsignedBigInteger (p.Q));
-				param.Add (ASN1Convert.FromUnsignedBigInteger (p.G));
-				keyInfo.Add (PKCS7.AlgorithmIdentifier ("1.2.840.10040.4.1", param));
-				ASN1 key = keyInfo.Add (new ASN1 (0x03));
-				// DSAPublicKey ::= INTEGER  -- public key, y
-				key.Add (ASN1Convert.FromUnsignedBigInteger (p.Y));
-			}
-			else
-				throw new NotSupportedException ("Unknown Asymmetric Algorithm " + aa.ToString ());
-			return keyInfo;
-		}
-
-		private byte[] UniqueIdentifier (byte[] id) 
-		{
-			// UniqueIdentifier  ::=  BIT STRING
-			ASN1 uid = new ASN1 (0x03);
-			// first byte in a BITSTRING is the number of unused bits in the first byte
-			byte[] v = new byte [id.Length + 1];
-			Buffer.BlockCopy (id, 0, v, 1, id.Length);
-			uid.Value = v;
-			return uid.GetBytes ();
-		}
-
-		protected override ASN1 ToBeSigned (string oid) 
-		{
-			// TBSCertificate
-			ASN1 tbsCert = new ASN1 (0x30);
-
-			if (version > 1) {
-				// TBSCertificate / [0] Version DEFAULT v1,
-				byte[] ver = { (byte)(version - 1) };
-				ASN1 v = tbsCert.Add (new ASN1 (0xA0));
-				v.Add (new ASN1 (0x02, ver));
-			}
-
-			// TBSCertificate / CertificateSerialNumber,
-			tbsCert.Add (new ASN1 (0x02, sn));
-
-			// TBSCertificate / AlgorithmIdentifier,
-                        tbsCert.Add (PKCS7.AlgorithmIdentifier (oid));
-
-			// TBSCertificate / Name
-			tbsCert.Add (X501.FromString (issuer));
-
-			// TBSCertificate / Validity
-			ASN1 validity = tbsCert.Add (new ASN1 (0x30));
-			// TBSCertificate / Validity / Time
-			validity.Add (ASN1Convert.FromDateTime (notBefore));
-			// TBSCertificate / Validity / Time
-			validity.Add (ASN1Convert.FromDateTime (notAfter));
-
-			// TBSCertificate / Name
-			tbsCert.Add (X501.FromString (subject));
-
-			// TBSCertificate / SubjectPublicKeyInfo
-			tbsCert.Add (SubjectPublicKeyInfo ());
-                        
-			if (version > 1) {
-				// TBSCertificate / [1]  IMPLICIT UniqueIdentifier OPTIONAL
-				if (issuerUniqueID != null)
-					tbsCert.Add (new ASN1 (0xA1, UniqueIdentifier (issuerUniqueID)));
-
-				// TBSCertificate / [2]  IMPLICIT UniqueIdentifier OPTIONAL
-				if (subjectUniqueID != null)
-					tbsCert.Add (new ASN1 (0xA1, UniqueIdentifier (subjectUniqueID)));
-
-				// TBSCertificate / [3]  Extensions OPTIONAL
-				if ((version > 2) &&  (extensions.Count > 0))
-					tbsCert.Add (new ASN1 (0xA3, extensions.GetBytes ()));
-			}
-
-			return tbsCert;
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X509CertificateCollection.cs b/MediaBrowser.Server.Mono/Security/X509CertificateCollection.cs
deleted file mode 100644
index 6bb465b28..000000000
--- a/MediaBrowser.Server.Mono/Security/X509CertificateCollection.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// Based on System.Security.Cryptography.X509Certificates.X509CertificateCollection
-//	in System assembly
-//
-// Authors:
-//	Lawrence Pit (loz@cable.a2000.nl)
-//	Sebastien Pouliot <sebastien@ximian.com>
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-	[Serializable]
-    public class X509CertificateCollection : CollectionBase, IEnumerable {
-		
-		public X509CertificateCollection () 
-		{
-		}
-		
-		public X509CertificateCollection (X509Certificate [] value) 
-		{
-			AddRange (value);
-		}
-		
-		public X509CertificateCollection (X509CertificateCollection value)
-		{
-			AddRange (value);
-		}
-		
-		// Properties
-		
-		public X509Certificate this [int index] {
-			get { return (X509Certificate) InnerList [index]; }
-			set { InnerList [index] = value; }
-		}
-		
-		// Methods
-
-		public int Add (X509Certificate value)
-		{
-			if (value == null)
-				throw new ArgumentNullException ("value");
-			
-			return InnerList.Add (value);
-		}
-		
-		public void AddRange (X509Certificate [] value) 
-		{
-			if (value == null)
-				throw new ArgumentNullException ("value");
-
-			for (int i = 0; i < value.Length; i++) 
-				InnerList.Add (value [i]);
-		}
-		
-		public void AddRange (X509CertificateCollection value)
-		{
-			if (value == null)
-				throw new ArgumentNullException ("value");
-
-			for (int i = 0; i < value.InnerList.Count; i++) 
-				InnerList.Add (value [i]);
-		}
-		
-		public bool Contains (X509Certificate value) 
-		{
-			return (IndexOf (value) != -1);
-		}
-
-		public void CopyTo (X509Certificate[] array, int index)
-		{
-			InnerList.CopyTo (array, index);
-		}
-		
-		public new X509CertificateEnumerator GetEnumerator ()
-		{
-			return new X509CertificateEnumerator (this);
-		}
-		
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return InnerList.GetEnumerator ();
-		}
-		
-		public override int GetHashCode () 
-		{
-			return InnerList.GetHashCode ();
-		}
-		
-		public int IndexOf (X509Certificate value)
-		{
-			if (value == null)
-				throw new ArgumentNullException ("value");
-
-			byte[] hash = value.Hash;
-			for (int i=0; i < InnerList.Count; i++) {
-				X509Certificate x509 = (X509Certificate) InnerList [i];
-				if (Compare (x509.Hash, hash))
-					return i;
-			}
-			return -1;
-		}
-		
-		public void Insert (int index, X509Certificate value)
-		{
-			InnerList.Insert (index, value);
-		}
-		
-		public void Remove (X509Certificate value)
-		{
-			InnerList.Remove (value);
-		}
-
-		// private stuff
-
-		private bool Compare (byte[] array1, byte[] array2) 
-		{
-			if ((array1 == null) && (array2 == null))
-				return true;
-			if ((array1 == null) || (array2 == null))
-				return false;
-			if (array1.Length != array2.Length)
-				return false;
-			for (int i=0; i < array1.Length; i++) {
-				if (array1 [i] != array2 [i])
-					return false;
-			}
-			return true;
-		}
-
-		// Inner Class
-		
-		public class X509CertificateEnumerator : IEnumerator {
-
-			private IEnumerator enumerator;
-
-			// Constructors
-			
-			public X509CertificateEnumerator (X509CertificateCollection mappings)
-			{
-				enumerator = ((IEnumerable) mappings).GetEnumerator ();
-			}
-
-			// Properties
-			
-			public X509Certificate Current {
-				get { return (X509Certificate) enumerator.Current; }
-			}
-			
-			object IEnumerator.Current {
-				get { return enumerator.Current; }
-			}
-
-			// Methods
-			
-			bool IEnumerator.MoveNext ()
-			{
-				return enumerator.MoveNext ();
-			}
-			
-			void IEnumerator.Reset () 
-			{
-				enumerator.Reset ();
-			}
-			
-			public bool MoveNext () 
-			{
-				return enumerator.MoveNext ();
-			}
-			
-			public void Reset ()
-			{
-				enumerator.Reset ();
-			}
-		}		
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X509Extension.cs b/MediaBrowser.Server.Mono/Security/X509Extension.cs
deleted file mode 100644
index 984c3542b..000000000
--- a/MediaBrowser.Server.Mono/Security/X509Extension.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-// X509Extension.cs: Base class for all X.509 extensions.
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Globalization;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-	/*
-	 * Extension  ::=  SEQUENCE  {
-	 *	extnID      OBJECT IDENTIFIER,
-	 *	critical    BOOLEAN DEFAULT FALSE,
-	 *	extnValue   OCTET STRING  
-	 * }
-	 */
-    public class X509Extension {
-
-		protected string extnOid;
-		protected bool extnCritical;
-		protected ASN1 extnValue;
-
-		protected X509Extension () 
-		{
-			extnCritical = false;
-		}
-
-		public X509Extension (ASN1 asn1) 
-		{
-			if ((asn1.Tag != 0x30) || (asn1.Count < 2))
-				throw new ArgumentException (("Invalid X.509 extension."));
-			if (asn1[0].Tag != 0x06)
-				throw new ArgumentException (("Invalid X.509 extension."));
-
-			extnOid = ASN1Convert.ToOid (asn1[0]);
-			extnCritical = ((asn1[1].Tag == 0x01) && (asn1[1].Value[0] == 0xFF));
-			// last element is an octet string which may need to be decoded
-			extnValue = asn1 [asn1.Count - 1];
-			if ((extnValue.Tag == 0x04) && (extnValue.Length > 0) && (extnValue.Count == 0)) {
-				try {
-					ASN1 encapsulated = new ASN1 (extnValue.Value);
-					extnValue.Value = null;
-					extnValue.Add (encapsulated);
-				}
-				catch {
-					// data isn't ASN.1
-				}
-			}
-			Decode ();
-		}
-
-		public X509Extension (X509Extension extension)
-		{
-			if (extension == null)
-				throw new ArgumentNullException ("extension");
-			if ((extension.Value == null) || (extension.Value.Tag != 0x04) || (extension.Value.Count != 1))
-				throw new ArgumentException (("Invalid X.509 extension."));
-
-			extnOid = extension.Oid;
-			extnCritical = extension.Critical;
-			extnValue = extension.Value;
-			Decode ();
-		}
-
-		// encode the extension *into* an OCTET STRING
-		protected virtual void Decode () 
-		{
-		}
-
-		// decode the extension from *inside* an OCTET STRING
-		protected virtual void Encode ()
-		{
-		}
-
-		public ASN1 ASN1 {
-			get {
-				ASN1 extension = new ASN1 (0x30);
-				extension.Add (ASN1Convert.FromOid (extnOid));
-				if (extnCritical)
-					extension.Add (new ASN1 (0x01, new byte [1] { 0xFF }));
-				Encode ();
-				extension.Add (extnValue);
-				return extension;
-			}
-		}
-
-		public string Oid {
-			get { return extnOid; }
-		}
-
-		public bool Critical {
-			get { return extnCritical; }
-			set { extnCritical = value; }
-		}
-
-		// this gets overrided with more meaningful names
-		public virtual string Name {
-			get { return extnOid; }
-		}
-
-		public ASN1 Value {
-			get {
-				if (extnValue == null) {
-					Encode ();
-				}
-				return extnValue;
-			}
-		}
-
-		public override bool Equals (object obj) 
-		{
-			if (obj == null)
-				return false;
-			
-			X509Extension ex = (obj as X509Extension);
-			if (ex == null)
-				return false;
-
-			if (extnCritical != ex.extnCritical)
-				return false;
-			if (extnOid != ex.extnOid)
-				return false;
-			if (extnValue.Length != ex.extnValue.Length)
-				return false;
-			
-                        for (int i=0; i < extnValue.Length; i++) {
-				if (extnValue [i] != ex.extnValue [i])
-					return false;
-			}
-			return true;
-		}
-
-		public byte[] GetBytes () 
-		{
-			return ASN1.GetBytes ();
-		}
-
-		public override int GetHashCode () 
-		{
-			// OID should be unique in a collection of extensions
-			return extnOid.GetHashCode ();
-		}
-
-		private void WriteLine (StringBuilder sb, int n, int pos) 
-		{
-			byte[] value = extnValue.Value;
-			int p = pos;
-			for (int j=0; j < 8; j++) {
-				if (j < n) {
-					sb.Append (value [p++].ToString ("X2", CultureInfo.InvariantCulture));
-					sb.Append (" ");
-				}
-				else
-					sb.Append ("   ");
-			}
-			sb.Append ("  ");
-			p = pos;
-			for (int j=0; j < n; j++) {
-				byte b = value [p++];
-				if (b < 0x20)
-					sb.Append (".");
-				else
-					sb.Append (Convert.ToChar (b));
-			}
-			sb.Append (Environment.NewLine);
-		}
-
-		public override string ToString () 
-		{
-			StringBuilder sb = new StringBuilder ();
-			int div = (extnValue.Length >> 3);
-			int rem = (extnValue.Length - (div << 3));
-			int x = 0;
-			for (int i=0; i < div; i++) {
-				WriteLine (sb, 8, x);
-				x += 8;
-			}
-			WriteLine (sb, rem, x);
-			return sb.ToString ();
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X509Extensions.cs b/MediaBrowser.Server.Mono/Security/X509Extensions.cs
deleted file mode 100644
index b86fe1c40..000000000
--- a/MediaBrowser.Server.Mono/Security/X509Extensions.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-//
-// X509Extensions.cs: Handles X.509 extensions.
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace MediaBrowser.Server.Mono.Security {
-	/*
-	 * Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
-	 * 
-	 * Note: 1..MAX -> There shouldn't be 0 Extensions in the ASN1 structure
-	 */
-    public sealed class X509ExtensionCollection : CollectionBase, IEnumerable {
-
-		private bool readOnly;
-
-		public X509ExtensionCollection () : base ()
-		{
-		}
-
-		public X509ExtensionCollection (ASN1 asn1) : this ()
-		{
-			readOnly = true;
-			if (asn1 == null)
-				return;
-			if (asn1.Tag != 0x30)
-				throw new Exception ("Invalid extensions format");
-			for (int i=0; i < asn1.Count; i++) {
-				X509Extension extension = new X509Extension (asn1 [i]);
-				InnerList.Add (extension);
-			}
-		}
-
-		public int Add (X509Extension extension) 
-		{
-			if (extension == null)
-				throw new ArgumentNullException ("extension");
-			if (readOnly)
-				throw new NotSupportedException ("Extensions are read only");
-		
-			return InnerList.Add (extension);
-		}
-
-		public void AddRange (X509Extension[] extension) 
-		{
-			if (extension == null)
-				throw new ArgumentNullException ("extension");
-			if (readOnly)
-				throw new NotSupportedException ("Extensions are read only");
-
-			for (int i = 0; i < extension.Length; i++) 
-				InnerList.Add (extension [i]);
-		}
-	
-		public void AddRange (X509ExtensionCollection collection) 
-		{
-			if (collection == null)
-				throw new ArgumentNullException ("collection");
-			if (readOnly)
-				throw new NotSupportedException ("Extensions are read only");
-
-			for (int i = 0; i < collection.InnerList.Count; i++) 
-				InnerList.Add (collection [i]);
-		}
-
-		public bool Contains (X509Extension extension) 
-		{
-			return (IndexOf (extension) != -1);
-		}
-
-		public bool Contains (string oid) 
-		{
-			return (IndexOf (oid) != -1);
-		}
-
-		public void CopyTo (X509Extension[] extensions, int index) 
-		{
-			if (extensions == null)
-				throw new ArgumentNullException ("extensions");
-
-			InnerList.CopyTo (extensions, index);
-		}
-
-		public int IndexOf (X509Extension extension) 
-		{
-			if (extension == null)
-				throw new ArgumentNullException ("extension");
-
-			for (int i=0; i < InnerList.Count; i++) {
-				X509Extension ex = (X509Extension) InnerList [i];
-				if (ex.Equals (extension))
-					return i;
-			}
-			return -1;
-		}
-
-		public int IndexOf (string oid) 
-		{
-			if (oid == null)
-				throw new ArgumentNullException ("oid");
-
-			for (int i=0; i < InnerList.Count; i++) {
-				X509Extension ex = (X509Extension) InnerList [i];
-				if (ex.Oid == oid)
-					return i;
-			}
-			return -1;
-		}
-
-		public void Insert (int index, X509Extension extension) 
-		{
-			if (extension == null)
-				throw new ArgumentNullException ("extension");
-
-			InnerList.Insert (index, extension);
-		}
-
-		public void Remove (X509Extension extension) 
-		{
-			if (extension == null)
-				throw new ArgumentNullException ("extension");
-
-			InnerList.Remove (extension);
-		}
-
-		public void Remove (string oid) 
-		{
-			if (oid == null)
-				throw new ArgumentNullException ("oid");
-
-			int index = IndexOf (oid);
-			if (index != -1)
-				InnerList.RemoveAt (index);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator () 
-		{
-			return InnerList.GetEnumerator ();
-		}
-
-		public X509Extension this [int index] {
-			get { return (X509Extension) InnerList [index]; }
-		}
-
-		public X509Extension this [string oid] {
-			get {
-				int index = IndexOf (oid);
-				if (index == -1)
-					return null;
-				return (X509Extension) InnerList [index];
-			}
-		}
-
-		public byte[] GetBytes () 
-		{
-			if (InnerList.Count < 1)
-				return null;
-			ASN1 sequence = new ASN1 (0x30);
-			for (int i=0; i < InnerList.Count; i++) {
-				X509Extension x = (X509Extension) InnerList [i];
-				sequence.Add (x.ASN1);
-			}
-			return sequence.GetBytes ();
-		}
-	}
-}
diff --git a/MediaBrowser.Server.Mono/Security/X520Attributes.cs b/MediaBrowser.Server.Mono/Security/X520Attributes.cs
deleted file mode 100644
index a61d31ad9..000000000
--- a/MediaBrowser.Server.Mono/Security/X520Attributes.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-//
-// X520.cs: X.520 related stuff (attributes, RDN)
-//
-// Author:
-//	Sebastien Pouliot <sebastien@ximian.com>
-//
-// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-
-namespace MediaBrowser.Server.Mono.Security {
-
-	// References:
-	// 1.	Information technology - Open Systems Interconnection - The Directory: Selected attribute types 
-	//	http://www.itu.int/rec/recommendation.asp?type=folders&lang=e&parent=T-REC-X.520 
-	// 2.	Internet X.509 Public Key Infrastructure Certificate and CRL Profile
-	//	http://www.ietf.org/rfc/rfc3280.txt
-	// 3.	A Summary of the X.500(96) User Schema for use with LDAPv3
-	//	http://www.faqs.org/rfcs/rfc2256.html
-	// 4.	RFC 2247 - Using Domains in LDAP/X.500 Distinguished Names
-	//	http://www.faqs.org/rfcs/rfc2247.html
-
-	/* 
-	 * AttributeTypeAndValue ::= SEQUENCE {
-	 * 	type     AttributeType,
-	 * 	value    AttributeValue 
-	 * }
-	 * 
-	 * AttributeType ::= OBJECT IDENTIFIER
-	 * 
-	 * AttributeValue ::= ANY DEFINED BY AttributeType
-	 */
-    public class X520 {
-
-		public abstract class AttributeTypeAndValue {
-			private string oid;
-			private string attrValue;
-			private int upperBound;
-			private byte encoding;
-
-			protected AttributeTypeAndValue (string oid, int upperBound)
-			{
-				this.oid = oid;
-				this.upperBound = upperBound;
-				this.encoding = 0xFF;
-			}
-
-			protected AttributeTypeAndValue (string oid, int upperBound, byte encoding) 
-			{
-				this.oid = oid;
-				this.upperBound = upperBound;
-				this.encoding = encoding;
-			}
-
-			public string Value {
-				get { return attrValue; }
-				set { 
-					if ((attrValue != null) && (attrValue.Length > upperBound)) {
-						string msg = ("Value length bigger than upperbound ({0}).");
-						throw new FormatException (String.Format (msg, upperBound));
-					}
-					attrValue = value; 
-				}
-			}
-
-			public ASN1 ASN1 {
-				get { return GetASN1 (); }
-			}
-
-			internal ASN1 GetASN1 (byte encoding) 
-			{
-				byte encode = encoding;
-				if (encode == 0xFF)
-					encode = SelectBestEncoding ();
-					
-				ASN1 asn1 = new ASN1 (0x30);
-				asn1.Add (ASN1Convert.FromOid (oid));
-				switch (encode) {
-					case 0x13:
-						// PRINTABLESTRING
-						asn1.Add (new ASN1 (0x13, Encoding.ASCII.GetBytes (attrValue)));
-						break;
-					case 0x16:
-						// IA5STRING
-						asn1.Add (new ASN1 (0x16, Encoding.ASCII.GetBytes (attrValue)));
-						break;
-					case 0x1E:
-						// BMPSTRING
-						asn1.Add (new ASN1 (0x1E, Encoding.BigEndianUnicode.GetBytes (attrValue)));
-						break;
-				}
-				return asn1;
-			}
-
-			internal ASN1 GetASN1 () 
-			{
-				return GetASN1 (encoding);
-			}
-
-			public byte[] GetBytes (byte encoding) 
-			{
-				return GetASN1 (encoding) .GetBytes ();
-			}
-
-			public byte[] GetBytes () 
-			{
-				return GetASN1 () .GetBytes ();
-			}
-
-			private byte SelectBestEncoding ()
-			{
-				foreach (char c in attrValue) {
-					switch (c) {
-					case '@':
-					case '_':
-						return 0x1E; // BMPSTRING
-					default:
-						if (c > 127)
-							return 0x1E; // BMPSTRING
-						break;
-					}
-				}
-				return 0x13; // PRINTABLESTRING
-			}
-		}
-
-		public class Name : AttributeTypeAndValue {
-
-			public Name () : base ("2.5.4.41", 32768) 
-			{
-			}
-		}
-
-		public class CommonName : AttributeTypeAndValue {
-
-			public CommonName () : base ("2.5.4.3", 64) 
-			{
-			}
-		}
-
-		// RFC2256, Section 5.6
-		public class SerialNumber : AttributeTypeAndValue {
-
-			// max length 64 bytes, Printable String only
-			public SerialNumber ()
-				: base ("2.5.4.5", 64, 0x13)
-			{
-			}
-		}
-
-		public class LocalityName : AttributeTypeAndValue {
-
-			public LocalityName () : base ("2.5.4.7", 128)
-			{
-			}
-		}
-
-		public class StateOrProvinceName : AttributeTypeAndValue {
-
-			public StateOrProvinceName () : base ("2.5.4.8", 128) 
-			{
-			}
-		}
-		 
-		public class OrganizationName : AttributeTypeAndValue {
-
-			public OrganizationName () : base ("2.5.4.10", 64)
-			{
-			}
-		}
-		 
-		public class OrganizationalUnitName : AttributeTypeAndValue {
-
-			public OrganizationalUnitName () : base ("2.5.4.11", 64)
-			{
-			}
-		}
-
-		// NOTE: Not part of RFC2253
-		public class EmailAddress : AttributeTypeAndValue {
-
-			public EmailAddress () : base ("1.2.840.113549.1.9.1", 128, 0x16)
-			{
-			}
-		}
-
-		// RFC2247, Section 4
-		public class DomainComponent : AttributeTypeAndValue {
-
-			// no maximum length defined
-			public DomainComponent ()
-				: base ("0.9.2342.19200300.100.1.25", Int32.MaxValue, 0x16)
-			{
-			}
-		}
-
-		// RFC1274, Section 9.3.1
-		public class UserId : AttributeTypeAndValue {
-
-			public UserId ()
-				: base ("0.9.2342.19200300.100.1.1", 256)
-			{
-			}
-		}
-
-		public class Oid : AttributeTypeAndValue {
-
-			public Oid (string oid)
-				: base (oid, Int32.MaxValue)
-			{
-			}
-		}
-
-		/* -- Naming attributes of type X520Title
-		 * id-at-title             AttributeType ::= { id-at 12 }
-		 * 
-		 * X520Title ::= CHOICE {
-		 *       teletexString     TeletexString   (SIZE (1..ub-title)),
-		 *       printableString   PrintableString (SIZE (1..ub-title)),
-		 *       universalString   UniversalString (SIZE (1..ub-title)),
-		 *       utf8String        UTF8String      (SIZE (1..ub-title)),
-		 *       bmpString         BMPString       (SIZE (1..ub-title)) 
-		 * }
-		 */
-		public class Title : AttributeTypeAndValue {
-
-			public Title () : base ("2.5.4.12", 64)
-			{
-			}
-		}
-
-		public class CountryName : AttributeTypeAndValue {
-
-			// (0x13) PRINTABLESTRING
-			public CountryName () : base ("2.5.4.6", 2, 0x13) 
-			{
-			}
-		}
-
-		public class DnQualifier : AttributeTypeAndValue {
-
-			// (0x13) PRINTABLESTRING
-			public DnQualifier () : base ("2.5.4.46", 2, 0x13) 
-			{
-			}
-		}
-
-		public class Surname : AttributeTypeAndValue {
-
-			public Surname () : base ("2.5.4.4", 32768) 
-			{
-			}
-		}
-
-		public class GivenName : AttributeTypeAndValue {
-
-			public GivenName () : base ("2.5.4.42", 16) 
-			{
-			}
-		}
-
-		public class Initial : AttributeTypeAndValue {
-
-			public Initial () : base ("2.5.4.43", 5) 
-			{
-			}
-		}
-
-	}
-        
-	/* From RFC3280
-	 * --  specifications of Upper Bounds MUST be regarded as mandatory
-	 * --  from Annex B of ITU-T X.411 Reference Definition of MTS Parameter
-	 * 
-	 * --  Upper Bounds
-	 * 
-	 * ub-name INTEGER ::= 32768
-	 * ub-common-name INTEGER ::= 64
-	 * ub-locality-name INTEGER ::= 128
-	 * ub-state-name INTEGER ::= 128
-	 * ub-organization-name INTEGER ::= 64
-	 * ub-organizational-unit-name INTEGER ::= 64
-	 * ub-title INTEGER ::= 64
-	 * ub-serial-number INTEGER ::= 64
-	 * ub-match INTEGER ::= 128
-	 * ub-emailaddress-length INTEGER ::= 128
-	 * ub-common-name-length INTEGER ::= 64
-	 * ub-country-name-alpha-length INTEGER ::= 2
-	 * ub-country-name-numeric-length INTEGER ::= 3
-	 * ub-domain-defined-attributes INTEGER ::= 4
-	 * ub-domain-defined-attribute-type-length INTEGER ::= 8
-	 * ub-domain-defined-attribute-value-length INTEGER ::= 128
-	 * ub-domain-name-length INTEGER ::= 16
-	 * ub-extension-attributes INTEGER ::= 256
-	 * ub-e163-4-number-length INTEGER ::= 15
-	 * ub-e163-4-sub-address-length INTEGER ::= 40
-	 * ub-generation-qualifier-length INTEGER ::= 3
-	 * ub-given-name-length INTEGER ::= 16
-	 * ub-initials-length INTEGER ::= 5
-	 * ub-integer-options INTEGER ::= 256
-	 * ub-numeric-user-id-length INTEGER ::= 32
-	 * ub-organization-name-length INTEGER ::= 64
-	 * ub-organizational-unit-name-length INTEGER ::= 32
-	 * ub-organizational-units INTEGER ::= 4
-	 * ub-pds-name-length INTEGER ::= 16
-	 * ub-pds-parameter-length INTEGER ::= 30
-	 * ub-pds-physical-address-lines INTEGER ::= 6
-	 * ub-postal-code-length INTEGER ::= 16
-	 * ub-pseudonym INTEGER ::= 128
-	 * ub-surname-length INTEGER ::= 40
-	 * ub-terminal-id-length INTEGER ::= 24
-	 * ub-unformatted-address-length INTEGER ::= 180
-	 * ub-x121-address-length INTEGER ::= 16
-	 * 
-	 * -- Note - upper bounds on string types, such as TeletexString, are
-	 * -- measured in characters.  Excepting PrintableString or IA5String, a
-	 * -- significantly greater number of octets will be required to hold
-	 * -- such a value.  As a minimum, 16 octets, or twice the specified
-	 * -- upper bound, whichever is the larger, should be allowed for
-	 * -- TeletexString.  For UTF8String or UniversalString at least four
-	 * -- times the upper bound should be allowed.
-	 */
-}
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index c09e028ea..e8aa4de3e 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -552,7 +552,7 @@ namespace MediaBrowser.Server.Startup.Common
             ZipClient = new ZipClient(FileSystemManager);
             RegisterSingleInstance(ZipClient);
 
-            RegisterSingleInstance<IHttpResultFactory>(new HttpResultFactory(LogManager, FileSystemManager, JsonSerializer));
+            RegisterSingleInstance<IHttpResultFactory>(new HttpResultFactory(LogManager, FileSystemManager, JsonSerializer, XmlSerializer));
 
             RegisterSingleInstance<IServerApplicationHost>(this);
             RegisterSingleInstance<IServerApplicationPaths>(ApplicationPaths);
@@ -612,7 +612,7 @@ namespace MediaBrowser.Server.Startup.Common
 
             RegisterSingleInstance<ISearchEngine>(() => new SearchEngine(LogManager, LibraryManager, UserManager));
 
-            HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamProvider, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider);
+            HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamProvider, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer);
             HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading");
             RegisterSingleInstance(HttpServer, false);
             progress.Report(10);
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index 97cdddf26..00ecda476 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>None</DebugType>
@@ -47,10 +48,6 @@
       <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>
-    </Reference>
     <Reference Include="ServiceStack.Text, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
@@ -85,7 +82,26 @@
     <Compile Include="Migrations\DbMigration.cs" />
     <Compile Include="Migrations\UpdateLevelMigration.cs" />
     <Compile Include="NativeEnvironment.cs" />
+    <Compile Include="Security\CertificateGenerator.cs" />
+    <Compile Include="Networking\NetworkManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Security\ASN1.cs" />
+    <Compile Include="Security\ASN1Convert.cs" />
+    <Compile Include="Security\BitConverterLE.cs" />
+    <Compile Include="Security\CryptoConvert.cs" />
+    <Compile Include="Security\PfxGenerator.cs" />
+    <Compile Include="Security\PKCS1.cs" />
+    <Compile Include="Security\PKCS12.cs" />
+    <Compile Include="Security\PKCS7.cs" />
+    <Compile Include="Security\PKCS8.cs" />
+    <Compile Include="Security\X501Name.cs" />
+    <Compile Include="Security\X509Builder.cs" />
+    <Compile Include="Security\X509Certificate.cs" />
+    <Compile Include="Security\X509CertificateBuilder.cs" />
+    <Compile Include="Security\X509CertificateCollection.cs" />
+    <Compile Include="Security\X509Extension.cs" />
+    <Compile Include="Security\X509Extensions.cs" />
+    <Compile Include="Security\X520Attributes.cs" />
     <Compile Include="StartupOptions.cs" />
     <Compile Include="SystemEvents.cs" />
     <Compile Include="TextLocalizer.cs" />
diff --git a/MediaBrowser.Server.Startup.Common/Networking/NetworkManager.cs b/MediaBrowser.Server.Startup.Common/Networking/NetworkManager.cs
new file mode 100644
index 000000000..bd260bf87
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Networking/NetworkManager.cs
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using Emby.Common.Implementations.Networking;
+using Emby.Common.Implementations.Security;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+
+namespace MediaBrowser.Server.Startup.Common.Networking
+{
+    /// <summary>
+    /// Class NetUtils
+    /// </summary>
+    public class NetworkManager : BaseNetworkManager, INetworkManager
+    {
+        public NetworkManager(ILogger logger)
+            : base(logger)
+        {
+        }
+
+        /// <summary>
+        /// Gets the network shares.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>IEnumerable{NetworkShare}.</returns>
+        public IEnumerable<NetworkShare> GetNetworkShares(string path)
+        {
+            return new List<NetworkShare>();
+        }
+
+        /// <summary>
+        /// Gets available devices within the domain
+        /// </summary>
+        /// <returns>PC's in the Domain</returns>
+        public IEnumerable<FileSystemEntryInfo> GetNetworkDevices()
+        {
+            return new List<FileSystemEntryInfo>();
+        }
+
+        /// <summary>
+        /// Generates a self signed certificate at the locatation specified by <paramref name="certificatePath"/>.
+        /// </summary>
+        /// <param name="certificatePath">The path to generate the certificate.</param>
+        /// <param name="hostname">The common name for the certificate.</param>
+        public void GenerateSelfSignedSslCertificate(string certificatePath, string hostname)
+        {
+            CertificateGenerator.CreateSelfSignCertificatePfx(certificatePath, hostname, Logger);
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/ASN1.cs b/MediaBrowser.Server.Startup.Common/Security/ASN1.cs
new file mode 100644
index 000000000..a25c27073
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/ASN1.cs
@@ -0,0 +1,339 @@
+//
+// ASN1.cs: Abstract Syntax Notation 1 - micro-parser and generator
+//
+// Authors:
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//	Jesper Pedersen  <jep@itplus.dk>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// (C) 2004 IT+ A/S (http://www.itplus.dk)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security {
+
+	// References:
+	// a.	ITU ASN.1 standards (free download)
+	//	http://www.itu.int/ITU-T/studygroups/com17/languages/
+
+    public class ASN1 {
+
+		private byte m_nTag;
+		private byte[] m_aValue;
+		private ArrayList elist;
+
+		public ASN1 () : this (0x00, null) {}
+
+		public ASN1 (byte tag) : this (tag, null) {}
+
+		public ASN1 (byte tag, byte[] data) 
+		{
+			m_nTag = tag;
+			m_aValue = data;
+		}
+
+		public ASN1 (byte[] data) 
+		{
+			m_nTag = data [0];
+
+			int nLenLength = 0;
+			int nLength = data [1];
+
+			if (nLength > 0x80) {
+				// composed length
+				nLenLength = nLength - 0x80;
+				nLength = 0;
+				for (int i = 0; i < nLenLength; i++) {
+					nLength *= 256;
+					nLength += data [i + 2];
+				}
+			}
+			else if (nLength == 0x80) {
+				// undefined length encoding
+				throw new NotSupportedException ("Undefined length encoding.");
+			}
+
+			m_aValue = new byte [nLength];
+			Buffer.BlockCopy (data, (2 + nLenLength), m_aValue, 0, nLength);
+
+			if ((m_nTag & 0x20) == 0x20) {
+				int nStart = (2 + nLenLength);
+				Decode (data, ref nStart, data.Length);
+			}
+		}
+
+		public int Count {
+			get { 
+				if (elist == null)
+					return 0;
+				return elist.Count; 
+			}
+		}
+
+		public byte Tag {
+			get { return m_nTag; }
+		}
+
+		public int Length {
+			get { 
+				if (m_aValue != null)
+					return m_aValue.Length; 
+				else
+					return 0;
+			}
+		}
+
+		public byte[] Value {
+			get { 
+				if (m_aValue == null)
+					GetBytes ();
+				return (byte[]) m_aValue.Clone (); 
+			}
+			set { 
+				if (value != null)
+					m_aValue = (byte[]) value.Clone (); 
+			}
+		}
+
+		private bool CompareArray (byte[] array1, byte[] array2)
+		{
+			bool bResult = (array1.Length == array2.Length);
+			if (bResult) {
+				for (int i = 0; i < array1.Length; i++) {
+					if (array1[i] != array2[i])
+						return false;
+				}
+			}
+			return bResult;
+		}
+
+		public bool Equals (byte[] asn1) 
+		{
+			return CompareArray (this.GetBytes (), asn1);
+		}
+
+		public bool CompareValue (byte[] value) 
+		{
+			return CompareArray (m_aValue, value);
+		}
+
+		public ASN1 Add (ASN1 asn1) 
+		{
+			if (asn1 != null) {
+				if (elist == null)
+					elist = new ArrayList ();
+				elist.Add (asn1);
+			}
+			return asn1;
+		}
+
+		public virtual byte[] GetBytes () 
+		{
+			byte[] val = null;
+			
+			if (Count > 0) {
+				int esize = 0;
+				ArrayList al = new ArrayList ();
+				foreach (ASN1 a in elist) {
+					byte[] item = a.GetBytes ();
+					al.Add (item);
+					esize += item.Length;
+				}
+				val = new byte [esize];
+				int pos = 0;
+				for (int i=0; i < elist.Count; i++) {
+					byte[] item = (byte[]) al[i];
+					Buffer.BlockCopy (item, 0, val, pos, item.Length);
+					pos += item.Length;
+				}
+			} else if (m_aValue != null) {
+				val = m_aValue;
+			}
+
+			byte[] der;
+			int nLengthLen = 0;
+
+			if (val != null) {
+				int nLength = val.Length;
+				// special for length > 127
+				if (nLength > 127) {
+					if (nLength <= Byte.MaxValue) {
+						der = new byte [3 + nLength];
+						Buffer.BlockCopy (val, 0, der, 3, nLength);
+						nLengthLen = 0x81;
+						der[2] = (byte)(nLength);
+					}
+					else if (nLength <= UInt16.MaxValue) {
+						der = new byte [4 + nLength];
+						Buffer.BlockCopy (val, 0, der, 4, nLength);
+						nLengthLen = 0x82;
+						der[2] = (byte)(nLength >> 8);
+						der[3] = (byte)(nLength);
+					}
+					else if (nLength <= 0xFFFFFF) {
+						// 24 bits
+						der = new byte [5 + nLength];
+						Buffer.BlockCopy (val, 0, der, 5, nLength);
+						nLengthLen = 0x83;
+						der [2] = (byte)(nLength >> 16);
+						der [3] = (byte)(nLength >> 8);
+						der [4] = (byte)(nLength);
+					}
+					else {
+						// max (Length is an integer) 32 bits
+						der = new byte [6 + nLength];
+						Buffer.BlockCopy (val, 0, der, 6, nLength);
+						nLengthLen = 0x84;
+						der [2] = (byte)(nLength >> 24);
+						der [3] = (byte)(nLength >> 16);
+						der [4] = (byte)(nLength >> 8);
+						der [5] = (byte)(nLength);
+					}
+				}
+				else {
+					// basic case (no encoding)
+					der = new byte [2 + nLength];
+					Buffer.BlockCopy (val, 0, der, 2, nLength);
+					nLengthLen = nLength;
+				}
+				if (m_aValue == null)
+					m_aValue = val;
+			}
+			else
+				der = new byte[2];
+
+			der[0] = m_nTag;
+			der[1] = (byte)nLengthLen;
+
+			return der;
+		}
+
+		// Note: Recursive
+		protected void Decode (byte[] asn1, ref int anPos, int anLength) 
+		{
+			byte nTag;
+			int nLength;
+			byte[] aValue;
+
+			// minimum is 2 bytes (tag + length of 0)
+			while (anPos < anLength - 1) {
+				DecodeTLV (asn1, ref anPos, out nTag, out nLength, out aValue);
+				// sometimes we get trailing 0
+				if (nTag == 0)
+					continue;
+
+				ASN1 elm = Add (new ASN1 (nTag, aValue));
+
+				if ((nTag & 0x20) == 0x20) {
+					int nConstructedPos = anPos;
+					elm.Decode (asn1, ref nConstructedPos, nConstructedPos + nLength);
+				}
+				anPos += nLength; // value length
+			}
+		}
+
+		// TLV : Tag - Length - Value
+		protected void DecodeTLV (byte[] asn1, ref int pos, out byte tag, out int length, out byte[] content) 
+		{
+			tag = asn1 [pos++];
+			length = asn1 [pos++];
+
+			// special case where L contains the Length of the Length + 0x80
+			if ((length & 0x80) == 0x80) {
+				int nLengthLen = length & 0x7F;
+				length = 0;
+				for (int i = 0; i < nLengthLen; i++)
+					length = length * 256 + asn1 [pos++];
+			}
+
+			content = new byte [length];
+			Buffer.BlockCopy (asn1, pos, content, 0, length);
+		}
+
+		public ASN1 this [int index] {
+			get { 		
+				try {
+					if ((elist == null) || (index >= elist.Count))
+						return null;
+					return (ASN1) elist [index];
+				}
+				catch (ArgumentOutOfRangeException) {
+					return null;
+				}
+			}
+		}
+
+		public ASN1 Element (int index, byte anTag) 
+		{
+			try {
+				if ((elist == null) || (index >= elist.Count))
+					return null;
+
+				ASN1 elm = (ASN1) elist [index];
+				if (elm.Tag == anTag)
+					return elm;
+				else
+					return null;
+			}
+			catch (ArgumentOutOfRangeException) {
+				return null;
+			}
+		}
+
+		public override string ToString()
+		{
+			StringBuilder hexLine = new StringBuilder ();
+            
+			// Add tag
+			hexLine.AppendFormat ("Tag: {0} {1}", m_nTag.ToString ("X2"), Environment.NewLine);
+
+			// Add length
+			hexLine.AppendFormat ("Length: {0} {1}", Value.Length, Environment.NewLine);
+
+			// Add value
+			hexLine.Append ("Value: ");
+			hexLine.Append (Environment.NewLine);
+			for (int i = 0; i < Value.Length; i++) {
+				hexLine.AppendFormat ("{0} ", Value [i].ToString ("X2"));
+				if ((i+1) % 16 == 0)
+					hexLine.AppendFormat (Environment.NewLine);
+			}
+			return hexLine.ToString ();
+		}
+
+		public void SaveToFile (string filename)
+		{
+			if (filename == null)
+				throw new ArgumentNullException ("filename");
+
+			using (FileStream fs = File.Create (filename)) {
+				byte[] data = GetBytes ();
+				fs.Write (data, 0, data.Length);
+			}
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/ASN1Convert.cs b/MediaBrowser.Server.Startup.Common/Security/ASN1Convert.cs
new file mode 100644
index 000000000..8a2a487c8
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/ASN1Convert.cs
@@ -0,0 +1,207 @@
+//
+// ASN1Convert.cs: Abstract Syntax Notation 1 convertion routines
+//
+// Authors:
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//	Jesper Pedersen  <jep@itplus.dk>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2004 IT+ A/S (http://www.itplus.dk)
+// Copyright (C) 2004-2007 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    // References:
+    // a.	ITU ASN.1 standards (free download)
+    //	http://www.itu.int/ITU-T/studygroups/com17/languages/
+
+    public static class ASN1Convert {
+		// RFC3280, section 4.2.1.5
+		// CAs conforming to this profile MUST always encode certificate
+		// validity dates through the year 2049 as UTCTime; certificate validity
+		// dates in 2050 or later MUST be encoded as GeneralizedTime.
+
+		// Under 1.x this API requires a Local datetime to be provided
+		// Under 2.0 it will also accept a Utc datetime
+		static public ASN1 FromDateTime (DateTime dt) 
+		{
+			if (dt.Year < 2050) {
+				// UTCTIME
+				return new ASN1 (0x17, Encoding.ASCII.GetBytes (
+					dt.ToUniversalTime ().ToString ("yyMMddHHmmss",
+					CultureInfo.InvariantCulture) + "Z"));
+			}
+			else {
+				// GENERALIZEDTIME
+				return new ASN1 (0x18, Encoding.ASCII.GetBytes (
+					dt.ToUniversalTime ().ToString ("yyyyMMddHHmmss", 
+					CultureInfo.InvariantCulture) + "Z"));
+			}
+		}
+
+		static public ASN1 FromInt32 (Int32 value) 
+		{
+			byte[] integer = BitConverterLE.GetBytes (value);
+			Array.Reverse (integer);
+			int x = 0;
+			while ((x < integer.Length) && (integer [x] == 0x00))
+				x++;
+			ASN1 asn1 = new ASN1 (0x02);
+			switch (x) {
+			case 0:
+				asn1.Value = integer;
+				break;
+			case 4:
+				asn1.Value = new byte [1];
+				break;
+			default:
+				byte[] smallerInt = new byte [4 - x];
+				Buffer.BlockCopy (integer, x, smallerInt, 0, smallerInt.Length);
+				asn1.Value = smallerInt;
+				break;
+			}
+			return asn1;
+		}
+
+		static public ASN1 FromOid (string oid) 
+		{
+			if (oid == null)
+				throw new ArgumentNullException ("oid");
+
+			return new ASN1 (CryptoConfig.EncodeOID (oid));
+		}
+
+		static public ASN1 FromUnsignedBigInteger (byte[] big) 
+		{
+			if (big == null)
+				throw new ArgumentNullException ("big");
+
+			// check for numbers that could be interpreted as negative (first bit)
+			if (big [0] >= 0x80) {
+				// in thie cas we add a new, empty, byte (position 0) so we're
+				// sure this will always be interpreted an unsigned integer.
+				// However we can't feed it into RSAParameters or DSAParameters
+				int length = big.Length + 1;
+				byte[] uinteger = new byte [length];
+				Buffer.BlockCopy (big, 0, uinteger, 1, length - 1);
+				big = uinteger;
+			}
+			return new ASN1 (0x02, big);
+		}
+
+		static public int ToInt32 (ASN1 asn1) 
+		{
+			if (asn1 == null)
+				throw new ArgumentNullException ("asn1");
+			if (asn1.Tag != 0x02)
+				throw new FormatException ("Only integer can be converted");
+
+			int x = 0;
+			for (int i=0; i < asn1.Value.Length; i++)
+				x = (x << 8) + asn1.Value [i];
+			return x;
+		}
+
+		// Convert a binary encoded OID to human readable string representation of 
+		// an OID (IETF style). Based on DUMPASN1.C from Peter Gutmann.
+		static public string ToOid (ASN1 asn1) 
+		{
+			if (asn1 == null)
+				throw new ArgumentNullException ("asn1");
+
+			byte[] aOID = asn1.Value;
+			StringBuilder sb = new StringBuilder ();
+			// Pick apart the OID
+			byte x = (byte) (aOID[0] / 40);
+			byte y = (byte) (aOID[0] % 40);
+			if (x > 2) {
+				// Handle special case for large y if x = 2
+				y += (byte) ((x - 2) * 40);
+				x = 2;
+			}
+			sb.Append (x.ToString (CultureInfo.InvariantCulture));
+			sb.Append (".");
+			sb.Append (y.ToString (CultureInfo.InvariantCulture));
+			ulong val = 0;
+			for (x = 1; x < aOID.Length; x++) {
+				val = ((val << 7) | ((byte) (aOID [x] & 0x7F)));
+				if ( !((aOID [x] & 0x80) == 0x80)) {
+					sb.Append (".");
+					sb.Append (val.ToString (CultureInfo.InvariantCulture));
+					val = 0;
+				}
+			}
+			return sb.ToString ();
+		}
+
+		static public DateTime ToDateTime (ASN1 time) 
+		{
+			if (time == null)
+				throw new ArgumentNullException ("time");
+
+			string t = Encoding.ASCII.GetString (time.Value);
+			// to support both UTCTime and GeneralizedTime (and not so common format)
+			string mask = null;
+			int year;
+			switch (t.Length) {
+				case 11:
+					// illegal format, still it's supported for compatibility
+					mask = "yyMMddHHmmZ";
+					break;
+				case 13: 
+					// RFC3280: 4.1.2.5.1  UTCTime
+					year = Convert.ToInt16 (t.Substring (0, 2), CultureInfo.InvariantCulture);
+					// Where YY is greater than or equal to 50, the 
+					// year SHALL be interpreted as 19YY; and 
+					// Where YY is less than 50, the year SHALL be 
+					// interpreted as 20YY.
+					if (year >= 50)
+						t = "19" + t;
+					else
+						t = "20" + t;
+					mask = "yyyyMMddHHmmssZ";
+					break;
+				case 15:
+					mask = "yyyyMMddHHmmssZ"; // GeneralizedTime
+					break;
+				case 17:
+					// another illegal format (990630000000+1000), again supported for compatibility
+					year = Convert.ToInt16 (t.Substring (0, 2), CultureInfo.InvariantCulture);
+					string century = (year >= 50) ? "19" : "20";
+					// ASN.1 (see ITU X.680 section 43.3) deals with offset differently than .NET
+					char sign = (t[12] == '+') ? '-' : '+';
+					t = String.Format ("{0}{1}{2}{3}{4}:{5}{6}", century, t.Substring (0, 12), sign, 
+						t[13], t[14], t[15], t[16]);
+					mask = "yyyyMMddHHmmsszzz";
+					break;
+			}
+			return DateTime.ParseExact (t, mask, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal);
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/BitConverterLE.cs b/MediaBrowser.Server.Startup.Common/Security/BitConverterLE.cs
new file mode 100644
index 000000000..240c958a3
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/BitConverterLE.cs
@@ -0,0 +1,239 @@
+//
+// Mono.Security.BitConverterLE.cs
+//  Like System.BitConverter but always little endian
+//
+// Author:
+//   Bernie Solomon
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace Emby.Common.Implementations.Security
+{
+    internal sealed class BitConverterLE
+	{
+		private BitConverterLE ()
+		{
+		}
+
+		unsafe private static byte[] GetUShortBytes (byte *bytes)
+		{
+			if (BitConverter.IsLittleEndian)
+				return new byte [] { bytes [0], bytes [1] };
+			else
+				return new byte [] { bytes [1], bytes [0] };
+		}
+
+		unsafe private static byte[] GetUIntBytes (byte *bytes)
+		{
+			if (BitConverter.IsLittleEndian)
+				return new byte [] { bytes [0], bytes [1], bytes [2], bytes [3] };
+			else
+				return new byte [] { bytes [3], bytes [2], bytes [1], bytes [0] };
+		}
+
+		unsafe private static byte[] GetULongBytes (byte *bytes)
+		{
+			if (BitConverter.IsLittleEndian)
+				return new byte [] { bytes [0], bytes [1], bytes [2], bytes [3],
+						     bytes [4], bytes [5], bytes [6], bytes [7] };
+			else
+				return new byte [] { bytes [7], bytes [6], bytes [5], bytes [4],
+						     bytes [3], bytes [2], bytes [1], bytes [0] };
+		}
+
+		unsafe internal static byte[] GetBytes (bool value)
+		{
+			return new byte [] { value ? (byte)1 : (byte)0 };
+		}
+
+		unsafe internal static byte[] GetBytes (char value)
+		{
+			return GetUShortBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (short value)
+		{
+			return GetUShortBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (int value)
+		{
+			return GetUIntBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (long value)
+		{
+			return GetULongBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (ushort value)
+		{
+			return GetUShortBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (uint value)
+		{
+			return GetUIntBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (ulong value)
+		{
+			return GetULongBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (float value)
+		{
+			return GetUIntBytes ((byte *) &value);
+		}
+
+		unsafe internal static byte[] GetBytes (double value)
+		{
+			return GetULongBytes ((byte *) &value);
+		}
+
+		unsafe private static void UShortFromBytes (byte *dst, byte[] src, int startIndex)
+		{
+			if (BitConverter.IsLittleEndian) {
+				dst [0] = src [startIndex];
+				dst [1] = src [startIndex + 1];
+			} else {
+				dst [0] = src [startIndex + 1];
+				dst [1] = src [startIndex];
+			}
+		}
+
+		unsafe private static void UIntFromBytes (byte *dst, byte[] src, int startIndex)
+		{
+			if (BitConverter.IsLittleEndian) {
+				dst [0] = src [startIndex];
+				dst [1] = src [startIndex + 1];
+				dst [2] = src [startIndex + 2];
+				dst [3] = src [startIndex + 3];
+			} else {
+				dst [0] = src [startIndex + 3];
+				dst [1] = src [startIndex + 2];
+				dst [2] = src [startIndex + 1];
+				dst [3] = src [startIndex];
+			}
+		}
+
+		unsafe private static void ULongFromBytes (byte *dst, byte[] src, int startIndex)
+		{
+			if (BitConverter.IsLittleEndian) {
+				for (int i = 0; i < 8; ++i)
+					dst [i] = src [startIndex + i];
+			} else {
+				for (int i = 0; i < 8; ++i)
+					dst [i] = src [startIndex + (7 - i)];
+			}
+		}
+
+		unsafe internal static bool ToBoolean (byte[] value, int startIndex)
+		{
+			return value [startIndex] != 0;
+		}
+
+		unsafe internal static char ToChar (byte[] value, int startIndex)
+		{
+			char ret;
+
+			UShortFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static short ToInt16 (byte[] value, int startIndex)
+		{
+			short ret;
+
+			UShortFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static int ToInt32 (byte[] value, int startIndex)
+		{
+			int ret;
+
+			UIntFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static long ToInt64 (byte[] value, int startIndex)
+		{
+			long ret;
+
+			ULongFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static ushort ToUInt16 (byte[] value, int startIndex)
+		{
+			ushort ret;
+
+			UShortFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static uint ToUInt32 (byte[] value, int startIndex)
+		{
+			uint ret;
+
+			UIntFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static ulong ToUInt64 (byte[] value, int startIndex)
+		{
+			ulong ret;
+
+			ULongFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static float ToSingle (byte[] value, int startIndex)
+		{
+			float ret;
+
+			UIntFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+
+		unsafe internal static double ToDouble (byte[] value, int startIndex)
+		{
+			double ret;
+
+			ULongFromBytes ((byte *) &ret, value, startIndex);
+
+			return ret;
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/CertificateGenerator.cs b/MediaBrowser.Server.Startup.Common/Security/CertificateGenerator.cs
new file mode 100644
index 000000000..f36b14cae
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/CertificateGenerator.cs
@@ -0,0 +1,67 @@
+using MediaBrowser.Model.Logging;
+using System;
+using System.Collections;
+using System.Security.Cryptography;
+
+namespace Emby.Common.Implementations.Security
+{
+    internal class CertificateGenerator
+    {
+        private const string MonoTestRootAgency = "<RSAKeyValue><Modulus>v/4nALBxCE+9JgEC0LnDUvKh6e96PwTpN4Rj+vWnqKT7IAp1iK/JjuqvAg6DQ2vTfv0dTlqffmHH51OyioprcT5nzxcSTsZb/9jcHScG0s3/FRIWnXeLk/fgm7mSYhjUaHNI0m1/NTTktipicjKxo71hGIg9qucCWnDum+Krh/k=</Modulus><Exponent>AQAB</Exponent><P>9jbKxMXEruW2CfZrzhxtull4O8P47+mNsEL+9gf9QsRO1jJ77C+jmzfU6zbzjf8+ViK+q62tCMdC1ZzulwdpXQ==</P><Q>x5+p198l1PkK0Ga2mRh0SIYSykENpY2aLXoyZD/iUpKYAvATm0/wvKNrE4dKJyPCA+y3hfTdgVag+SP9avvDTQ==</Q><DP>ISSjCvXsUfbOGG05eddN1gXxL2pj+jegQRfjpk7RAsnWKvNExzhqd5x+ZuNQyc6QH5wxun54inP4RTUI0P/IaQ==</DP><DQ>R815VQmR3RIbPqzDXzv5j6CSH6fYlcTiQRtkBsUnzhWmkd/y3XmamO+a8zJFjOCCx9CcjpVuGziivBqi65lVPQ==</DQ><InverseQ>iYiu0KwMWI/dyqN3RJYUzuuLj02/oTD1pYpwo2rvNCXU1Q5VscOeu2DpNg1gWqI+1RrRCsEoaTNzXB1xtKNlSw==</InverseQ><D>nIfh1LYF8fjRBgMdAH/zt9UKHWiaCnc+jXzq5tkR8HVSKTVdzitD8bl1JgAfFQD8VjSXiCJqluexy/B5SGrCXQ49c78NIQj0hD+J13Y8/E0fUbW1QYbhj6Ff7oHyhaYe1WOQfkp2t/h+llHOdt1HRf7bt7dUknYp7m8bQKGxoYE=</D></RSAKeyValue>";
+
+        internal static void CreateSelfSignCertificatePfx(
+            string fileName,
+            string hostname,
+            ILogger logger)
+        {
+            if (string.IsNullOrWhiteSpace(fileName))
+            {
+                throw new ArgumentNullException("fileName");
+            }
+
+            byte[] sn = Guid.NewGuid().ToByteArray();
+            string subject = string.Format("CN={0}", hostname);
+            string issuer = subject;
+            DateTime notBefore = DateTime.Now.AddDays(-2);
+            DateTime notAfter = DateTime.Now.AddYears(10);
+
+            RSA issuerKey = RSA.Create();
+            issuerKey.FromXmlString(MonoTestRootAgency);
+            RSA subjectKey = RSA.Create();
+
+            // serial number MUST be positive
+            if ((sn[0] & 0x80) == 0x80)
+                sn[0] -= 0x80;
+
+            issuer = subject;
+            issuerKey = subjectKey;
+
+            X509CertificateBuilder cb = new X509CertificateBuilder(3);
+            cb.SerialNumber = sn;
+            cb.IssuerName = issuer;
+            cb.NotBefore = notBefore;
+            cb.NotAfter = notAfter;
+            cb.SubjectName = subject;
+            cb.SubjectPublicKey = subjectKey;
+
+            // signature
+            cb.Hash = "SHA256";
+            byte[] rawcert = cb.Sign(issuerKey);
+
+            PKCS12 p12 = new PKCS12();
+
+
+            ArrayList list = new ArrayList();
+            // we use a fixed array to avoid endianess issues 
+            // (in case some tools requires the ID to be 1).
+            list.Add(new byte[4] { 1, 0, 0, 0 });
+            Hashtable attributes = new Hashtable(1);
+            attributes.Add(PKCS9.localKeyId, list);
+
+            p12.AddCertificate(new X509Certificate(rawcert), attributes);
+
+            p12.AddPkcs8ShroudedKeyBag(subjectKey, attributes);
+            p12.SaveToFile(fileName);
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/CryptoConvert.cs b/MediaBrowser.Server.Startup.Common/Security/CryptoConvert.cs
new file mode 100644
index 000000000..c6e466534
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/CryptoConvert.cs
@@ -0,0 +1,745 @@
+//
+// CryptoConvert.cs - Crypto Convertion Routines
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 Novell Inc. (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    public sealed class CryptoConvert {
+
+		private CryptoConvert () 
+		{
+		}
+
+		static private int ToInt32LE (byte [] bytes, int offset)
+		{
+			return (bytes [offset+3] << 24) | (bytes [offset+2] << 16) | (bytes [offset+1] << 8) | bytes [offset];
+		}
+
+		static private uint ToUInt32LE (byte [] bytes, int offset)
+		{
+			return (uint)((bytes [offset+3] << 24) | (bytes [offset+2] << 16) | (bytes [offset+1] << 8) | bytes [offset]);
+		}
+
+		static private byte [] GetBytesLE (int val)
+		{
+			return new byte [] { 
+				(byte) (val & 0xff), 
+				(byte) ((val >> 8) & 0xff), 
+				(byte) ((val >> 16) & 0xff), 
+				(byte) ((val >> 24) & 0xff)
+			};
+                }
+
+		static private byte[] Trim (byte[] array) 
+		{
+			for (int i=0; i < array.Length; i++) {
+				if (array [i] != 0x00) {
+					byte[] result = new byte [array.Length - i];
+					Buffer.BlockCopy (array, i, result, 0, result.Length);
+					return result;
+				}
+			}
+			return null;
+		}
+
+		// convert the key from PRIVATEKEYBLOB to RSA
+		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/Security/private_key_blobs.asp
+		// e.g. SNK files, PVK files
+		static public RSA FromCapiPrivateKeyBlob (byte[] blob) 
+		{
+			return FromCapiPrivateKeyBlob (blob, 0);
+		}
+
+		static public RSA FromCapiPrivateKeyBlob (byte[] blob, int offset) 
+		{
+			if (blob == null)
+				throw new ArgumentNullException ("blob");
+			if (offset >= blob.Length)
+				throw new ArgumentException ("blob is too small.");
+
+			RSAParameters rsap = new RSAParameters ();
+			try {
+				if ((blob [offset]   != 0x07) ||				// PRIVATEKEYBLOB (0x07)
+				    (blob [offset+1] != 0x02) ||				// Version (0x02)
+				    (blob [offset+2] != 0x00) ||				// Reserved (word)
+				    (blob [offset+3] != 0x00) ||
+				    (ToUInt32LE (blob, offset+8) != 0x32415352))	// DWORD magic = RSA2
+					throw new CryptographicException ("Invalid blob header");
+				
+				// ALGID (CALG_RSA_SIGN, CALG_RSA_KEYX, ...)
+				// int algId = ToInt32LE (blob, offset+4);
+
+				// DWORD bitlen
+				int bitLen = ToInt32LE (blob, offset+12);
+
+				// DWORD public exponent
+				byte[] exp = new byte [4];
+				Buffer.BlockCopy (blob, offset+16, exp, 0, 4);
+				Array.Reverse (exp);
+				rsap.Exponent = Trim (exp);
+			
+				int pos = offset+20;
+				// BYTE modulus[rsapubkey.bitlen/8];
+				int byteLen = (bitLen >> 3);
+				rsap.Modulus = new byte [byteLen];
+				Buffer.BlockCopy (blob, pos, rsap.Modulus, 0, byteLen);
+				Array.Reverse (rsap.Modulus);
+				pos += byteLen;
+
+				// BYTE prime1[rsapubkey.bitlen/16];
+				int byteHalfLen = (byteLen >> 1);
+				rsap.P = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.P, 0, byteHalfLen);
+				Array.Reverse (rsap.P);
+				pos += byteHalfLen;
+
+				// BYTE prime2[rsapubkey.bitlen/16];
+				rsap.Q = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.Q, 0, byteHalfLen);
+				Array.Reverse (rsap.Q);
+				pos += byteHalfLen;
+
+				// BYTE exponent1[rsapubkey.bitlen/16];
+				rsap.DP = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.DP, 0, byteHalfLen);
+				Array.Reverse (rsap.DP);
+				pos += byteHalfLen;
+
+				// BYTE exponent2[rsapubkey.bitlen/16];
+				rsap.DQ = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.DQ, 0, byteHalfLen);
+				Array.Reverse (rsap.DQ);
+				pos += byteHalfLen;
+
+				// BYTE coefficient[rsapubkey.bitlen/16];
+				rsap.InverseQ = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.InverseQ, 0, byteHalfLen);
+				Array.Reverse (rsap.InverseQ);
+				pos += byteHalfLen;
+
+				// ok, this is hackish but CryptoAPI support it so...
+				// note: only works because CRT is used by default
+				// http://bugzilla.ximian.com/show_bug.cgi?id=57941
+				rsap.D = new byte [byteLen]; // must be allocated
+				if (pos + byteLen + offset <= blob.Length) {
+					// BYTE privateExponent[rsapubkey.bitlen/8];
+					Buffer.BlockCopy (blob, pos, rsap.D, 0, byteLen);
+					Array.Reverse (rsap.D);
+				}
+			}
+			catch (Exception e) {
+				throw new CryptographicException ("Invalid blob.", e);
+			}
+
+            RSA rsa = null;
+            try
+            {
+                rsa = RSA.Create();
+                rsa.ImportParameters(rsap);
+            }
+            catch (CryptographicException ce)
+            {
+                // this may cause problem when this code is run under
+                // the SYSTEM identity on Windows (e.g. ASP.NET). See
+                // http://bugzilla.ximian.com/show_bug.cgi?id=77559
+                try
+                {
+                    CspParameters csp = new CspParameters();
+                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
+                    rsa = new RSACryptoServiceProvider(csp);
+                    rsa.ImportParameters(rsap);
+                }
+                catch
+                {
+                    // rethrow original, not the later, exception if this fails
+                    throw ce;
+                }
+            }
+            return rsa;
+		}
+
+		static public DSA FromCapiPrivateKeyBlobDSA (byte[] blob)
+		{
+			return FromCapiPrivateKeyBlobDSA (blob, 0);
+		}
+
+		static public DSA FromCapiPrivateKeyBlobDSA (byte[] blob, int offset)
+		{
+			if (blob == null)
+				throw new ArgumentNullException ("blob");
+			if (offset >= blob.Length)
+				throw new ArgumentException ("blob is too small.");
+
+			DSAParameters dsap = new DSAParameters ();
+			try {
+				if ((blob [offset] != 0x07) ||				// PRIVATEKEYBLOB (0x07)
+				    (blob [offset + 1] != 0x02) ||			// Version (0x02)
+				    (blob [offset + 2] != 0x00) ||			// Reserved (word)
+				    (blob [offset + 3] != 0x00) ||
+				    (ToUInt32LE (blob, offset + 8) != 0x32535344))	// DWORD magic
+					throw new CryptographicException ("Invalid blob header");
+
+				int bitlen = ToInt32LE (blob, offset + 12);
+				int bytelen = bitlen >> 3;
+				int pos = offset + 16;
+
+				dsap.P = new byte [bytelen];
+				Buffer.BlockCopy (blob, pos, dsap.P, 0, bytelen);
+				Array.Reverse (dsap.P);
+				pos += bytelen;
+
+				dsap.Q = new byte [20];
+				Buffer.BlockCopy (blob, pos, dsap.Q, 0, 20);
+				Array.Reverse (dsap.Q);
+				pos += 20;
+
+				dsap.G = new byte [bytelen];
+				Buffer.BlockCopy (blob, pos, dsap.G, 0, bytelen);
+				Array.Reverse (dsap.G);
+				pos += bytelen;
+
+				dsap.X = new byte [20];
+				Buffer.BlockCopy (blob, pos, dsap.X, 0, 20);
+				Array.Reverse (dsap.X);
+				pos += 20;
+
+				dsap.Counter = ToInt32LE (blob, pos);
+				pos += 4;
+
+				dsap.Seed = new byte [20];
+				Buffer.BlockCopy (blob, pos, dsap.Seed, 0, 20);
+				Array.Reverse (dsap.Seed);
+				pos += 20;
+			}
+			catch (Exception e) {
+				throw new CryptographicException ("Invalid blob.", e);
+			}
+
+            DSA dsa = null;
+            try
+            {
+                dsa = (DSA)DSA.Create();
+                dsa.ImportParameters(dsap);
+            }
+            catch (CryptographicException ce)
+            {
+                // this may cause problem when this code is run under
+                // the SYSTEM identity on Windows (e.g. ASP.NET). See
+                // http://bugzilla.ximian.com/show_bug.cgi?id=77559
+                try
+                {
+                    CspParameters csp = new CspParameters();
+                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
+                    dsa = new DSACryptoServiceProvider(csp);
+                    dsa.ImportParameters(dsap);
+                }
+                catch
+                {
+                    // rethrow original, not the later, exception if this fails
+                    throw ce;
+                }
+            }
+            return dsa;
+		}
+
+		static public byte[] ToCapiPrivateKeyBlob (RSA rsa) 
+		{
+			RSAParameters p = rsa.ExportParameters (true);
+			int keyLength = p.Modulus.Length; // in bytes
+			byte[] blob = new byte [20 + (keyLength << 2) + (keyLength >> 1)];
+
+			blob [0] = 0x07;	// Type - PRIVATEKEYBLOB (0x07)
+			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
+			// [2], [3]		// RESERVED - Always 0
+			blob [5] = 0x24;	// ALGID - Always 00 24 00 00 (for CALG_RSA_SIGN)
+			blob [8] = 0x52;	// Magic - RSA2 (ASCII in hex)
+			blob [9] = 0x53;
+			blob [10] = 0x41;
+			blob [11] = 0x32;
+
+			byte[] bitlen = GetBytesLE (keyLength << 3);
+			blob [12] = bitlen [0];	// bitlen
+			blob [13] = bitlen [1];	
+			blob [14] = bitlen [2];	
+			blob [15] = bitlen [3];
+
+			// public exponent (DWORD)
+			int pos = 16;
+			int n = p.Exponent.Length;
+			while (n > 0)
+				blob [pos++] = p.Exponent [--n];
+			// modulus
+			pos = 20;
+			byte[] part = p.Modulus;
+			int len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+			pos += len;
+			// private key
+			part = p.P;
+			len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+			pos += len;
+
+			part = p.Q;
+			len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+			pos += len;
+
+			part = p.DP;
+			len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+			pos += len;
+
+			part = p.DQ;
+			len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+			pos += len;
+
+			part = p.InverseQ;
+			len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+			pos += len;
+
+			part = p.D;
+			len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+
+			return blob;
+		}
+
+		static public byte[] ToCapiPrivateKeyBlob (DSA dsa)
+		{
+			DSAParameters p = dsa.ExportParameters (true);
+			int keyLength = p.P.Length; // in bytes
+
+			// header + P + Q + G + X + count + seed
+			byte[] blob = new byte [16 + keyLength + 20 + keyLength + 20 + 4 + 20];
+
+			blob [0] = 0x07;	// Type - PRIVATEKEYBLOB (0x07)
+			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
+			// [2], [3]		// RESERVED - Always 0
+			blob [5] = 0x22;	// ALGID
+			blob [8] = 0x44;	// Magic
+			blob [9] = 0x53;
+			blob [10] = 0x53;
+			blob [11] = 0x32;
+
+			byte[] bitlen = GetBytesLE (keyLength << 3);
+			blob [12] = bitlen [0];
+			blob [13] = bitlen [1];
+			blob [14] = bitlen [2];
+			blob [15] = bitlen [3];
+
+			int pos = 16;
+			byte[] part = p.P;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
+			pos += keyLength;
+
+			part = p.Q;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, 20);
+			pos += 20;
+
+			part = p.G;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
+			pos += keyLength;
+
+			part = p.X;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, 20);
+			pos += 20;
+
+			Buffer.BlockCopy (GetBytesLE (p.Counter), 0, blob, pos, 4);
+			pos += 4;
+
+			part = p.Seed;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, 20);
+
+			return blob;
+		}
+
+		static public RSA FromCapiPublicKeyBlob (byte[] blob) 
+		{
+			return FromCapiPublicKeyBlob (blob, 0);
+		}
+
+		static public RSA FromCapiPublicKeyBlob (byte[] blob, int offset) 
+		{
+			if (blob == null)
+				throw new ArgumentNullException ("blob");
+			if (offset >= blob.Length)
+				throw new ArgumentException ("blob is too small.");
+
+			try {
+				if ((blob [offset]   != 0x06) ||				// PUBLICKEYBLOB (0x06)
+				    (blob [offset+1] != 0x02) ||				// Version (0x02)
+				    (blob [offset+2] != 0x00) ||				// Reserved (word)
+				    (blob [offset+3] != 0x00) || 
+				    (ToUInt32LE (blob, offset+8) != 0x31415352))	// DWORD magic = RSA1
+					throw new CryptographicException ("Invalid blob header");
+
+				// ALGID (CALG_RSA_SIGN, CALG_RSA_KEYX, ...)
+				// int algId = ToInt32LE (blob, offset+4);
+
+				// DWORD bitlen
+				int bitLen = ToInt32LE (blob, offset+12);
+
+				// DWORD public exponent
+				RSAParameters rsap = new RSAParameters ();
+				rsap.Exponent = new byte [3];
+				rsap.Exponent [0] = blob [offset+18];
+				rsap.Exponent [1] = blob [offset+17];
+				rsap.Exponent [2] = blob [offset+16];
+			
+				int pos = offset+20;
+				// BYTE modulus[rsapubkey.bitlen/8];
+				int byteLen = (bitLen >> 3);
+				rsap.Modulus = new byte [byteLen];
+				Buffer.BlockCopy (blob, pos, rsap.Modulus, 0, byteLen);
+				Array.Reverse (rsap.Modulus);
+                RSA rsa = null;
+                try
+                {
+                    rsa = RSA.Create();
+                    rsa.ImportParameters(rsap);
+                }
+                catch (CryptographicException)
+                {
+                    // this may cause problem when this code is run under
+                    // the SYSTEM identity on Windows (e.g. ASP.NET). See
+                    // http://bugzilla.ximian.com/show_bug.cgi?id=77559
+                    CspParameters csp = new CspParameters();
+                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
+                    rsa = new RSACryptoServiceProvider(csp);
+                    rsa.ImportParameters(rsap);
+                }
+                return rsa;
+			}
+			catch (Exception e) {
+				throw new CryptographicException ("Invalid blob.", e);
+			}
+		}
+
+		static public DSA FromCapiPublicKeyBlobDSA (byte[] blob)
+		{
+			return FromCapiPublicKeyBlobDSA (blob, 0);
+		}
+
+		static public DSA FromCapiPublicKeyBlobDSA (byte[] blob, int offset)
+		{
+			if (blob == null)
+				throw new ArgumentNullException ("blob");
+			if (offset >= blob.Length)
+				throw new ArgumentException ("blob is too small.");
+
+			try {
+				if ((blob [offset] != 0x06) ||				// PUBLICKEYBLOB (0x06)
+				    (blob [offset + 1] != 0x02) ||			// Version (0x02)
+				    (blob [offset + 2] != 0x00) ||			// Reserved (word)
+				    (blob [offset + 3] != 0x00) ||
+				    (ToUInt32LE (blob, offset + 8) != 0x31535344))	// DWORD magic
+					throw new CryptographicException ("Invalid blob header");
+
+				int bitlen = ToInt32LE (blob, offset + 12);
+				DSAParameters dsap = new DSAParameters ();
+				int bytelen = bitlen >> 3;
+				int pos = offset + 16;
+
+				dsap.P = new byte [bytelen];
+				Buffer.BlockCopy (blob, pos, dsap.P, 0, bytelen);
+				Array.Reverse (dsap.P);
+				pos += bytelen;
+
+				dsap.Q = new byte [20];
+				Buffer.BlockCopy (blob, pos, dsap.Q, 0, 20);
+				Array.Reverse (dsap.Q);
+				pos += 20;
+
+				dsap.G = new byte [bytelen];
+				Buffer.BlockCopy (blob, pos, dsap.G, 0, bytelen);
+				Array.Reverse (dsap.G);
+				pos += bytelen;
+
+				dsap.Y = new byte [bytelen];
+				Buffer.BlockCopy (blob, pos, dsap.Y, 0, bytelen);
+				Array.Reverse (dsap.Y);
+				pos += bytelen;
+
+				dsap.Counter = ToInt32LE (blob, pos);
+				pos += 4;
+
+				dsap.Seed = new byte [20];
+				Buffer.BlockCopy (blob, pos, dsap.Seed, 0, 20);
+				Array.Reverse (dsap.Seed);
+				pos += 20;
+
+				DSA dsa = (DSA)DSA.Create ();
+				dsa.ImportParameters (dsap);
+				return dsa;
+			}
+			catch (Exception e) {
+				throw new CryptographicException ("Invalid blob.", e);
+			}
+		}
+
+		static public byte[] ToCapiPublicKeyBlob (RSA rsa) 
+		{
+			RSAParameters p = rsa.ExportParameters (false);
+			int keyLength = p.Modulus.Length; // in bytes
+			byte[] blob = new byte [20 + keyLength];
+
+			blob [0] = 0x06;	// Type - PUBLICKEYBLOB (0x06)
+			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
+			// [2], [3]		// RESERVED - Always 0
+			blob [5] = 0x24;	// ALGID - Always 00 24 00 00 (for CALG_RSA_SIGN)
+			blob [8] = 0x52;	// Magic - RSA1 (ASCII in hex)
+			blob [9] = 0x53;
+			blob [10] = 0x41;
+			blob [11] = 0x31;
+
+			byte[] bitlen = GetBytesLE (keyLength << 3);
+			blob [12] = bitlen [0];	// bitlen
+			blob [13] = bitlen [1];	
+			blob [14] = bitlen [2];	
+			blob [15] = bitlen [3];
+
+			// public exponent (DWORD)
+			int pos = 16;
+			int n = p.Exponent.Length;
+			while (n > 0)
+				blob [pos++] = p.Exponent [--n];
+			// modulus
+			pos = 20;
+			byte[] part = p.Modulus;
+			int len = part.Length;
+			Array.Reverse (part, 0, len);
+			Buffer.BlockCopy (part, 0, blob, pos, len);
+			pos += len;
+			return blob;
+		}
+
+		static public byte[] ToCapiPublicKeyBlob (DSA dsa)
+		{
+			DSAParameters p = dsa.ExportParameters (false);
+			int keyLength = p.P.Length; // in bytes
+
+			// header + P + Q + G + Y + count + seed
+			byte[] blob = new byte [16 + keyLength + 20 + keyLength + keyLength + 4 + 20];
+
+			blob [0] = 0x06;	// Type - PUBLICKEYBLOB (0x06)
+			blob [1] = 0x02;	// Version - Always CUR_BLOB_VERSION (0x02)
+			// [2], [3]		// RESERVED - Always 0
+			blob [5] = 0x22;	// ALGID
+			blob [8] = 0x44;	// Magic
+			blob [9] = 0x53;
+			blob [10] = 0x53;
+			blob [11] = 0x31;
+
+			byte[] bitlen = GetBytesLE (keyLength << 3);
+			blob [12] = bitlen [0];
+			blob [13] = bitlen [1];
+			blob [14] = bitlen [2];
+			blob [15] = bitlen [3];
+
+			int pos = 16;
+			byte[] part;
+
+			part = p.P;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
+			pos += keyLength;
+
+			part = p.Q;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, 20);
+			pos += 20;
+
+			part = p.G;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
+			pos += keyLength;
+
+			part = p.Y;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, keyLength);
+			pos += keyLength;
+
+			Buffer.BlockCopy (GetBytesLE (p.Counter), 0, blob, pos, 4);
+			pos += 4;
+
+			part = p.Seed;
+			Array.Reverse (part);
+			Buffer.BlockCopy (part, 0, blob, pos, 20);
+
+			return blob;
+		}
+
+		// PRIVATEKEYBLOB
+		// PUBLICKEYBLOB
+		static public RSA FromCapiKeyBlob (byte[] blob) 
+		{
+			return FromCapiKeyBlob (blob, 0);
+		}
+
+		static public RSA FromCapiKeyBlob (byte[] blob, int offset) 
+		{
+			if (blob == null)
+				throw new ArgumentNullException ("blob");
+			if (offset >= blob.Length)
+				throw new ArgumentException ("blob is too small.");
+
+			switch (blob [offset]) {
+				case 0x00:
+					// this could be a public key inside an header
+					// like "sn -e" would produce
+					if (blob [offset + 12] == 0x06) {
+						return FromCapiPublicKeyBlob (blob, offset + 12);
+					}
+					break;
+				case 0x06:
+					return FromCapiPublicKeyBlob (blob, offset);
+				case 0x07:
+					return FromCapiPrivateKeyBlob (blob, offset);
+			}
+			throw new CryptographicException ("Unknown blob format.");
+		}
+
+		static public DSA FromCapiKeyBlobDSA (byte[] blob)
+		{
+			return FromCapiKeyBlobDSA (blob, 0);
+		}
+
+		static public DSA FromCapiKeyBlobDSA (byte[] blob, int offset)
+		{
+			if (blob == null)
+				throw new ArgumentNullException ("blob");
+			if (offset >= blob.Length)
+				throw new ArgumentException ("blob is too small.");
+
+			switch (blob [offset]) {
+				case 0x06:
+					return FromCapiPublicKeyBlobDSA (blob, offset);
+				case 0x07:
+					return FromCapiPrivateKeyBlobDSA (blob, offset);
+			}
+			throw new CryptographicException ("Unknown blob format.");
+		}
+
+		static public byte[] ToCapiKeyBlob (AsymmetricAlgorithm keypair, bool includePrivateKey) 
+		{
+			if (keypair == null)
+				throw new ArgumentNullException ("keypair");
+
+			// check between RSA and DSA (and potentially others like DH)
+			if (keypair is RSA)
+				return ToCapiKeyBlob ((RSA)keypair, includePrivateKey);
+			else if (keypair is DSA)
+				return ToCapiKeyBlob ((DSA)keypair, includePrivateKey);
+			else
+				return null;	// TODO
+		}
+
+		static public byte[] ToCapiKeyBlob (RSA rsa, bool includePrivateKey) 
+		{
+			if (rsa == null)
+				throw new ArgumentNullException ("rsa");
+
+			if (includePrivateKey)
+				return ToCapiPrivateKeyBlob (rsa);
+			else
+				return ToCapiPublicKeyBlob (rsa);
+		}
+
+		static public byte[] ToCapiKeyBlob (DSA dsa, bool includePrivateKey)
+		{
+			if (dsa == null)
+				throw new ArgumentNullException ("dsa");
+
+			if (includePrivateKey)
+				return ToCapiPrivateKeyBlob (dsa);
+			else
+				return ToCapiPublicKeyBlob (dsa);
+		}
+
+		static public string ToHex (byte[] input) 
+		{
+			if (input == null)
+				return null;
+
+			StringBuilder sb = new StringBuilder (input.Length * 2);
+			foreach (byte b in input) {
+				sb.Append (b.ToString ("X2", CultureInfo.InvariantCulture));
+			}
+			return sb.ToString ();
+		}
+
+		static private byte FromHexChar (char c) 
+		{
+			if ((c >= 'a') && (c <= 'f'))
+				return (byte) (c - 'a' + 10);
+			if ((c >= 'A') && (c <= 'F'))
+				return (byte) (c - 'A' + 10);
+			if ((c >= '0') && (c <= '9'))
+				return (byte) (c - '0');
+			throw new ArgumentException ("invalid hex char");
+		}
+
+		static public byte[] FromHex (string hex) 
+		{
+			if (hex == null)
+				return null;
+			if ((hex.Length & 0x1) == 0x1)
+				throw new ArgumentException ("Length must be a multiple of 2");
+
+			byte[] result = new byte [hex.Length >> 1];
+			int n = 0;
+			int i = 0;
+			while (n < result.Length) {
+				result [n] = (byte) (FromHexChar (hex [i++]) << 4);
+				result [n++] += FromHexChar (hex [i++]);
+			}
+			return result;
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS1.cs b/MediaBrowser.Server.Startup.Common/Security/PKCS1.cs
new file mode 100644
index 000000000..85bf9db38
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/PKCS1.cs
@@ -0,0 +1,491 @@
+//
+// PKCS1.cs - Implements PKCS#1 primitives.
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@xamarin.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Security.Cryptography;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    // References:
+    // a.	PKCS#1: RSA Cryptography Standard 
+    //	http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/index.html
+
+    public sealed class PKCS1 {
+
+		private PKCS1 () 
+		{
+		}
+
+		private static bool Compare (byte[] array1, byte[] array2) 
+		{
+			bool result = (array1.Length == array2.Length);
+			if (result) {
+				for (int i=0; i < array1.Length; i++)
+					if (array1[i] != array2[i])
+						return false;
+			}
+			return result;
+		}
+	
+		private static byte[] xor (byte[] array1, byte[] array2) 
+		{
+			byte[] result = new byte [array1.Length];
+			for (int i=0; i < result.Length; i++)
+				result[i] = (byte) (array1[i] ^ array2[i]);
+			return result;
+		}
+	
+		private static byte[] emptySHA1   = { 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09 };
+		private static byte[] emptySHA256 = { 0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55 };
+		private static byte[] emptySHA384 = { 0x38, 0xb0, 0x60, 0xa7, 0x51, 0xac, 0x96, 0x38, 0x4c, 0xd9, 0x32, 0x7e, 0xb1, 0xb1, 0xe3, 0x6a, 0x21, 0xfd, 0xb7, 0x11, 0x14, 0xbe, 0x07, 0x43, 0x4c, 0x0c, 0xc7, 0xbf, 0x63, 0xf6, 0xe1, 0xda, 0x27, 0x4e, 0xde, 0xbf, 0xe7, 0x6f, 0x65, 0xfb, 0xd5, 0x1a, 0xd2, 0xf1, 0x48, 0x98, 0xb9, 0x5b };
+		private static byte[] emptySHA512 = { 0xcf, 0x83, 0xe1, 0x35, 0x7e, 0xef, 0xb8, 0xbd, 0xf1, 0x54, 0x28, 0x50, 0xd6, 0x6d, 0x80, 0x07, 0xd6, 0x20, 0xe4, 0x05, 0x0b, 0x57, 0x15, 0xdc, 0x83, 0xf4, 0xa9, 0x21, 0xd3, 0x6c, 0xe9, 0xce, 0x47, 0xd0, 0xd1, 0x3c, 0x5d, 0x85, 0xf2, 0xb0, 0xff, 0x83, 0x18, 0xd2, 0x87, 0x7e, 0xec, 0x2f, 0x63, 0xb9, 0x31, 0xbd, 0x47, 0x41, 0x7a, 0x81, 0xa5, 0x38, 0x32, 0x7a, 0xf9, 0x27, 0xda, 0x3e };
+	
+		private static byte[] GetEmptyHash (HashAlgorithm hash) 
+		{
+			if (hash is SHA1)
+				return emptySHA1;
+			else if (hash is SHA256)
+				return emptySHA256;
+			else if (hash is SHA384)
+				return emptySHA384;
+			else if (hash is SHA512)
+				return emptySHA512;
+			else
+				return hash.ComputeHash ((byte[])null);
+		}
+	
+		// PKCS #1 v.2.1, Section 4.1
+		// I2OSP converts a non-negative integer to an octet string of a specified length.
+		public static byte[] I2OSP (int x, int size) 
+		{
+			byte[] array = BitConverterLE.GetBytes (x);
+			Array.Reverse (array, 0, array.Length);
+			return I2OSP (array, size);
+		}
+	
+		public static byte[] I2OSP (byte[] x, int size) 
+		{
+			byte[] result = new byte [size];
+			Buffer.BlockCopy (x, 0, result, (result.Length - x.Length), x.Length);
+			return result;
+		}
+	
+		// PKCS #1 v.2.1, Section 4.2
+		// OS2IP converts an octet string to a nonnegative integer.
+		public static byte[] OS2IP (byte[] x) 
+		{
+			int i = 0;
+			while ((x [i++] == 0x00) && (i < x.Length)) {
+				// confuse compiler into reporting a warning with {}
+			}
+			i--;
+			if (i > 0) {
+				byte[] result = new byte [x.Length - i];
+				Buffer.BlockCopy (x, i, result, 0, result.Length);
+				return result;
+			}
+			else
+				return x;
+		}
+	
+		// PKCS #1 v.2.1, Section 5.1.1
+		public static byte[] RSAEP (RSA rsa, byte[] m) 
+		{
+			// c = m^e mod n
+			return rsa.EncryptValue (m);
+		}
+	
+		// PKCS #1 v.2.1, Section 5.1.2
+		public static byte[] RSADP (RSA rsa, byte[] c) 
+		{
+			// m = c^d mod n
+			// Decrypt value may apply CRT optimizations
+			return rsa.DecryptValue (c);
+		}
+	
+		// PKCS #1 v.2.1, Section 5.2.1
+		public static byte[] RSASP1 (RSA rsa, byte[] m) 
+		{
+			// first form: s = m^d mod n
+			// Decrypt value may apply CRT optimizations
+			return rsa.DecryptValue (m);
+		}
+	
+		// PKCS #1 v.2.1, Section 5.2.2
+		public static byte[] RSAVP1 (RSA rsa, byte[] s) 
+		{
+			// m = s^e mod n
+			return rsa.EncryptValue (s);
+		}
+	
+		// PKCS #1 v.2.1, Section 7.1.1
+		// RSAES-OAEP-ENCRYPT ((n, e), M, L)
+		public static byte[] Encrypt_OAEP (RSA rsa, HashAlgorithm hash, RandomNumberGenerator rng, byte[] M) 
+		{
+			int size = rsa.KeySize / 8;
+			int hLen = hash.HashSize / 8;
+			if (M.Length > size - 2 * hLen - 2)
+				throw new CryptographicException ("message too long");
+			// empty label L SHA1 hash
+			byte[] lHash = GetEmptyHash (hash);
+			int PSLength = (size - M.Length - 2 * hLen - 2);
+			// DB = lHash || PS || 0x01 || M
+			byte[] DB = new byte [lHash.Length + PSLength + 1 + M.Length];
+			Buffer.BlockCopy (lHash, 0, DB, 0, lHash.Length);
+			DB [(lHash.Length + PSLength)] = 0x01;
+			Buffer.BlockCopy (M, 0, DB, (DB.Length - M.Length), M.Length);
+	
+			byte[] seed = new byte [hLen];
+			rng.GetBytes (seed);
+	
+			byte[] dbMask = MGF1 (hash, seed, size - hLen - 1);
+			byte[] maskedDB = xor (DB, dbMask);
+			byte[] seedMask = MGF1 (hash, maskedDB, hLen);
+			byte[] maskedSeed = xor (seed, seedMask);
+			// EM = 0x00 || maskedSeed || maskedDB
+			byte[] EM = new byte [maskedSeed.Length + maskedDB.Length + 1];
+			Buffer.BlockCopy (maskedSeed, 0, EM, 1, maskedSeed.Length);
+			Buffer.BlockCopy (maskedDB, 0, EM, maskedSeed.Length + 1, maskedDB.Length);
+	
+			byte[] m = OS2IP (EM);
+			byte[] c = RSAEP (rsa, m);
+			return I2OSP (c, size);
+		}
+	
+		// PKCS #1 v.2.1, Section 7.1.2
+		// RSAES-OAEP-DECRYPT (K, C, L)
+		public static byte[] Decrypt_OAEP (RSA rsa, HashAlgorithm hash, byte[] C) 
+		{
+			int size = rsa.KeySize / 8;
+			int hLen = hash.HashSize / 8;
+			if ((size < (2 * hLen + 2)) || (C.Length != size))
+				throw new CryptographicException ("decryption error");
+	
+			byte[] c = OS2IP (C);
+			byte[] m = RSADP (rsa, c);
+			byte[] EM = I2OSP (m, size);
+	
+			// split EM = Y || maskedSeed || maskedDB
+			byte[] maskedSeed = new byte [hLen];
+			Buffer.BlockCopy (EM, 1, maskedSeed, 0, maskedSeed.Length);
+			byte[] maskedDB = new byte [size - hLen - 1];
+			Buffer.BlockCopy (EM, (EM.Length - maskedDB.Length), maskedDB, 0, maskedDB.Length);
+	
+			byte[] seedMask = MGF1 (hash, maskedDB, hLen);
+			byte[] seed = xor (maskedSeed, seedMask);
+			byte[] dbMask = MGF1 (hash, seed, size - hLen - 1);
+			byte[] DB = xor (maskedDB, dbMask);
+	
+			byte[] lHash = GetEmptyHash (hash);
+			// split DB = lHash' || PS || 0x01 || M
+			byte[] dbHash = new byte [lHash.Length];
+			Buffer.BlockCopy (DB, 0, dbHash, 0, dbHash.Length);
+			bool h = Compare (lHash, dbHash);
+	
+			// find separator 0x01
+			int nPos = lHash.Length;
+			while (DB[nPos] == 0)
+				nPos++;
+	
+			int Msize = DB.Length - nPos - 1;
+			byte[] M = new byte [Msize];
+			Buffer.BlockCopy (DB, (nPos + 1), M, 0, Msize);
+	
+			// we could have returned EM[0] sooner but would be helping a timing attack
+			if ((EM[0] != 0) || (!h) || (DB[nPos] != 0x01))
+				return null;
+			return M;
+		}
+	
+		// PKCS #1 v.2.1, Section 7.2.1
+		// RSAES-PKCS1-V1_5-ENCRYPT ((n, e), M)
+		public static byte[] Encrypt_v15 (RSA rsa, RandomNumberGenerator rng, byte[] M) 
+		{
+			int size = rsa.KeySize / 8;
+			if (M.Length > size - 11)
+				throw new CryptographicException ("message too long");
+			int PSLength = System.Math.Max (8, (size - M.Length - 3));
+			byte[] PS = new byte [PSLength];
+			rng.GetNonZeroBytes (PS);
+			byte[] EM = new byte [size];
+			EM [1] = 0x02;
+			Buffer.BlockCopy (PS, 0, EM, 2, PSLength);
+			Buffer.BlockCopy (M, 0, EM, (size - M.Length), M.Length);
+	
+			byte[] m = OS2IP (EM);
+			byte[] c = RSAEP (rsa, m);
+			byte[] C = I2OSP (c, size);
+			return C;
+		}
+	
+		// PKCS #1 v.2.1, Section 7.2.2
+		// RSAES-PKCS1-V1_5-DECRYPT (K, C)
+		public static byte[] Decrypt_v15 (RSA rsa, byte[] C) 
+		{
+			int size = rsa.KeySize >> 3; // div by 8
+			if ((size < 11) || (C.Length > size))
+				throw new CryptographicException ("decryption error");
+			byte[] c = OS2IP (C);
+			byte[] m = RSADP (rsa, c);
+			byte[] EM = I2OSP (m, size);
+	
+			if ((EM [0] != 0x00) || (EM [1] != 0x02))
+				return null;
+	
+			int mPos = 10;
+			// PS is a minimum of 8 bytes + 2 bytes for header
+			while ((EM [mPos] != 0x00) && (mPos < EM.Length))
+				mPos++;
+			if (EM [mPos] != 0x00)
+				return null;
+			mPos++;
+			byte[] M = new byte [EM.Length - mPos];
+			Buffer.BlockCopy (EM, mPos, M, 0, M.Length);
+			return M;
+		}
+	
+		// PKCS #1 v.2.1, Section 8.2.1
+		// RSASSA-PKCS1-V1_5-SIGN (K, M)
+		public static byte[] Sign_v15 (RSA rsa, HashAlgorithm hash, byte[] hashValue) 
+		{
+			int size = (rsa.KeySize >> 3); // div 8
+			byte[] EM = Encode_v15 (hash, hashValue, size);
+			byte[] m = OS2IP (EM);
+			byte[] s = RSASP1 (rsa, m);
+			byte[] S = I2OSP (s, size);
+			return S;
+		}
+
+		internal static byte[] Sign_v15 (RSA rsa, string hashName, byte[] hashValue) 
+		{
+			using (var hash = CreateFromName (hashName))
+				return Sign_v15 (rsa, hash, hashValue);
+		}
+
+		// PKCS #1 v.2.1, Section 8.2.2
+		// RSASSA-PKCS1-V1_5-VERIFY ((n, e), M, S)
+		public static bool Verify_v15 (RSA rsa, HashAlgorithm hash, byte[] hashValue, byte[] signature) 
+		{
+			return Verify_v15 (rsa, hash, hashValue, signature, false);
+		}
+
+		internal static bool Verify_v15 (RSA rsa, string hashName, byte[] hashValue, byte[] signature) 
+		{
+			using (var hash = CreateFromName (hashName))
+				return Verify_v15 (rsa, hash, hashValue, signature, false);
+		}
+
+		// DO NOT USE WITHOUT A VERY GOOD REASON
+		public static bool Verify_v15 (RSA rsa, HashAlgorithm hash, byte [] hashValue, byte [] signature, bool tryNonStandardEncoding)
+		{
+			int size = (rsa.KeySize >> 3); // div 8
+			byte[] s = OS2IP (signature);
+			byte[] m = RSAVP1 (rsa, s);
+			byte[] EM2 = I2OSP (m, size);
+			byte[] EM = Encode_v15 (hash, hashValue, size);
+			bool result = Compare (EM, EM2);
+			if (result || !tryNonStandardEncoding)
+				return result;
+
+			// NOTE: some signatures don't include the hash OID (pretty lame but real)
+			// and compatible with MS implementation. E.g. Verisign Authenticode Timestamps
+
+			// we're making this "as safe as possible"
+			if ((EM2 [0] != 0x00) || (EM2 [1] != 0x01))
+				return false;
+			int i;
+			for (i = 2; i < EM2.Length - hashValue.Length - 1; i++) {
+				if (EM2 [i] != 0xFF)
+					return false;
+			}
+			if (EM2 [i++] != 0x00)
+				return false;
+
+			byte [] decryptedHash = new byte [hashValue.Length];
+			Buffer.BlockCopy (EM2, i, decryptedHash, 0, decryptedHash.Length);
+			return Compare (decryptedHash, hashValue);
+		}
+	
+		// PKCS #1 v.2.1, Section 9.2
+		// EMSA-PKCS1-v1_5-Encode
+		public static byte[] Encode_v15 (HashAlgorithm hash, byte[] hashValue, int emLength) 
+		{
+			if (hashValue.Length != (hash.HashSize >> 3))
+				throw new CryptographicException ("bad hash length for " + hash.ToString ());
+
+			// DigestInfo ::= SEQUENCE {
+			//	digestAlgorithm AlgorithmIdentifier,
+			//	digest OCTET STRING
+			// }
+		
+			byte[] t = null;
+
+			string oid = CryptoConfig.MapNameToOID (hash.ToString ());
+			if (oid != null)
+			{
+				ASN1 digestAlgorithm = new ASN1 (0x30);
+				digestAlgorithm.Add (new ASN1 (CryptoConfig.EncodeOID (oid)));
+				digestAlgorithm.Add (new ASN1 (0x05));		// NULL
+				ASN1 digest = new ASN1 (0x04, hashValue);
+				ASN1 digestInfo = new ASN1 (0x30);
+				digestInfo.Add (digestAlgorithm);
+				digestInfo.Add (digest);
+
+				t = digestInfo.GetBytes ();
+			}
+			else
+			{
+				// There are no valid OID, in this case t = hashValue
+				// This is the case of the MD5SHA hash algorithm
+				t = hashValue;
+			}
+
+			Buffer.BlockCopy (hashValue, 0, t, t.Length - hashValue.Length, hashValue.Length);
+	
+			int PSLength = System.Math.Max (8, emLength - t.Length - 3);
+			// PS = PSLength of 0xff
+	
+			// EM = 0x00 | 0x01 | PS | 0x00 | T
+			byte[] EM = new byte [PSLength + t.Length + 3];
+			EM [1] = 0x01;
+			for (int i=2; i < PSLength + 2; i++)
+				EM[i] = 0xff;
+			Buffer.BlockCopy (t, 0, EM, PSLength + 3, t.Length);
+	
+			return EM;
+		}
+	
+		// PKCS #1 v.2.1, Section B.2.1
+		public static byte[] MGF1 (HashAlgorithm hash, byte[] mgfSeed, int maskLen) 
+		{
+			// 1. If maskLen > 2^32 hLen, output "mask too long" and stop.
+			// easy - this is impossible by using a int (31bits) as parameter ;-)
+			// BUT with a signed int we do have to check for negative values!
+			if (maskLen < 0)
+				throw new OverflowException();
+	
+			int mgfSeedLength = mgfSeed.Length;
+			int hLen = (hash.HashSize >> 3); // from bits to bytes
+			int iterations = (maskLen / hLen);
+			if (maskLen % hLen != 0)
+				iterations++;
+			// 2. Let T be the empty octet string.
+			byte[] T = new byte [iterations * hLen];
+	
+			byte[] toBeHashed = new byte [mgfSeedLength + 4];
+			int pos = 0;
+			// 3. For counter from 0 to \ceil (maskLen / hLen) - 1, do the following:
+			for (int counter = 0; counter < iterations; counter++) {
+				// a.	Convert counter to an octet string C of length 4 octets
+				byte[] C = I2OSP (counter, 4); 
+	
+				// b.	Concatenate the hash of the seed mgfSeed and C to the octet string T:
+				//	T = T || Hash (mgfSeed || C)
+				Buffer.BlockCopy (mgfSeed, 0, toBeHashed, 0, mgfSeedLength);
+				Buffer.BlockCopy (C, 0, toBeHashed, mgfSeedLength, 4);
+				byte[] output = hash.ComputeHash (toBeHashed);
+				Buffer.BlockCopy (output, 0, T, pos, hLen);
+				pos += hLen;
+			}
+			
+			// 4. Output the leading maskLen octets of T as the octet string mask.
+			byte[] mask = new byte [maskLen];
+			Buffer.BlockCopy (T, 0, mask, 0, maskLen);
+			return mask;
+		}
+
+		static internal string HashNameFromOid (string oid, bool throwOnError = true)
+		{
+			switch (oid) {
+			case "1.2.840.113549.1.1.2":	// MD2 with RSA encryption 
+				return "MD2";
+			case "1.2.840.113549.1.1.3":	// MD4 with RSA encryption 
+				return "MD4";
+			case "1.2.840.113549.1.1.4":	// MD5 with RSA encryption 
+				return "MD5";
+			case "1.2.840.113549.1.1.5":	// SHA-1 with RSA Encryption 
+			case "1.3.14.3.2.29":		// SHA1 with RSA signature 
+			case "1.2.840.10040.4.3":	// SHA1-1 with DSA
+				return "SHA1";
+			case "1.2.840.113549.1.1.11":	// SHA-256 with RSA Encryption
+				return "SHA256";
+			case "1.2.840.113549.1.1.12":	// SHA-384 with RSA Encryption
+				return "SHA384";
+			case "1.2.840.113549.1.1.13":	// SHA-512 with RSA Encryption
+				return "SHA512";
+			case "1.3.36.3.3.1.2":
+				return "RIPEMD160";
+			default:
+				if (throwOnError)
+					throw new CryptographicException ("Unsupported hash algorithm: " + oid);
+				return null;
+			}
+		}
+		
+		static internal HashAlgorithm CreateFromOid (string oid)
+		{
+			return CreateFromName (HashNameFromOid (oid));
+		}
+		
+		static internal HashAlgorithm CreateFromName (string name)
+		{
+#if FULL_AOT_RUNTIME
+			switch (name) {
+			case "MD2":
+				return MD2.Create ();
+			case "MD4":
+				return MD4.Create ();
+			case "MD5":
+				return MD5.Create ();
+			case "SHA1":
+				return SHA1.Create ();
+			case "SHA256":
+				return SHA256.Create ();
+			case "SHA384":
+				return SHA384.Create ();
+			case "SHA512":
+				return SHA512.Create ();
+			case "RIPEMD160":
+				return RIPEMD160.Create ();
+			default:
+				try {
+					return (HashAlgorithm) Activator.CreateInstance (Type.GetType (name));
+				}
+				catch {
+					throw new CryptographicException ("Unsupported hash algorithm: " + name);
+				}
+			}
+#else
+			return HashAlgorithm.Create (name);
+#endif
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS12.cs b/MediaBrowser.Server.Startup.Common/Security/PKCS12.cs
new file mode 100644
index 000000000..2205a7160
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/PKCS12.cs
@@ -0,0 +1,1934 @@
+//
+// PKCS12.cs: PKCS 12 - Personal Information Exchange Syntax
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@xamarin.com>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004,2005,2006 Novell Inc. (http://www.novell.com)
+// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
+//
+// Key derivation translated from Bouncy Castle JCE (http://www.bouncycastle.org/)
+// See bouncycastle.txt for license.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    public class PKCS5 {
+
+		public const string pbeWithMD2AndDESCBC = "1.2.840.113549.1.5.1";
+		public const string pbeWithMD5AndDESCBC = "1.2.840.113549.1.5.3";
+		public const string pbeWithMD2AndRC2CBC = "1.2.840.113549.1.5.4";
+		public const string pbeWithMD5AndRC2CBC = "1.2.840.113549.1.5.6";
+		public const string pbeWithSHA1AndDESCBC = "1.2.840.113549.1.5.10";
+		public const string pbeWithSHA1AndRC2CBC = "1.2.840.113549.1.5.11";
+
+		public PKCS5 () {}
+	}
+
+    public class PKCS9 {
+
+		public const string friendlyName = "1.2.840.113549.1.9.20";
+		public const string localKeyId = "1.2.840.113549.1.9.21";
+
+		public PKCS9 () {}
+	}
+
+
+	internal class SafeBag {
+		private string _bagOID;
+		private ASN1 _asn1;
+
+		public SafeBag(string bagOID, ASN1 asn1) {
+			_bagOID = bagOID;
+			_asn1 = asn1;
+		}
+
+		public string BagOID {
+			get { return _bagOID; }
+		}
+
+		public ASN1 ASN1 {
+			get { return _asn1; }
+		}
+	}
+
+
+    public class PKCS12 : ICloneable {
+
+		public const string pbeWithSHAAnd128BitRC4 = "1.2.840.113549.1.12.1.1";
+		public const string pbeWithSHAAnd40BitRC4 = "1.2.840.113549.1.12.1.2";
+		public const string pbeWithSHAAnd3KeyTripleDESCBC = "1.2.840.113549.1.12.1.3";
+		public const string pbeWithSHAAnd2KeyTripleDESCBC = "1.2.840.113549.1.12.1.4";
+		public const string pbeWithSHAAnd128BitRC2CBC = "1.2.840.113549.1.12.1.5";
+		public const string pbeWithSHAAnd40BitRC2CBC = "1.2.840.113549.1.12.1.6";
+
+		// bags
+		public const string keyBag  = "1.2.840.113549.1.12.10.1.1";
+		public const string pkcs8ShroudedKeyBag  = "1.2.840.113549.1.12.10.1.2";
+		public const string certBag  = "1.2.840.113549.1.12.10.1.3";
+		public const string crlBag  = "1.2.840.113549.1.12.10.1.4";
+		public const string secretBag  = "1.2.840.113549.1.12.10.1.5";
+		public const string safeContentsBag  = "1.2.840.113549.1.12.10.1.6";
+
+		// types
+		public const string x509Certificate = "1.2.840.113549.1.9.22.1";
+ 		public const string sdsiCertificate = "1.2.840.113549.1.9.22.2";
+		public const string x509Crl = "1.2.840.113549.1.9.23.1";
+
+		// Adapted from BouncyCastle PKCS12ParametersGenerator.java
+		public class DeriveBytes {
+
+			public enum Purpose {
+				Key,
+				IV,
+				MAC
+			}
+
+			static private byte[] keyDiversifier = { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 };
+			static private byte[] ivDiversifier  = { 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 };
+			static private byte[] macDiversifier = { 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 };
+
+			private string _hashName;
+			private int _iterations;
+			private byte[] _password;
+			private byte[] _salt;
+
+			public DeriveBytes () {}
+
+			public string HashName {
+				get { return _hashName; } 
+				set { _hashName = value; }
+			}
+
+			public int IterationCount {
+				get { return _iterations; }
+				set { _iterations = value; }
+			}
+
+			public byte[] Password {
+				get { return (byte[]) _password.Clone (); }
+				set { 
+					if (value == null)
+						_password = new byte [0];
+					else
+						_password = (byte[]) value.Clone ();
+				}
+			}
+
+			public byte[] Salt {
+				get { return (byte[]) _salt.Clone ();  }
+				set {
+					if (value != null)
+						_salt = (byte[]) value.Clone ();
+					else
+						_salt = null;
+				}
+			}
+
+			private void Adjust (byte[] a, int aOff, byte[] b) 
+			{
+				int x = (b[b.Length - 1] & 0xff) + (a [aOff + b.Length - 1] & 0xff) + 1;
+
+				a [aOff + b.Length - 1] = (byte) x;
+				x >>= 8;
+
+				for (int i = b.Length - 2; i >= 0; i--) {
+					x += (b [i] & 0xff) + (a [aOff + i] & 0xff);
+					a [aOff + i] = (byte) x;
+					x >>= 8;
+				}
+			}
+
+			private byte[] Derive (byte[] diversifier, int n) 
+			{
+				HashAlgorithm digest = PKCS1.CreateFromName (_hashName);
+				int u = (digest.HashSize >> 3); // div 8
+				int v = 64;
+				byte[] dKey = new byte [n];
+
+				byte[] S;
+				if ((_salt != null) && (_salt.Length != 0)) {
+					S = new byte[v * ((_salt.Length + v - 1) / v)];
+
+					for (int i = 0; i != S.Length; i++) {
+						S[i] = _salt[i % _salt.Length];
+					}
+				}
+				else {
+					S = new byte[0];
+				}
+
+				byte[] P;
+				if ((_password != null) && (_password.Length != 0)) {
+					P = new byte[v * ((_password.Length + v - 1) / v)];
+
+					for (int i = 0; i != P.Length; i++) {
+						P[i] = _password[i % _password.Length];
+					}
+				}
+				else {
+					P = new byte[0];
+				}
+
+				byte[] I = new byte [S.Length + P.Length];
+
+				Buffer.BlockCopy (S, 0, I, 0, S.Length);
+				Buffer.BlockCopy (P, 0, I, S.Length, P.Length);
+
+				byte[]  B = new byte[v];
+				int     c = (n + u - 1) / u;
+
+				for (int i = 1; i <= c; i++) {
+					digest.TransformBlock (diversifier, 0, diversifier.Length, diversifier, 0);
+					digest.TransformFinalBlock (I, 0, I.Length);
+					byte[] A = digest.Hash;
+					digest.Initialize ();
+					for (int j = 1; j != _iterations; j++) {
+						A = digest.ComputeHash (A, 0, A.Length);
+					}
+
+					for (int j = 0; j != B.Length; j++) {
+						B [j] = A [j % A.Length];
+					}
+
+					for (int j = 0; j != I.Length / v; j++) {
+						Adjust (I, j * v, B);
+					}
+
+					if (i == c) {
+						Buffer.BlockCopy(A, 0, dKey, (i - 1) * u, dKey.Length - ((i - 1) * u));
+					}
+					else {
+						Buffer.BlockCopy(A, 0, dKey, (i - 1) * u, A.Length);
+					}
+				}
+
+				return dKey;
+			}
+
+			public byte[] DeriveKey (int size) 
+			{
+				return Derive (keyDiversifier, size);
+			}
+
+			public byte[] DeriveIV (int size) 
+			{
+				return Derive (ivDiversifier, size);
+			}
+
+			public byte[] DeriveMAC (int size) 
+			{
+				return Derive (macDiversifier, size);
+			}
+		}
+
+		const int recommendedIterationCount = 2000;
+
+		//private int _version;
+		private byte[] _password;
+		private ArrayList _keyBags;
+		private ArrayList _secretBags;
+		private X509CertificateCollection _certs;
+		private bool _keyBagsChanged;
+		private bool _secretBagsChanged;
+		private bool _certsChanged;
+		private int _iterations;
+		private ArrayList _safeBags;
+		private RandomNumberGenerator _rng;
+
+		// constructors
+
+		public PKCS12 () 
+		{
+			_iterations = recommendedIterationCount;
+			_keyBags = new ArrayList ();
+			_secretBags = new ArrayList ();
+			_certs = new X509CertificateCollection ();
+			_keyBagsChanged = false;
+			_secretBagsChanged = false;
+			_certsChanged = false;
+			_safeBags = new ArrayList ();
+		}
+
+		public PKCS12 (byte[] data)
+			: this ()
+		{
+			Password = null;
+			Decode (data);
+		}
+
+		/*
+		 * PFX ::= SEQUENCE {
+		 *	version INTEGER {v3(3)}(v3,...),
+		 *	authSafe ContentInfo,
+		 *	macData MacData OPTIONAL
+		 * }
+		 * 
+		 * MacData ::= SEQUENCE {
+		 *	mac DigestInfo,
+		 *	macSalt OCTET STRING,
+		 *	iterations INTEGER DEFAULT 1
+		 *	-- Note: The default is for historical reasons and its use is deprecated. A higher
+		 *	-- value, like 1024 is recommended.
+		 * }
+		 * 
+		 * SafeContents ::= SEQUENCE OF SafeBag
+		 * 
+		 * SafeBag ::= SEQUENCE {
+		 *	bagId BAG-TYPE.&id ({PKCS12BagSet}),
+		 *	bagValue [0] EXPLICIT BAG-TYPE.&Type({PKCS12BagSet}{@bagId}),
+		 *	bagAttributes SET OF PKCS12Attribute OPTIONAL
+		 * }
+		 */
+		public PKCS12 (byte[] data, string password)
+			: this ()
+		{
+			Password = password;
+			Decode (data);
+		}
+
+		public PKCS12 (byte[] data, byte[] password)
+			: this ()
+		{
+			_password = password;
+			Decode (data);
+		}
+
+		private void Decode (byte[] data)
+		{
+			ASN1 pfx = new ASN1 (data);
+			if (pfx.Tag != 0x30)
+				throw new ArgumentException ("invalid data");
+			
+			ASN1 version = pfx [0];
+			if (version.Tag != 0x02)
+				throw new ArgumentException ("invalid PFX version");
+			//_version = version.Value [0];
+
+			PKCS7.ContentInfo authSafe = new PKCS7.ContentInfo (pfx [1]);
+			if (authSafe.ContentType != PKCS7.Oid.data)
+				throw new ArgumentException ("invalid authenticated safe");
+
+			// now that we know it's a PKCS#12 file, check the (optional) MAC
+			// before decoding anything else in the file
+			if (pfx.Count > 2) {
+				ASN1 macData = pfx [2];
+				if (macData.Tag != 0x30)
+					throw new ArgumentException ("invalid MAC");
+				
+				ASN1 mac = macData [0];
+				if (mac.Tag != 0x30)
+					throw new ArgumentException ("invalid MAC");
+				ASN1 macAlgorithm = mac [0];
+				string macOid = ASN1Convert.ToOid (macAlgorithm [0]);
+				if (macOid != "1.3.14.3.2.26")
+					throw new ArgumentException ("unsupported HMAC");
+				byte[] macValue = mac [1].Value;
+
+				ASN1 macSalt = macData [1];
+				if (macSalt.Tag != 0x04)
+					throw new ArgumentException ("missing MAC salt");
+
+				_iterations = 1; // default value
+				if (macData.Count > 2) {
+					ASN1 iters = macData [2];
+					if (iters.Tag != 0x02)
+						throw new ArgumentException ("invalid MAC iteration");
+					_iterations = ASN1Convert.ToInt32 (iters);
+				}
+
+				byte[] authSafeData = authSafe.Content [0].Value;
+				byte[] calculatedMac = MAC (_password, macSalt.Value, _iterations, authSafeData);
+				if (!Compare (macValue, calculatedMac)) {
+					byte[] nullPassword = {0, 0};
+					calculatedMac = MAC(nullPassword, macSalt.Value, _iterations, authSafeData);
+					if (!Compare (macValue, calculatedMac))
+						throw new CryptographicException ("Invalid MAC - file may have been tampe red!");
+					_password = nullPassword;
+				}
+			}
+
+			// we now returns to our original presentation - PFX
+			ASN1 authenticatedSafe = new ASN1 (authSafe.Content [0].Value);
+			for (int i=0; i < authenticatedSafe.Count; i++) {
+				PKCS7.ContentInfo ci = new PKCS7.ContentInfo (authenticatedSafe [i]);
+				switch (ci.ContentType) {
+					case PKCS7.Oid.data:
+						// unencrypted (by PKCS#12)
+						ASN1 safeContents = new ASN1 (ci.Content [0].Value);
+						for (int j=0; j < safeContents.Count; j++) {
+							ASN1 safeBag = safeContents [j];
+							ReadSafeBag (safeBag);
+						}
+						break;
+					case PKCS7.Oid.encryptedData:
+						// password encrypted
+						PKCS7.EncryptedData ed = new PKCS7.EncryptedData (ci.Content [0]);
+						ASN1 decrypted = new ASN1 (Decrypt (ed));
+						for (int j=0; j < decrypted.Count; j++) {
+							ASN1 safeBag = decrypted [j];
+							ReadSafeBag (safeBag);
+						}
+						break;
+					case PKCS7.Oid.envelopedData:
+						// public key encrypted
+						throw new NotImplementedException ("public key encrypted");
+					default:
+						throw new ArgumentException ("unknown authenticatedSafe");
+				}
+			}
+		}
+
+		~PKCS12 () 
+		{
+			if (_password != null) {
+				Array.Clear (_password, 0, _password.Length);
+			}
+			_password = null;
+		}
+
+		// properties
+
+		public string Password {
+			set {
+				// Clear old password.
+				if (_password != null)
+					Array.Clear (_password, 0, _password.Length);
+				_password = null;
+				if (value != null) {
+					if (value.Length > 0) {
+						int size = value.Length;
+						int nul = 0;
+						if (size < MaximumPasswordLength) {
+							// if not present, add space for a NULL (0x00) character
+							if (value[size - 1] != 0x00)
+								nul = 1;
+						} else {
+							size = MaximumPasswordLength;
+						}
+						_password = new byte[(size + nul) << 1]; // double for unicode
+						Encoding.BigEndianUnicode.GetBytes (value, 0, size, _password, 0);
+					} else {
+						// double-byte (Unicode) NULL (0x00) - see bug #79617
+						_password = new byte[2];
+					}
+				}
+			}
+		}
+
+		public int IterationCount {
+			get { return _iterations; }
+			set { _iterations = value; }
+		}
+
+		public ArrayList Keys {
+			get {
+				if (_keyBagsChanged) {
+					_keyBags.Clear ();
+					foreach (SafeBag sb in _safeBags) {
+						if (sb.BagOID.Equals (keyBag)) {
+							ASN1 safeBag = sb.ASN1;
+							ASN1 bagValue = safeBag [1];
+							PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
+							byte[] privateKey = pki.PrivateKey;
+							switch (privateKey [0]) {
+							case 0x02:
+								DSAParameters p = new DSAParameters (); // FIXME
+								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p));
+								break;
+							case 0x30:
+								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeRSA (privateKey));
+								break;
+							default:
+								break;
+							}
+							Array.Clear (privateKey, 0, privateKey.Length);
+
+						} else if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+							ASN1 safeBag = sb.ASN1;
+							ASN1 bagValue = safeBag [1];
+							PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
+							byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
+							PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
+							byte[] privateKey = pki.PrivateKey;
+							switch (privateKey [0]) {
+							case 0x02:
+								DSAParameters p = new DSAParameters (); // FIXME
+								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p));
+								break;
+							case 0x30:
+								_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeRSA (privateKey));
+								break;
+							default:
+								break;
+							}
+							Array.Clear (privateKey, 0, privateKey.Length);
+							Array.Clear (decrypted, 0, decrypted.Length);
+						}
+					}
+					_keyBagsChanged = false;
+				}
+				return ArrayList.ReadOnly(_keyBags);
+			}
+		}
+
+		public ArrayList Secrets {
+			get {
+				if (_secretBagsChanged) {
+					_secretBags.Clear ();
+					foreach (SafeBag sb in _safeBags) {
+						if (sb.BagOID.Equals (secretBag)) {
+							ASN1 safeBag = sb.ASN1;
+							ASN1 bagValue = safeBag [1];
+							byte[] secret = bagValue.Value;
+							_secretBags.Add(secret);
+						}
+					}
+					_secretBagsChanged = false;
+				}
+				return ArrayList.ReadOnly(_secretBags);
+			}
+		}
+
+		public X509CertificateCollection Certificates {
+			get {
+				if (_certsChanged) {
+					_certs.Clear ();
+					foreach (SafeBag sb in _safeBags) {
+						if (sb.BagOID.Equals (certBag)) {
+							ASN1 safeBag = sb.ASN1;
+							ASN1 bagValue = safeBag [1];
+							PKCS7.ContentInfo cert = new PKCS7.ContentInfo (bagValue.Value);
+							_certs.Add (new X509Certificate (cert.Content [0].Value));
+						}
+					}
+					_certsChanged = false;
+				}
+				return _certs;
+			}
+		}
+
+		internal RandomNumberGenerator RNG {
+			get {
+				if (_rng == null)
+					_rng = RandomNumberGenerator.Create ();
+				return _rng;
+			}
+		}
+
+		// private methods
+
+		private bool Compare (byte[] expected, byte[] actual) 
+		{
+			bool compare = false;
+			if (expected.Length == actual.Length) {
+				for (int i=0; i < expected.Length; i++) {
+					if (expected [i] != actual [i])
+						return false;
+				}
+				compare = true;
+			}
+			return compare;
+		}
+
+		private SymmetricAlgorithm GetSymmetricAlgorithm (string algorithmOid, byte[] salt, int iterationCount)
+		{
+			string algorithm = null;
+			int keyLength = 8;	// 64 bits (default)
+			int ivLength = 8;	// 64 bits (default)
+
+			PKCS12.DeriveBytes pd = new PKCS12.DeriveBytes ();
+			pd.Password = _password; 
+			pd.Salt = salt;
+			pd.IterationCount = iterationCount;
+
+			switch (algorithmOid) {
+				case PKCS5.pbeWithMD2AndDESCBC:			// no unit test available
+					pd.HashName = "MD2";
+					algorithm = "DES";
+					break;
+				case PKCS5.pbeWithMD5AndDESCBC:			// no unit test available
+					pd.HashName = "MD5";
+					algorithm = "DES";
+					break;
+				case PKCS5.pbeWithMD2AndRC2CBC:			// no unit test available
+					// TODO - RC2-CBC-Parameter (PKCS5)
+					// if missing default to 32 bits !!!
+					pd.HashName = "MD2";
+					algorithm = "RC2";
+					keyLength = 4;		// default
+					break;
+				case PKCS5.pbeWithMD5AndRC2CBC:			// no unit test available
+					// TODO - RC2-CBC-Parameter (PKCS5)
+					// if missing default to 32 bits !!!
+					pd.HashName = "MD5";
+					algorithm = "RC2";
+					keyLength = 4;		// default
+					break;
+				case PKCS5.pbeWithSHA1AndDESCBC: 		// no unit test available
+					pd.HashName = "SHA1";
+					algorithm = "DES";
+					break;
+				case PKCS5.pbeWithSHA1AndRC2CBC:		// no unit test available
+					// TODO - RC2-CBC-Parameter (PKCS5)
+					// if missing default to 32 bits !!!
+					pd.HashName = "SHA1";
+					algorithm = "RC2";
+					keyLength = 4;		// default
+					break;
+				case PKCS12.pbeWithSHAAnd128BitRC4: 		// no unit test available
+					pd.HashName = "SHA1";
+					algorithm = "RC4";
+					keyLength = 16;
+					ivLength = 0;		// N/A
+					break;
+				case PKCS12.pbeWithSHAAnd40BitRC4: 		// no unit test available
+					pd.HashName = "SHA1";
+					algorithm = "RC4";
+					keyLength = 5;
+					ivLength = 0;		// N/A
+					break;
+				case PKCS12.pbeWithSHAAnd3KeyTripleDESCBC: 
+					pd.HashName = "SHA1";
+					algorithm = "TripleDES";
+					keyLength = 24;
+					break;
+				case PKCS12.pbeWithSHAAnd2KeyTripleDESCBC:	// no unit test available
+					pd.HashName = "SHA1";
+					algorithm = "TripleDES";
+					keyLength = 16;
+					break;
+				case PKCS12.pbeWithSHAAnd128BitRC2CBC: 		// no unit test available
+					pd.HashName = "SHA1";
+					algorithm = "RC2";
+					keyLength = 16;
+					break;
+				case PKCS12.pbeWithSHAAnd40BitRC2CBC: 
+					pd.HashName = "SHA1";
+					algorithm = "RC2";
+					keyLength = 5;
+					break;
+				default:
+					throw new NotSupportedException ("unknown oid " + algorithm);
+			}
+
+			SymmetricAlgorithm sa = null;
+            sa = SymmetricAlgorithm.Create(algorithm);
+            sa.Key = pd.DeriveKey (keyLength);
+			// IV required only for block ciphers (not stream ciphers)
+			if (ivLength > 0) {
+				sa.IV = pd.DeriveIV (ivLength);
+				sa.Mode = CipherMode.CBC;
+			}
+			return sa;
+		}
+
+		public byte[] Decrypt (string algorithmOid, byte[] salt, int iterationCount, byte[] encryptedData) 
+		{
+			SymmetricAlgorithm sa = null;
+			byte[] result = null;
+			try {
+				sa = GetSymmetricAlgorithm (algorithmOid, salt, iterationCount);
+				ICryptoTransform ct = sa.CreateDecryptor ();
+				result = ct.TransformFinalBlock (encryptedData, 0, encryptedData.Length);
+			}
+			finally {
+				if (sa != null)
+					sa.Clear ();
+			}
+			return result;
+		}
+
+		public byte[] Decrypt (PKCS7.EncryptedData ed)
+		{
+			return Decrypt (ed.EncryptionAlgorithm.ContentType, 
+				ed.EncryptionAlgorithm.Content [0].Value, 
+				ASN1Convert.ToInt32 (ed.EncryptionAlgorithm.Content [1]),
+				ed.EncryptedContent);
+		}
+
+		public byte[] Encrypt (string algorithmOid, byte[] salt, int iterationCount, byte[] data) 
+		{
+			byte[] result = null;
+			using (SymmetricAlgorithm sa = GetSymmetricAlgorithm (algorithmOid, salt, iterationCount)) {
+				ICryptoTransform ct = sa.CreateEncryptor ();
+				result = ct.TransformFinalBlock (data, 0, data.Length);
+			}
+			return result;
+		}
+
+		private DSAParameters GetExistingParameters (out bool found)
+		{
+			foreach (X509Certificate cert in Certificates) {
+				// FIXME: that won't work if parts of the parameters are missing
+				if (cert.KeyAlgorithmParameters != null) {
+					DSA dsa = cert.DSA;
+					if (dsa != null) {
+						found = true;
+						return dsa.ExportParameters (false);
+					}
+				}
+			}
+			found = false;
+			return new DSAParameters ();
+		}
+
+		private void AddPrivateKey (PKCS8.PrivateKeyInfo pki) 
+		{
+			byte[] privateKey = pki.PrivateKey;
+			switch (privateKey [0]) {
+				case 0x02:
+					bool found;
+					DSAParameters p = GetExistingParameters (out found);
+					if (found) {
+						_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p));
+					}
+					break;
+				case 0x30:
+					_keyBags.Add (PKCS8.PrivateKeyInfo.DecodeRSA (privateKey));
+					break;
+				default:
+					Array.Clear (privateKey, 0, privateKey.Length);
+					throw new CryptographicException ("Unknown private key format");
+			}
+			Array.Clear (privateKey, 0, privateKey.Length);
+		}
+
+		private void ReadSafeBag (ASN1 safeBag) 
+		{
+			if (safeBag.Tag != 0x30)
+				throw new ArgumentException ("invalid safeBag");
+
+			ASN1 bagId = safeBag [0];
+			if (bagId.Tag != 0x06)
+				throw new ArgumentException ("invalid safeBag id");
+
+			ASN1 bagValue = safeBag [1];
+			string oid = ASN1Convert.ToOid (bagId);
+			switch (oid) {
+				case keyBag:
+					// NEED UNIT TEST
+					AddPrivateKey (new PKCS8.PrivateKeyInfo (bagValue.Value));
+					break;
+				case pkcs8ShroudedKeyBag:
+					PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
+					byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
+					AddPrivateKey (new PKCS8.PrivateKeyInfo (decrypted));
+					Array.Clear (decrypted, 0, decrypted.Length);
+					break;
+				case certBag:
+					PKCS7.ContentInfo cert = new PKCS7.ContentInfo (bagValue.Value);
+					if (cert.ContentType != x509Certificate)
+						throw new NotSupportedException ("unsupport certificate type");
+					X509Certificate x509 = new X509Certificate (cert.Content [0].Value);
+					_certs.Add (x509);
+					break;
+				case crlBag:
+					// TODO
+					break;
+				case secretBag: 
+					byte[] secret = bagValue.Value;
+					_secretBags.Add(secret);
+					break;
+				case safeContentsBag:
+					// TODO - ? recurse ?
+					break;
+				default:
+					throw new ArgumentException ("unknown safeBag oid");
+			}
+
+			if (safeBag.Count > 2) {
+				ASN1 bagAttributes = safeBag [2];
+				if (bagAttributes.Tag != 0x31)
+					throw new ArgumentException ("invalid safeBag attributes id");
+
+				for (int i = 0; i < bagAttributes.Count; i++) {
+					ASN1 pkcs12Attribute = bagAttributes[i];
+						
+					if (pkcs12Attribute.Tag != 0x30)
+						throw new ArgumentException ("invalid PKCS12 attributes id");
+
+					ASN1 attrId = pkcs12Attribute [0];
+					if (attrId.Tag != 0x06)
+						throw new ArgumentException ("invalid attribute id");
+						
+					string attrOid = ASN1Convert.ToOid (attrId);
+
+					ASN1 attrValues = pkcs12Attribute[1];
+					for (int j = 0; j < attrValues.Count; j++) {
+						ASN1 attrValue = attrValues[j];
+
+						switch (attrOid) {
+						case PKCS9.friendlyName:
+							if (attrValue.Tag != 0x1e)
+								throw new ArgumentException ("invalid attribute value id");
+							break;
+						case PKCS9.localKeyId:
+							if (attrValue.Tag != 0x04)
+								throw new ArgumentException ("invalid attribute value id");
+							break;
+						default:
+							// Unknown OID -- don't check Tag
+							break;
+						}
+					}
+				}
+			}
+
+			_safeBags.Add (new SafeBag(oid, safeBag));
+		}
+
+		private ASN1 Pkcs8ShroudedKeyBagSafeBag (AsymmetricAlgorithm aa, IDictionary attributes) 
+		{
+			PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo ();
+			if (aa is RSA) {
+				pki.Algorithm = "1.2.840.113549.1.1.1";
+				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((RSA)aa);
+			}
+			else if (aa is DSA) {
+				pki.Algorithm = null;
+				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((DSA)aa);
+			}
+			else
+				throw new CryptographicException ("Unknown asymmetric algorithm {0}", aa.ToString ());
+
+			PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo ();
+			epki.Algorithm = pbeWithSHAAnd3KeyTripleDESCBC;
+			epki.IterationCount = _iterations;
+			epki.EncryptedData = Encrypt (pbeWithSHAAnd3KeyTripleDESCBC, epki.Salt, _iterations, pki.GetBytes ());
+
+			ASN1 safeBag = new ASN1 (0x30);
+			safeBag.Add (ASN1Convert.FromOid (pkcs8ShroudedKeyBag));
+			ASN1 bagValue = new ASN1 (0xA0);
+			bagValue.Add (new ASN1 (epki.GetBytes ()));
+			safeBag.Add (bagValue);
+
+			if (attributes != null) {
+				ASN1 bagAttributes = new ASN1 (0x31);
+				IDictionaryEnumerator de = attributes.GetEnumerator ();
+
+				while (de.MoveNext ()) {
+					string oid = (string)de.Key;
+					switch (oid) {
+					case PKCS9.friendlyName:
+						ArrayList names = (ArrayList)de.Value;
+						if (names.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] name in names) {
+								ASN1 attrValue = new ASN1 (0x1e);
+								attrValue.Value = name;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					case PKCS9.localKeyId:
+						ArrayList keys = (ArrayList)de.Value;
+						if (keys.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] key in keys) {
+								ASN1 attrValue = new ASN1 (0x04);
+								attrValue.Value = key;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					default:
+						break;
+					}
+				}
+
+				if (bagAttributes.Count > 0) {
+					safeBag.Add (bagAttributes);
+				}
+			}
+
+			return safeBag;
+		}
+
+		private ASN1 KeyBagSafeBag (AsymmetricAlgorithm aa, IDictionary attributes) 
+		{
+			PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo ();
+			if (aa is RSA) {
+				pki.Algorithm = "1.2.840.113549.1.1.1";
+				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((RSA)aa);
+			}
+			else if (aa is DSA) {
+				pki.Algorithm = null;
+				pki.PrivateKey = PKCS8.PrivateKeyInfo.Encode ((DSA)aa);
+			}
+			else
+				throw new CryptographicException ("Unknown asymmetric algorithm {0}", aa.ToString ());
+
+			ASN1 safeBag = new ASN1 (0x30);
+			safeBag.Add (ASN1Convert.FromOid (keyBag));
+			ASN1 bagValue = new ASN1 (0xA0);
+			bagValue.Add (new ASN1 (pki.GetBytes ()));
+			safeBag.Add (bagValue);
+
+			if (attributes != null) {
+				ASN1 bagAttributes = new ASN1 (0x31);
+				IDictionaryEnumerator de = attributes.GetEnumerator ();
+
+				while (de.MoveNext ()) {
+					string oid = (string)de.Key;
+					switch (oid) {
+					case PKCS9.friendlyName:
+						ArrayList names = (ArrayList)de.Value;
+						if (names.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] name in names) {
+								ASN1 attrValue = new ASN1 (0x1e);
+								attrValue.Value = name;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					case PKCS9.localKeyId:
+						ArrayList keys = (ArrayList)de.Value;
+						if (keys.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] key in keys) {
+								ASN1 attrValue = new ASN1 (0x04);
+								attrValue.Value = key;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					default:
+						break;
+					}
+				}
+
+				if (bagAttributes.Count > 0) {
+					safeBag.Add (bagAttributes);
+				}
+			}
+
+			return safeBag;
+		}
+
+		private ASN1 SecretBagSafeBag (byte[] secret, IDictionary attributes) 
+		{
+			ASN1 safeBag = new ASN1 (0x30);
+			safeBag.Add (ASN1Convert.FromOid (secretBag));
+			ASN1 bagValue = new ASN1 (0x80, secret);
+			safeBag.Add (bagValue);
+
+			if (attributes != null) {
+				ASN1 bagAttributes = new ASN1 (0x31);
+				IDictionaryEnumerator de = attributes.GetEnumerator ();
+
+				while (de.MoveNext ()) {
+					string oid = (string)de.Key;
+					switch (oid) {
+					case PKCS9.friendlyName:
+						ArrayList names = (ArrayList)de.Value;
+						if (names.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] name in names) {
+								ASN1 attrValue = new ASN1 (0x1e);
+								attrValue.Value = name;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					case PKCS9.localKeyId:
+						ArrayList keys = (ArrayList)de.Value;
+						if (keys.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] key in keys) {
+								ASN1 attrValue = new ASN1 (0x04);
+								attrValue.Value = key;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					default:
+						break;
+					}
+				}
+
+				if (bagAttributes.Count > 0) {
+					safeBag.Add (bagAttributes);
+				}
+			}
+
+			return safeBag;
+		}
+
+		private ASN1 CertificateSafeBag (X509Certificate x509, IDictionary attributes) 
+		{
+			ASN1 encapsulatedCertificate = new ASN1 (0x04, x509.RawData);
+
+			PKCS7.ContentInfo ci = new PKCS7.ContentInfo ();
+			ci.ContentType = x509Certificate;
+			ci.Content.Add (encapsulatedCertificate);
+
+			ASN1 bagValue = new ASN1 (0xA0);
+			bagValue.Add (ci.ASN1);
+
+			ASN1 safeBag = new ASN1 (0x30);
+			safeBag.Add (ASN1Convert.FromOid (certBag));
+			safeBag.Add (bagValue);
+
+			if (attributes != null) {
+				ASN1 bagAttributes = new ASN1 (0x31);
+				IDictionaryEnumerator de = attributes.GetEnumerator ();
+
+				while (de.MoveNext ()) {
+					string oid = (string)de.Key;
+					switch (oid) {
+					case PKCS9.friendlyName:
+						ArrayList names = (ArrayList)de.Value;
+						if (names.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.friendlyName));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] name in names) {
+								ASN1 attrValue = new ASN1 (0x1e);
+								attrValue.Value = name;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					case PKCS9.localKeyId:
+						ArrayList keys = (ArrayList)de.Value;
+						if (keys.Count > 0) {
+							ASN1 pkcs12Attribute = new ASN1 (0x30);
+							pkcs12Attribute.Add (ASN1Convert.FromOid (PKCS9.localKeyId));
+							ASN1 attrValues = new ASN1 (0x31);
+							foreach (byte[] key in keys) {
+								ASN1 attrValue = new ASN1 (0x04);
+								attrValue.Value = key;
+								attrValues.Add (attrValue);
+							}
+							pkcs12Attribute.Add (attrValues);
+							bagAttributes.Add (pkcs12Attribute);
+						}
+						break;
+					default:
+						break;
+					}
+				}
+
+				if (bagAttributes.Count > 0) {
+					safeBag.Add (bagAttributes);
+				}
+			}
+
+			return safeBag;
+		}
+
+		private byte[] MAC (byte[] password, byte[] salt, int iterations, byte[] data) 
+		{
+			PKCS12.DeriveBytes pd = new PKCS12.DeriveBytes ();
+			pd.HashName = "SHA1";
+			pd.Password = password;
+			pd.Salt = salt;
+			pd.IterationCount = iterations;
+
+			HMACSHA1 hmac = (HMACSHA1) HMACSHA1.Create ();
+			hmac.Key = pd.DeriveMAC (20);
+			return hmac.ComputeHash (data, 0, data.Length);
+		}
+
+		/*
+		 * SafeContents ::= SEQUENCE OF SafeBag
+		 * 
+		 * SafeBag ::= SEQUENCE {
+		 *	bagId BAG-TYPE.&id ({PKCS12BagSet}),
+		 *	bagValue [0] EXPLICIT BAG-TYPE.&Type({PKCS12BagSet}{@bagId}),
+		 *	bagAttributes SET OF PKCS12Attribute OPTIONAL
+		 * }
+		 */
+		public byte[] GetBytes () 
+		{
+			// TODO (incomplete)
+			ASN1 safeBagSequence = new ASN1 (0x30);
+
+			// Sync Safe Bag list since X509CertificateCollection may be updated
+			ArrayList scs = new ArrayList ();
+			foreach (SafeBag sb in _safeBags) {
+				if (sb.BagOID.Equals (certBag)) {
+					ASN1 safeBag = sb.ASN1;
+					ASN1 bagValue = safeBag [1];
+					PKCS7.ContentInfo cert = new PKCS7.ContentInfo (bagValue.Value);
+					scs.Add (new X509Certificate (cert.Content [0].Value));
+				}
+			}
+
+			ArrayList addcerts = new ArrayList ();
+			ArrayList removecerts = new ArrayList ();
+
+			foreach (X509Certificate c in Certificates) {
+				bool found = false;
+
+				foreach (X509Certificate lc in scs) {
+					if (Compare (c.RawData, lc.RawData)) {
+						found = true;
+					}
+				}
+
+				if (!found) {
+					addcerts.Add (c);
+				}
+			}
+			foreach (X509Certificate c in scs) {
+				bool found = false;
+
+				foreach (X509Certificate lc in Certificates) {
+					if (Compare (c.RawData, lc.RawData)) {
+						found = true;
+					}
+				}
+
+				if (!found) {
+					removecerts.Add (c);
+				}
+			}
+
+			foreach (X509Certificate c in removecerts) {
+				RemoveCertificate (c);
+			}
+
+			foreach (X509Certificate c in addcerts) {
+				AddCertificate (c);
+			}
+			// Sync done
+
+			if (_safeBags.Count > 0) {
+				ASN1 certsSafeBag = new ASN1 (0x30);
+				foreach (SafeBag sb in _safeBags) {
+					if (sb.BagOID.Equals (certBag)) {
+						certsSafeBag.Add (sb.ASN1);
+					}
+				}
+
+				if (certsSafeBag.Count > 0) {
+					PKCS7.ContentInfo contentInfo = EncryptedContentInfo (certsSafeBag, pbeWithSHAAnd3KeyTripleDESCBC);
+					safeBagSequence.Add (contentInfo.ASN1);
+				}
+			}
+
+			if (_safeBags.Count > 0) {
+				ASN1 safeContents = new ASN1 (0x30);
+				foreach (SafeBag sb in _safeBags) {
+					if (sb.BagOID.Equals (keyBag) ||
+					    sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+						safeContents.Add (sb.ASN1);
+					}
+				}
+				if (safeContents.Count > 0) {
+					ASN1 content = new ASN1 (0xA0);
+					content.Add (new ASN1 (0x04, safeContents.GetBytes ()));
+				
+					PKCS7.ContentInfo keyBag = new PKCS7.ContentInfo (PKCS7.Oid.data);
+					keyBag.Content = content;
+					safeBagSequence.Add (keyBag.ASN1);
+				}
+			}
+
+			// Doing SecretBags separately in case we want to change their encryption independently.
+			if (_safeBags.Count > 0) {
+				ASN1 secretsSafeBag = new ASN1 (0x30);
+				foreach (SafeBag sb in _safeBags) {
+					if (sb.BagOID.Equals (secretBag)) {
+						secretsSafeBag.Add (sb.ASN1);
+					}
+				}
+
+				if (secretsSafeBag.Count > 0) {
+					PKCS7.ContentInfo contentInfo = EncryptedContentInfo (secretsSafeBag, pbeWithSHAAnd3KeyTripleDESCBC);
+					safeBagSequence.Add (contentInfo.ASN1);
+				}
+			}
+
+
+			ASN1 encapsulates = new ASN1 (0x04, safeBagSequence.GetBytes ());
+			ASN1 ci = new ASN1 (0xA0);
+			ci.Add (encapsulates);
+			PKCS7.ContentInfo authSafe = new PKCS7.ContentInfo (PKCS7.Oid.data);
+			authSafe.Content = ci;
+			
+			ASN1 macData = new ASN1 (0x30);
+			if (_password != null) {
+				// only for password based encryption
+				byte[] salt = new byte [20];
+				RNG.GetBytes (salt);
+				byte[] macValue = MAC (_password, salt, _iterations, authSafe.Content [0].Value);
+				ASN1 oidSeq = new ASN1 (0x30);
+				oidSeq.Add (ASN1Convert.FromOid ("1.3.14.3.2.26"));	// SHA1
+				oidSeq.Add (new ASN1 (0x05));
+
+				ASN1 mac = new ASN1 (0x30);
+				mac.Add (oidSeq);
+				mac.Add (new ASN1 (0x04, macValue));
+
+				macData.Add (mac);
+				macData.Add (new ASN1 (0x04, salt));
+				macData.Add (ASN1Convert.FromInt32 (_iterations));
+			}
+			
+			ASN1 version = new ASN1 (0x02, new byte [1] { 0x03 });
+			
+			ASN1 pfx = new ASN1 (0x30);
+			pfx.Add (version);
+			pfx.Add (authSafe.ASN1);
+			if (macData.Count > 0) {
+				// only for password based encryption
+				pfx.Add (macData);
+			}
+
+			return pfx.GetBytes ();
+		}
+
+		// Creates an encrypted PKCS#7 ContentInfo with safeBags as its SafeContents.  Used in GetBytes(), above.
+		private PKCS7.ContentInfo EncryptedContentInfo(ASN1 safeBags, string algorithmOid)
+		{
+			byte[] salt = new byte [8];
+			RNG.GetBytes (salt);
+
+			ASN1 seqParams = new ASN1 (0x30);
+			seqParams.Add (new ASN1 (0x04, salt));
+			seqParams.Add (ASN1Convert.FromInt32 (_iterations));
+
+			ASN1 seqPbe = new ASN1 (0x30);
+			seqPbe.Add (ASN1Convert.FromOid (algorithmOid));
+			seqPbe.Add (seqParams);
+
+			byte[] encrypted = Encrypt (algorithmOid, salt, _iterations, safeBags.GetBytes ());
+			ASN1 encryptedContent = new ASN1 (0x80, encrypted);
+
+			ASN1 seq = new ASN1 (0x30);
+			seq.Add (ASN1Convert.FromOid (PKCS7.Oid.data));
+			seq.Add (seqPbe);
+			seq.Add (encryptedContent);
+
+			ASN1 version = new ASN1 (0x02, new byte [1] { 0x00 });
+			ASN1 encData = new ASN1 (0x30);
+			encData.Add (version);
+			encData.Add (seq);
+
+			ASN1 finalContent = new ASN1 (0xA0);
+			finalContent.Add (encData);
+
+			PKCS7.ContentInfo bag = new PKCS7.ContentInfo (PKCS7.Oid.encryptedData);
+			bag.Content = finalContent;
+			return bag;
+		}
+
+		public void AddCertificate (X509Certificate cert)
+		{
+			AddCertificate (cert, null);
+		}
+
+		public void AddCertificate (X509Certificate cert, IDictionary attributes)
+		{
+			bool found = false;
+
+			for (int i = 0; !found && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (certBag)) {
+					ASN1 safeBag = sb.ASN1;
+					ASN1 bagValue = safeBag [1];
+					PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
+					X509Certificate c = new X509Certificate (crt.Content [0].Value);
+					if (Compare (cert.RawData, c.RawData)) {
+						found = true;
+					}
+				}
+			}
+
+			if (!found) {
+				_safeBags.Add (new SafeBag (certBag, CertificateSafeBag (cert, attributes)));
+				_certsChanged = true;
+			}
+		}
+
+		public void RemoveCertificate (X509Certificate cert)
+		{
+			RemoveCertificate (cert, null);
+		}
+
+		public void RemoveCertificate (X509Certificate cert, IDictionary attrs)
+		{
+			int certIndex = -1;
+
+			for (int i = 0; certIndex == -1 && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (certBag)) {
+					ASN1 safeBag = sb.ASN1;
+					ASN1 bagValue = safeBag [1];
+					PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
+					X509Certificate c = new X509Certificate (crt.Content [0].Value);
+					if (Compare (cert.RawData, c.RawData)) {
+						if (attrs != null) {
+							if (safeBag.Count == 3) {
+								ASN1 bagAttributes = safeBag [2];
+								int bagAttributesFound = 0;
+								for (int j = 0; j < bagAttributes.Count; j++) {
+									ASN1 pkcs12Attribute = bagAttributes [j];
+									ASN1 attrId = pkcs12Attribute [0];
+									string ao = ASN1Convert.ToOid (attrId);
+									ArrayList dattrValues = (ArrayList)attrs [ao];
+
+									if (dattrValues != null) {
+										ASN1 attrValues = pkcs12Attribute [1];
+
+										if (dattrValues.Count == attrValues.Count) {
+											int attrValuesFound = 0;
+											for (int k = 0; k < attrValues.Count; k++) {
+												ASN1 attrValue = attrValues [k];
+												byte[] value = (byte[])dattrValues [k];
+									
+												if (Compare (value, attrValue.Value)) {
+													attrValuesFound += 1;
+												}
+											}
+											if (attrValuesFound == attrValues.Count) {
+												bagAttributesFound += 1;
+											}
+										}
+									}
+								}
+								if (bagAttributesFound == bagAttributes.Count) {
+									certIndex = i;
+								}
+							}
+						} else {
+							certIndex = i;
+						}
+					}
+				}
+			}
+
+			if (certIndex != -1) {
+				_safeBags.RemoveAt (certIndex);
+				_certsChanged = true;
+			}
+		}
+
+		private bool CompareAsymmetricAlgorithm (AsymmetricAlgorithm a1, AsymmetricAlgorithm a2)
+		{
+			// fast path
+			if (a1.KeySize != a2.KeySize)
+				return false;
+			// compare public keys - if they match we can assume the private match too
+			return (a1.ToXmlString (false) == a2.ToXmlString (false));
+		}
+
+		public void AddPkcs8ShroudedKeyBag (AsymmetricAlgorithm aa)
+		{
+			AddPkcs8ShroudedKeyBag (aa, null);
+		}
+
+		public void AddPkcs8ShroudedKeyBag (AsymmetricAlgorithm aa, IDictionary attributes)
+		{
+			bool found = false;
+
+			for (int i = 0; !found && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+					ASN1 bagValue = sb.ASN1 [1];
+					PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
+					byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
+					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
+					byte[] privateKey = pki.PrivateKey;
+
+					AsymmetricAlgorithm saa = null;
+					switch (privateKey [0]) {
+					case 0x02:
+						DSAParameters p = new DSAParameters (); // FIXME
+						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+						break;
+					case 0x30:
+						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+						break;
+					default:
+						Array.Clear (decrypted, 0, decrypted.Length);
+						Array.Clear (privateKey, 0, privateKey.Length);
+						throw new CryptographicException ("Unknown private key format");
+					}
+
+					Array.Clear (decrypted, 0, decrypted.Length);
+					Array.Clear (privateKey, 0, privateKey.Length);
+
+					if (CompareAsymmetricAlgorithm (aa , saa)) {
+						found = true;
+					}
+				}
+			}
+
+			if (!found) {
+				_safeBags.Add (new SafeBag (pkcs8ShroudedKeyBag, Pkcs8ShroudedKeyBagSafeBag (aa, attributes)));
+				_keyBagsChanged = true;
+			}
+		}
+
+		public void RemovePkcs8ShroudedKeyBag (AsymmetricAlgorithm aa)
+		{
+			int aaIndex = -1;
+
+			for (int i = 0; aaIndex == -1 && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+					ASN1 bagValue = sb.ASN1 [1];
+					PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
+					byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
+					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
+					byte[] privateKey = pki.PrivateKey;
+
+					AsymmetricAlgorithm saa = null;
+					switch (privateKey [0]) {
+					case 0x02:
+						DSAParameters p = new DSAParameters (); // FIXME
+						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+						break;
+					case 0x30:
+						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+						break;
+					default:
+						Array.Clear (decrypted, 0, decrypted.Length);
+						Array.Clear (privateKey, 0, privateKey.Length);
+						throw new CryptographicException ("Unknown private key format");
+					}
+
+					Array.Clear (decrypted, 0, decrypted.Length);
+					Array.Clear (privateKey, 0, privateKey.Length);
+
+					if (CompareAsymmetricAlgorithm (aa, saa)) {
+						aaIndex = i;
+					}
+				}
+			}
+
+			if (aaIndex != -1) {
+				_safeBags.RemoveAt (aaIndex);
+				_keyBagsChanged = true;
+			}
+		}
+
+		public void AddKeyBag (AsymmetricAlgorithm aa)
+		{
+			AddKeyBag (aa, null);
+		}
+
+		public void AddKeyBag (AsymmetricAlgorithm aa, IDictionary attributes)
+		{
+			bool found = false;
+
+			for (int i = 0; !found && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (keyBag)) {
+					ASN1 bagValue = sb.ASN1 [1];
+					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
+					byte[] privateKey = pki.PrivateKey;
+
+					AsymmetricAlgorithm saa = null;
+					switch (privateKey [0]) {
+					case 0x02:
+						DSAParameters p = new DSAParameters (); // FIXME
+						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+						break;
+					case 0x30:
+						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+						break;
+					default:
+						Array.Clear (privateKey, 0, privateKey.Length);
+						throw new CryptographicException ("Unknown private key format");
+					}
+
+					Array.Clear (privateKey, 0, privateKey.Length);
+
+					if (CompareAsymmetricAlgorithm (aa, saa)) {
+						found = true;
+					}
+				}
+			}
+
+			if (!found) {
+				_safeBags.Add (new SafeBag (keyBag, KeyBagSafeBag (aa, attributes)));
+				_keyBagsChanged = true;
+			}
+		}
+
+		public void RemoveKeyBag (AsymmetricAlgorithm aa)
+		{
+			int aaIndex = -1;
+
+			for (int i = 0; aaIndex == -1 && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (keyBag)) {
+					ASN1 bagValue = sb.ASN1 [1];
+					PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
+					byte[] privateKey = pki.PrivateKey;
+
+					AsymmetricAlgorithm saa = null;
+					switch (privateKey [0]) {
+					case 0x02:
+						DSAParameters p = new DSAParameters (); // FIXME
+						saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+						break;
+					case 0x30:
+						saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+						break;
+					default:
+						Array.Clear (privateKey, 0, privateKey.Length);
+						throw new CryptographicException ("Unknown private key format");
+					}
+
+					Array.Clear (privateKey, 0, privateKey.Length);
+
+					if (CompareAsymmetricAlgorithm (aa, saa)) {
+						aaIndex = i;
+					}
+				}
+			}
+
+			if (aaIndex != -1) {
+				_safeBags.RemoveAt (aaIndex);
+				_keyBagsChanged = true;
+			}
+		}
+
+		public void AddSecretBag (byte[] secret)
+		{
+			AddSecretBag (secret, null);
+		}
+
+		public void AddSecretBag (byte[] secret, IDictionary attributes)
+		{
+			bool found = false;
+
+			for (int i = 0; !found && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (secretBag)) {
+					ASN1 bagValue = sb.ASN1 [1];
+					byte[] ssecret = bagValue.Value;
+
+					if (Compare (secret, ssecret)) {
+						found = true;
+					}
+				}
+			}
+
+			if (!found) {
+				_safeBags.Add (new SafeBag (secretBag, SecretBagSafeBag (secret, attributes)));
+				_secretBagsChanged = true;
+			}
+		}
+
+		public void RemoveSecretBag (byte[] secret)
+		{
+			int sIndex = -1;
+
+			for (int i = 0; sIndex == -1 && i < _safeBags.Count; i++) {
+				SafeBag sb = (SafeBag)_safeBags [i];
+
+				if (sb.BagOID.Equals (secretBag)) {
+					ASN1 bagValue = sb.ASN1 [1];
+					byte[] ssecret = bagValue.Value;
+
+					if (Compare (secret, ssecret)) {
+						sIndex = i;
+					}
+				}
+			}
+
+			if (sIndex != -1) {
+				_safeBags.RemoveAt (sIndex);
+				_secretBagsChanged = true;
+			}
+		}
+
+		public AsymmetricAlgorithm GetAsymmetricAlgorithm (IDictionary attrs)
+		{
+			foreach (SafeBag sb in _safeBags) {
+				if (sb.BagOID.Equals (keyBag) || sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+					ASN1 safeBag = sb.ASN1;
+
+					if (safeBag.Count == 3) {
+						ASN1 bagAttributes = safeBag [2];
+
+						int bagAttributesFound = 0;
+						for (int i = 0; i < bagAttributes.Count; i++) {
+							ASN1 pkcs12Attribute = bagAttributes [i];
+							ASN1 attrId = pkcs12Attribute [0];
+							string ao = ASN1Convert.ToOid (attrId);
+							ArrayList dattrValues = (ArrayList)attrs [ao];
+
+							if (dattrValues != null) {
+								ASN1 attrValues = pkcs12Attribute [1];
+
+								if (dattrValues.Count == attrValues.Count) {
+									int attrValuesFound = 0;
+									for (int j = 0; j < attrValues.Count; j++) {
+										ASN1 attrValue = attrValues [j];
+										byte[] value = (byte[])dattrValues [j];
+									
+										if (Compare (value, attrValue.Value)) {
+											attrValuesFound += 1;
+										}
+									}
+									if (attrValuesFound == attrValues.Count) {
+										bagAttributesFound += 1;
+									}
+								}
+							}
+						}
+						if (bagAttributesFound == bagAttributes.Count) {
+							ASN1 bagValue = safeBag [1];
+							AsymmetricAlgorithm aa = null;
+							if (sb.BagOID.Equals (keyBag)) {
+								PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
+								byte[] privateKey = pki.PrivateKey;
+								switch (privateKey [0]) {
+								case 0x02:
+									DSAParameters p = new DSAParameters (); // FIXME
+									aa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+									break;
+								case 0x30:
+									aa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+									break;
+								default:
+									break;
+								}
+								Array.Clear (privateKey, 0, privateKey.Length);
+							} else if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+								PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
+								byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
+								PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
+								byte[] privateKey = pki.PrivateKey;
+								switch (privateKey [0]) {
+								case 0x02:
+									DSAParameters p = new DSAParameters (); // FIXME
+									aa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+									break;
+								case 0x30:
+									aa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+									break;
+								default:
+									break;
+								}
+								Array.Clear (privateKey, 0, privateKey.Length);
+								Array.Clear (decrypted, 0, decrypted.Length);
+							}
+							return aa;
+						}
+					}
+				}
+			}
+
+			return null;
+		}
+
+		public byte[] GetSecret (IDictionary attrs)
+		{
+			foreach (SafeBag sb in _safeBags) {
+				if (sb.BagOID.Equals (secretBag)) {
+					ASN1 safeBag = sb.ASN1;
+
+					if (safeBag.Count == 3) {
+						ASN1 bagAttributes = safeBag [2];
+
+						int bagAttributesFound = 0;
+						for (int i = 0; i < bagAttributes.Count; i++) {
+							ASN1 pkcs12Attribute = bagAttributes [i];
+							ASN1 attrId = pkcs12Attribute [0];
+							string ao = ASN1Convert.ToOid (attrId);
+							ArrayList dattrValues = (ArrayList)attrs [ao];
+
+							if (dattrValues != null) {
+								ASN1 attrValues = pkcs12Attribute [1];
+
+								if (dattrValues.Count == attrValues.Count) {
+									int attrValuesFound = 0;
+									for (int j = 0; j < attrValues.Count; j++) {
+										ASN1 attrValue = attrValues [j];
+										byte[] value = (byte[])dattrValues [j];
+									
+										if (Compare (value, attrValue.Value)) {
+											attrValuesFound += 1;
+										}
+									}
+									if (attrValuesFound == attrValues.Count) {
+										bagAttributesFound += 1;
+									}
+								}
+							}
+						}
+						if (bagAttributesFound == bagAttributes.Count) {
+							ASN1 bagValue = safeBag [1];
+							return bagValue.Value;
+						}
+					}
+				}
+			}
+
+			return null;
+		}
+
+		public X509Certificate GetCertificate (IDictionary attrs)
+		{
+			foreach (SafeBag sb in _safeBags) {
+				if (sb.BagOID.Equals (certBag)) {
+					ASN1 safeBag = sb.ASN1;
+
+					if (safeBag.Count == 3) {
+						ASN1 bagAttributes = safeBag [2];
+
+						int bagAttributesFound = 0;
+						for (int i = 0; i < bagAttributes.Count; i++) {
+							ASN1 pkcs12Attribute = bagAttributes [i];
+							ASN1 attrId = pkcs12Attribute [0];
+							string ao = ASN1Convert.ToOid (attrId);
+							ArrayList dattrValues = (ArrayList)attrs [ao];
+
+							if (dattrValues != null) {
+								ASN1 attrValues = pkcs12Attribute [1];
+								
+								if (dattrValues.Count == attrValues.Count) {
+									int attrValuesFound = 0;
+									for (int j = 0; j < attrValues.Count; j++) {
+										ASN1 attrValue = attrValues [j];
+										byte[] value = (byte[])dattrValues [j];
+									
+										if (Compare (value, attrValue.Value)) {
+											attrValuesFound += 1;
+										}
+									}
+									if (attrValuesFound == attrValues.Count) {
+										bagAttributesFound += 1;
+									}
+								}
+							}
+						}
+						if (bagAttributesFound == bagAttributes.Count) {
+							ASN1 bagValue = safeBag [1];
+							PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
+							return new X509Certificate (crt.Content [0].Value);
+						}
+					}
+				}
+			}
+
+			return null;
+		}
+
+		public IDictionary GetAttributes (AsymmetricAlgorithm aa)
+		{
+			IDictionary result = new Hashtable ();
+
+			foreach (SafeBag sb in _safeBags) {
+				if (sb.BagOID.Equals (keyBag) || sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+					ASN1 safeBag = sb.ASN1;
+
+					ASN1 bagValue = safeBag [1];
+					AsymmetricAlgorithm saa = null;
+					if (sb.BagOID.Equals (keyBag)) {
+						PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (bagValue.Value);
+						byte[] privateKey = pki.PrivateKey;
+						switch (privateKey [0]) {
+						case 0x02:
+							DSAParameters p = new DSAParameters (); // FIXME
+							saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+							break;
+						case 0x30:
+							saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+							break;
+						default:
+							break;
+						}
+						Array.Clear (privateKey, 0, privateKey.Length);
+					} else if (sb.BagOID.Equals (pkcs8ShroudedKeyBag)) {
+						PKCS8.EncryptedPrivateKeyInfo epki = new PKCS8.EncryptedPrivateKeyInfo (bagValue.Value);
+						byte[] decrypted = Decrypt (epki.Algorithm, epki.Salt, epki.IterationCount, epki.EncryptedData);
+						PKCS8.PrivateKeyInfo pki = new PKCS8.PrivateKeyInfo (decrypted);
+						byte[] privateKey = pki.PrivateKey;
+						switch (privateKey [0]) {
+						case 0x02:
+							DSAParameters p = new DSAParameters (); // FIXME
+							saa = PKCS8.PrivateKeyInfo.DecodeDSA (privateKey, p);
+							break;
+						case 0x30:
+							saa = PKCS8.PrivateKeyInfo.DecodeRSA (privateKey);
+							break;
+						default:
+							break;
+						}
+						Array.Clear (privateKey, 0, privateKey.Length);
+						Array.Clear (decrypted, 0, decrypted.Length);
+					}
+
+					if (saa != null && CompareAsymmetricAlgorithm (saa, aa)) {
+						if (safeBag.Count == 3) {
+							ASN1 bagAttributes = safeBag [2];
+							
+							for (int i = 0; i < bagAttributes.Count; i++) {
+								ASN1 pkcs12Attribute = bagAttributes [i];
+								ASN1 attrId = pkcs12Attribute [0];
+								string aOid = ASN1Convert.ToOid (attrId);
+								ArrayList aValues = new ArrayList ();
+
+								ASN1 attrValues = pkcs12Attribute [1];
+									
+								for (int j = 0; j < attrValues.Count; j++) {
+									ASN1 attrValue = attrValues [j];
+									aValues.Add (attrValue.Value);
+								}
+								result.Add (aOid, aValues);
+							}
+						}
+					}
+				}
+			}
+
+			return result;
+		}
+
+		public IDictionary GetAttributes (X509Certificate cert)
+		{
+			IDictionary result = new Hashtable ();
+
+			foreach (SafeBag sb in _safeBags) {
+				if (sb.BagOID.Equals (certBag)) {
+					ASN1 safeBag = sb.ASN1;
+					ASN1 bagValue = safeBag [1];
+					PKCS7.ContentInfo crt = new PKCS7.ContentInfo (bagValue.Value);
+					X509Certificate xc = new X509Certificate (crt.Content [0].Value);
+
+					if (Compare (cert.RawData, xc.RawData)) {
+						if (safeBag.Count == 3) {
+							ASN1 bagAttributes = safeBag [2];
+
+							for (int i = 0; i < bagAttributes.Count; i++) {
+								ASN1 pkcs12Attribute = bagAttributes [i];
+								ASN1 attrId = pkcs12Attribute [0];
+
+								string aOid = ASN1Convert.ToOid (attrId);
+								ArrayList aValues = new ArrayList ();
+
+								ASN1 attrValues = pkcs12Attribute [1];
+									
+								for (int j = 0; j < attrValues.Count; j++) {
+									ASN1 attrValue = attrValues [j];
+									aValues.Add (attrValue.Value);
+								}
+								result.Add (aOid, aValues);
+							}
+						}
+					}
+				}
+			}
+
+			return result;
+		}
+
+		public void SaveToFile (string filename)
+		{
+			if (filename == null)
+				throw new ArgumentNullException ("filename");
+
+			using (FileStream fs = File.Create (filename)) {
+				byte[] data = GetBytes ();
+				fs.Write (data, 0, data.Length);
+			}
+		}
+
+		public object Clone ()
+		{
+			PKCS12 clone = null;
+			if (_password != null) {
+				clone = new PKCS12 (GetBytes (), Encoding.BigEndianUnicode.GetString (_password));
+			} else {
+				clone = new PKCS12 (GetBytes ());
+			}
+			clone.IterationCount = this.IterationCount;
+
+			return clone;
+		}
+
+		// static
+
+		public const int CryptoApiPasswordLimit = 32;
+		
+		static private int password_max_length = Int32.MaxValue;
+
+		// static properties
+		
+		// MS CryptoAPI limits the password to a maximum of 31 characters
+		// other implementations, like OpenSSL, have no such limitation.
+		// Setting a maximum value will truncate the password length to 
+		// ensure compatibility with MS's PFXImportCertStore API.
+		static public int MaximumPasswordLength {
+			get { return password_max_length; }
+			set {
+				if (value < CryptoApiPasswordLimit) {
+					string msg = string.Format ("Maximum password length cannot be less than {0}.", CryptoApiPasswordLimit);
+					throw new ArgumentOutOfRangeException (msg);
+				}
+				password_max_length = value;
+			}
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS7.cs b/MediaBrowser.Server.Startup.Common/Security/PKCS7.cs
new file mode 100644
index 000000000..1b1a3295b
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/PKCS7.cs
@@ -0,0 +1,1012 @@
+//
+// PKCS7.cs: PKCS #7 - Cryptographic Message Syntax Standard 
+//	http://www.rsasecurity.com/rsalabs/pkcs/pkcs-7/index.html
+//
+// Authors:
+//	Sebastien Pouliot <sebastien@ximian.com>
+//	Daniel Granath <dgranath#gmail.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.Security.Cryptography;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    public sealed class PKCS7 {
+
+		public class Oid {
+			// pkcs 1
+			public const string rsaEncryption = "1.2.840.113549.1.1.1";
+			// pkcs 7
+			public const string data = "1.2.840.113549.1.7.1";
+			public const string signedData = "1.2.840.113549.1.7.2";
+			public const string envelopedData = "1.2.840.113549.1.7.3";
+			public const string signedAndEnvelopedData = "1.2.840.113549.1.7.4";
+			public const string digestedData = "1.2.840.113549.1.7.5";
+			public const string encryptedData = "1.2.840.113549.1.7.6";
+			// pkcs 9
+			public const string contentType = "1.2.840.113549.1.9.3";
+			public const string messageDigest  = "1.2.840.113549.1.9.4";
+			public const string signingTime = "1.2.840.113549.1.9.5";
+			public const string countersignature = "1.2.840.113549.1.9.6";
+
+			public Oid () 
+			{
+			}
+		}
+
+		private PKCS7 ()
+		{
+		}
+
+		static public ASN1 Attribute (string oid, ASN1 value) 
+		{
+			ASN1 attr = new ASN1 (0x30);
+			attr.Add (ASN1Convert.FromOid (oid));
+			ASN1 aset = attr.Add (new ASN1 (0x31));
+			aset.Add (value);
+			return attr;
+		}
+
+		static public ASN1 AlgorithmIdentifier (string oid)
+		{
+			ASN1 ai = new ASN1 (0x30);
+			ai.Add (ASN1Convert.FromOid (oid));
+			ai.Add (new ASN1 (0x05));	// NULL
+			return ai;
+		}
+
+		static public ASN1 AlgorithmIdentifier (string oid, ASN1 parameters) 
+		{
+			ASN1 ai = new ASN1 (0x30);
+			ai.Add (ASN1Convert.FromOid (oid));
+			ai.Add (parameters);
+			return ai;
+		}
+
+		/*
+		 * IssuerAndSerialNumber ::= SEQUENCE {
+		 *	issuer Name,
+		 *	serialNumber CertificateSerialNumber 
+		 * }
+		 */
+		static public ASN1 IssuerAndSerialNumber (X509Certificate x509) 
+		{
+			ASN1 issuer = null;
+			ASN1 serial = null;
+			ASN1 cert = new ASN1 (x509.RawData);
+			int tbs = 0;
+			bool flag = false;
+			while (tbs < cert[0].Count) {
+				ASN1 e = cert[0][tbs++];
+				if (e.Tag == 0x02)
+					serial = e;
+				else if (e.Tag == 0x30) {
+					if (flag) {
+						issuer = e;
+						break;
+					}
+					flag = true;
+				}
+			}
+			ASN1 iasn = new ASN1 (0x30);
+			iasn.Add (issuer);
+			iasn.Add (serial);
+			return iasn;
+		}
+
+		/*
+		 * ContentInfo ::= SEQUENCE {
+		 *	contentType ContentType,
+		 *	content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL 
+		 * }
+		 * ContentType ::= OBJECT IDENTIFIER
+		 */
+		public class ContentInfo {
+
+			private string contentType;
+			private ASN1 content;
+
+			public ContentInfo () 
+			{
+				content = new ASN1 (0xA0);
+			}
+
+			public ContentInfo (string oid) : this ()
+			{
+				contentType = oid;
+			}
+
+			public ContentInfo (byte[] data) 
+				: this (new ASN1 (data)) {}
+
+			public ContentInfo (ASN1 asn1) 
+			{
+				// SEQUENCE with 1 or 2 elements
+				if ((asn1.Tag != 0x30) || ((asn1.Count < 1) && (asn1.Count > 2)))
+					throw new ArgumentException ("Invalid ASN1");
+				if (asn1[0].Tag != 0x06)
+					throw new ArgumentException ("Invalid contentType");
+				contentType = ASN1Convert.ToOid (asn1[0]);
+				if (asn1.Count > 1) {
+					if (asn1[1].Tag != 0xA0)
+						throw new ArgumentException ("Invalid content");
+					content = asn1[1];
+				}
+			}
+
+			public ASN1 ASN1 {
+				get { return GetASN1(); }
+			}
+
+			public ASN1 Content {
+				get { return content; }
+				set { content = value; }
+			}
+
+			public string ContentType {
+				get { return contentType; }
+				set { contentType = value; }
+			}
+
+			internal ASN1 GetASN1 () 
+			{
+				// ContentInfo ::= SEQUENCE {
+				ASN1 contentInfo = new ASN1 (0x30);
+				// contentType ContentType, -> ContentType ::= OBJECT IDENTIFIER
+				contentInfo.Add (ASN1Convert.FromOid (contentType));
+				// content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL 
+				if ((content != null) && (content.Count > 0))
+					contentInfo.Add (content);
+				return contentInfo;
+			}
+
+			public byte[] GetBytes () 
+			{
+				return GetASN1 ().GetBytes ();
+			}
+		}
+
+		/*
+		 * EncryptedData ::= SEQUENCE {
+		 *	version		INTEGER {edVer0(0)} (edVer0),
+		 *	 encryptedContentInfo  EncryptedContentInfo
+		 * }
+		 */
+		public class EncryptedData {
+			private byte _version;
+			private ContentInfo _content;
+			private ContentInfo _encryptionAlgorithm;
+			private byte[] _encrypted;
+
+			public EncryptedData () 
+			{
+				_version = 0;
+			}
+
+			public EncryptedData (byte[] data) 
+				: this (new ASN1 (data))
+			{
+			}
+
+			public EncryptedData (ASN1 asn1) : this () 
+			{
+				if ((asn1.Tag != 0x30) || (asn1.Count < 2))
+					throw new ArgumentException ("Invalid EncryptedData");
+
+				if (asn1 [0].Tag != 0x02)
+					throw new ArgumentException ("Invalid version");
+				_version = asn1 [0].Value [0];
+
+				ASN1 encryptedContentInfo = asn1 [1];
+				if (encryptedContentInfo.Tag != 0x30)
+					throw new ArgumentException ("missing EncryptedContentInfo");
+
+				ASN1 contentType = encryptedContentInfo [0];
+				if (contentType.Tag != 0x06)
+					throw new ArgumentException ("missing EncryptedContentInfo.ContentType");
+				_content = new ContentInfo (ASN1Convert.ToOid (contentType));
+
+				ASN1 contentEncryptionAlgorithm = encryptedContentInfo [1];
+				if (contentEncryptionAlgorithm.Tag != 0x30)
+					throw new ArgumentException ("missing EncryptedContentInfo.ContentEncryptionAlgorithmIdentifier");
+				_encryptionAlgorithm = new ContentInfo (ASN1Convert.ToOid (contentEncryptionAlgorithm [0]));
+				_encryptionAlgorithm.Content = contentEncryptionAlgorithm [1];
+				
+				ASN1 encryptedContent = encryptedContentInfo [2];
+				if (encryptedContent.Tag != 0x80)
+					throw new ArgumentException ("missing EncryptedContentInfo.EncryptedContent");
+				_encrypted = encryptedContent.Value;
+			}
+
+			public ASN1 ASN1 {
+				get { return GetASN1(); }
+			}
+
+			public ContentInfo ContentInfo {
+				get { return _content; }
+			}
+
+			public ContentInfo EncryptionAlgorithm {
+				get { return _encryptionAlgorithm; }
+			}
+
+			public byte[] EncryptedContent {
+				get {
+					if (_encrypted == null)
+						return null;
+					return (byte[]) _encrypted.Clone ();
+				}
+			}
+
+			public byte Version {
+				get { return _version; }
+				set { _version = value; }
+			}
+
+			// methods
+
+			internal ASN1 GetASN1 () 
+			{
+				return null;
+			}
+
+			public byte[] GetBytes () 
+			{
+				return GetASN1 ().GetBytes ();
+			}
+		}
+
+		/*
+		 * EnvelopedData ::= SEQUENCE {
+		 *	version Version,
+		 *	recipientInfos RecipientInfos,
+		 *	encryptedContentInfo EncryptedContentInfo 
+		 * }
+		 * 
+		 * RecipientInfos ::= SET OF RecipientInfo
+		 * 
+		 * EncryptedContentInfo ::= SEQUENCE {
+		 *	contentType ContentType,
+		 *	contentEncryptionAlgorithm ContentEncryptionAlgorithmIdentifier,
+		 *	encryptedContent [0] IMPLICIT EncryptedContent OPTIONAL 
+		 * }
+		 * 
+		 * EncryptedContent ::= OCTET STRING
+		 * 
+		 */
+		public class EnvelopedData {
+			private byte _version;
+			private ContentInfo _content;
+			private ContentInfo _encryptionAlgorithm;
+			private ArrayList _recipientInfos;
+			private byte[] _encrypted;
+
+			public EnvelopedData () 
+			{
+				_version = 0;
+				_content = new ContentInfo ();
+				_encryptionAlgorithm = new ContentInfo ();
+				_recipientInfos = new ArrayList ();
+			}
+
+			public EnvelopedData (byte[] data) 
+				: this (new ASN1 (data))
+			{
+			}
+
+			public EnvelopedData (ASN1 asn1) : this ()
+			{
+				if ((asn1[0].Tag != 0x30) || (asn1[0].Count < 3))
+					throw new ArgumentException ("Invalid EnvelopedData");
+
+				if (asn1[0][0].Tag != 0x02)
+					throw new ArgumentException ("Invalid version");
+				_version = asn1[0][0].Value[0];
+
+				// recipientInfos
+
+				ASN1 recipientInfos = asn1 [0][1];
+				if (recipientInfos.Tag != 0x31)
+					throw new ArgumentException ("missing RecipientInfos");
+				for (int i=0; i < recipientInfos.Count; i++) {
+					ASN1 recipientInfo = recipientInfos [i];
+					_recipientInfos.Add (new RecipientInfo (recipientInfo));
+				}
+
+				ASN1 encryptedContentInfo = asn1[0][2];
+				if (encryptedContentInfo.Tag != 0x30)
+					throw new ArgumentException ("missing EncryptedContentInfo");
+
+				ASN1 contentType = encryptedContentInfo [0];
+				if (contentType.Tag != 0x06)
+					throw new ArgumentException ("missing EncryptedContentInfo.ContentType");
+				_content = new ContentInfo (ASN1Convert.ToOid (contentType));
+
+				ASN1 contentEncryptionAlgorithm = encryptedContentInfo [1];
+				if (contentEncryptionAlgorithm.Tag != 0x30)
+					throw new ArgumentException ("missing EncryptedContentInfo.ContentEncryptionAlgorithmIdentifier");
+				_encryptionAlgorithm = new ContentInfo (ASN1Convert.ToOid (contentEncryptionAlgorithm [0]));
+				_encryptionAlgorithm.Content = contentEncryptionAlgorithm [1];
+				
+				ASN1 encryptedContent = encryptedContentInfo [2];
+				if (encryptedContent.Tag != 0x80)
+					throw new ArgumentException ("missing EncryptedContentInfo.EncryptedContent");
+				_encrypted = encryptedContent.Value;
+			}
+
+			public ArrayList RecipientInfos {
+				  get { return _recipientInfos; }
+			}
+
+			public ASN1 ASN1 {
+				get { return GetASN1(); }
+			}
+
+			public ContentInfo ContentInfo {
+				get { return _content; }
+			}
+
+			public ContentInfo EncryptionAlgorithm {
+				get { return _encryptionAlgorithm; }
+			}
+
+			public byte[] EncryptedContent {
+				get { 
+					if (_encrypted == null)
+						return null;
+					return (byte[]) _encrypted.Clone ();
+				}
+			}
+
+			public byte Version {
+				get { return _version; }
+				set { _version = value; }
+			}
+
+			internal ASN1 GetASN1 () 
+			{
+				// SignedData ::= SEQUENCE {
+				ASN1 signedData = new ASN1 (0x30);
+				// version Version -> Version ::= INTEGER
+/*				byte[] ver = { _version };
+				signedData.Add (new ASN1 (0x02, ver));
+				// digestAlgorithms DigestAlgorithmIdentifiers -> DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
+				ASN1 digestAlgorithms = signedData.Add (new ASN1 (0x31));
+				if (hashAlgorithm != null) {
+					string hashOid = CryptoConfig.MapNameToOid (hashAlgorithm);
+					digestAlgorithms.Add (AlgorithmIdentifier (hashOid));
+				}
+
+				// contentInfo ContentInfo,
+				ASN1 ci = contentInfo.ASN1;
+				signedData.Add (ci);
+				if ((mda == null) && (hashAlgorithm != null)) {
+					// automatically add the messageDigest authenticated attribute
+					HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
+					byte[] idcHash = ha.ComputeHash (ci[1][0].Value);
+					ASN1 md = new ASN1 (0x30);
+					mda = Attribute (messageDigest, md.Add (new ASN1 (0x04, idcHash)));
+					signerInfo.AuthenticatedAttributes.Add (mda);
+				}
+
+				// certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
+				if (certs.Count > 0) {
+					ASN1 a0 = signedData.Add (new ASN1 (0xA0));
+					foreach (X509Certificate x in certs)
+						a0.Add (new ASN1 (x.RawData));
+				}
+				// crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
+				if (crls.Count > 0) {
+					ASN1 a1 = signedData.Add (new ASN1 (0xA1));
+					foreach (byte[] crl in crls)
+						a1.Add (new ASN1 (crl));
+				}
+				// signerInfos SignerInfos -> SignerInfos ::= SET OF SignerInfo
+				ASN1 signerInfos = signedData.Add (new ASN1 (0x31));
+				if (signerInfo.Key != null)
+					signerInfos.Add (signerInfo.ASN1);*/
+				return signedData;
+			}
+
+			public byte[] GetBytes () {
+				return GetASN1 ().GetBytes ();
+			}
+		}
+
+		/* RecipientInfo ::= SEQUENCE {
+		 *	version Version,
+		 *	issuerAndSerialNumber IssuerAndSerialNumber,
+		 *	keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier,
+		 *	encryptedKey EncryptedKey 
+		 * }
+		 * 
+		 * KeyEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
+		 * 
+		 * EncryptedKey ::= OCTET STRING
+		 */
+		public class RecipientInfo {
+
+			private int _version;
+			private string _oid;
+			private byte[] _key;
+			private byte[] _ski;
+			private string _issuer;
+			private byte[] _serial;
+
+			public RecipientInfo () {}
+
+			public RecipientInfo (ASN1 data) 
+			{
+				if (data.Tag != 0x30)
+					throw new ArgumentException ("Invalid RecipientInfo");
+				
+				ASN1 version = data [0];
+				if (version.Tag != 0x02)
+					throw new ArgumentException ("missing Version");
+				_version = version.Value [0];
+
+				// issuerAndSerialNumber IssuerAndSerialNumber
+				ASN1 subjectIdentifierType = data [1];
+				if ((subjectIdentifierType.Tag == 0x80) && (_version == 3)) {
+					_ski = subjectIdentifierType.Value;
+				}
+				else {
+					_issuer = X501.ToString (subjectIdentifierType [0]);
+					_serial = subjectIdentifierType [1].Value;
+				}
+
+				ASN1 keyEncryptionAlgorithm = data [2];
+				_oid = ASN1Convert.ToOid (keyEncryptionAlgorithm [0]);
+
+				ASN1 encryptedKey = data [3];
+				_key = encryptedKey.Value;
+			}
+
+			public string Oid {
+				get { return _oid; }
+			}
+
+			public byte[] Key {
+				get { 
+					if (_key == null)
+						return null;
+                                        return (byte[]) _key.Clone ();
+				}
+			}
+
+			public byte[] SubjectKeyIdentifier {
+				get { 
+					if (_ski == null)
+						return null;
+					return (byte[]) _ski.Clone ();
+				}
+			}
+
+			public string Issuer {
+				get { return _issuer; }
+			}
+
+			public byte[] Serial {
+				get { 
+					if (_serial == null)
+						return null;
+					return (byte[]) _serial.Clone ();
+				}
+			}
+
+			public int Version {
+				get { return _version; }
+			}
+		}
+
+		/*
+		 * SignedData ::= SEQUENCE {
+		 *	version Version,
+		 *	digestAlgorithms DigestAlgorithmIdentifiers,
+		 *	contentInfo ContentInfo,
+		 *	certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
+		 *	crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
+		 *	signerInfos SignerInfos 
+		 * }
+		 */
+		public class SignedData {
+			private byte version;
+			private string hashAlgorithm;
+			private ContentInfo contentInfo;
+			private X509CertificateCollection certs;
+			private ArrayList crls;
+			private SignerInfo signerInfo;
+			private bool mda;
+			private bool signed;
+
+			public SignedData () 
+			{
+				version = 1;
+				contentInfo = new ContentInfo ();
+				certs = new X509CertificateCollection ();
+				crls = new ArrayList ();
+				signerInfo = new SignerInfo ();
+				mda = true;
+				signed = false;
+			}
+
+			public SignedData (byte[] data) 
+				: this (new ASN1 (data)) 
+			{
+			}
+
+			public SignedData (ASN1 asn1) 
+			{
+				if ((asn1[0].Tag != 0x30) || (asn1[0].Count < 4))
+					throw new ArgumentException ("Invalid SignedData");
+
+				if (asn1[0][0].Tag != 0x02)
+					throw new ArgumentException ("Invalid version");
+				version = asn1[0][0].Value[0];
+
+				contentInfo = new ContentInfo (asn1[0][2]);
+
+				int n = 3;
+				certs = new X509CertificateCollection ();
+				if (asn1[0][n].Tag == 0xA0) {
+					for (int i=0; i < asn1[0][n].Count; i++)
+						certs.Add (new X509Certificate (asn1[0][n][i].GetBytes ()));
+					n++;
+				}
+
+				crls = new ArrayList ();
+				if (asn1[0][n].Tag == 0xA1) {
+					for (int i=0; i < asn1[0][n].Count; i++)
+						crls.Add (asn1[0][n][i].GetBytes ());
+					n++;
+				}
+
+				if (asn1[0][n].Count > 0)
+					signerInfo = new SignerInfo (asn1[0][n]);
+				else
+					signerInfo = new SignerInfo ();
+
+				// Exchange hash algorithm Oid from SignerInfo
+				if (signerInfo.HashName != null) {
+					HashName = OidToName(signerInfo.HashName);
+				}
+				
+				// Check if SignerInfo has authenticated attributes
+				mda = (signerInfo.AuthenticatedAttributes.Count > 0);
+			}
+
+			public ASN1 ASN1 {
+				get { return GetASN1(); }
+			}
+
+			public X509CertificateCollection Certificates {
+				get { return certs; }
+			}
+
+			public ContentInfo ContentInfo {
+				get { return contentInfo; }
+			}
+
+			public ArrayList Crls {
+				get { return crls; }
+			}
+
+			public string HashName {
+				get { return hashAlgorithm; }
+				// todo add validation
+				set { 
+					hashAlgorithm = value; 
+					signerInfo.HashName = value;
+				}
+			}
+
+			public SignerInfo SignerInfo {
+				get { return signerInfo; }
+			}
+
+			public byte Version {
+				get { return version; }
+				set { version = value; }
+			}
+
+			public bool UseAuthenticatedAttributes {
+				get { return mda; }
+				set { mda = value; }
+			}
+
+			public bool VerifySignature (AsymmetricAlgorithm aa)
+			{
+				if (aa == null) {
+					return false;
+				}
+
+				RSAPKCS1SignatureDeformatter r = new RSAPKCS1SignatureDeformatter (aa);
+				r.SetHashAlgorithm (hashAlgorithm);
+				HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
+
+				byte[] signature = signerInfo.Signature;
+				byte[] hash = null;
+
+				if (mda) {
+					ASN1 asn = new ASN1 (0x31);
+					foreach (ASN1 attr in signerInfo.AuthenticatedAttributes)
+						asn.Add (attr);
+
+					hash = ha.ComputeHash (asn.GetBytes ());
+				} else {
+					hash = ha.ComputeHash (contentInfo.Content[0].Value);
+				}
+
+				if (hash != null && signature != null) {
+					return r.VerifySignature (hash, signature);
+				}
+				return false;
+			}
+
+			internal string OidToName (string oid)
+			{
+				switch (oid) {
+				case "1.3.14.3.2.26" :
+					return "SHA1";
+				case "1.2.840.113549.2.2" :
+					return "MD2";
+				case "1.2.840.113549.2.5" :
+					return "MD5";
+				case "2.16.840.1.101.3.4.1" :
+					return "SHA256";
+				case "2.16.840.1.101.3.4.2" :
+					return "SHA384";
+				case "2.16.840.1.101.3.4.3" :
+					return "SHA512";
+				default :
+					break;
+				}
+				// Unknown Oid
+				return oid;
+			}
+
+			internal ASN1 GetASN1 () 
+			{
+				// SignedData ::= SEQUENCE {
+				ASN1 signedData = new ASN1 (0x30);
+				// version Version -> Version ::= INTEGER
+				byte[] ver = { version };
+				signedData.Add (new ASN1 (0x02, ver));
+				// digestAlgorithms DigestAlgorithmIdentifiers -> DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
+				ASN1 digestAlgorithms = signedData.Add (new ASN1 (0x31));
+				if (hashAlgorithm != null) {
+					string hashOid = CryptoConfig.MapNameToOID (hashAlgorithm);
+					digestAlgorithms.Add (AlgorithmIdentifier (hashOid));
+				}
+
+				// contentInfo ContentInfo,
+				ASN1 ci = contentInfo.ASN1;
+				signedData.Add (ci);
+				if (!signed && (hashAlgorithm != null)) {
+					if (mda) {
+						// Use authenticated attributes for signature
+						
+						// Automatically add the contentType authenticated attribute
+						ASN1 ctattr = Attribute (Oid.contentType, ci[0]);
+						signerInfo.AuthenticatedAttributes.Add (ctattr);
+						
+						// Automatically add the messageDigest authenticated attribute
+						HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
+						byte[] idcHash = ha.ComputeHash (ci[1][0].Value);
+						ASN1 md = new ASN1 (0x30);
+						ASN1 mdattr = Attribute (Oid.messageDigest, md.Add (new ASN1 (0x04, idcHash)));
+						signerInfo.AuthenticatedAttributes.Add (mdattr);
+					} else {
+						// Don't use authenticated attributes for signature -- signature is content
+						RSAPKCS1SignatureFormatter r = new RSAPKCS1SignatureFormatter (signerInfo.Key);
+						r.SetHashAlgorithm (hashAlgorithm);
+						HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
+						byte[] sig = ha.ComputeHash (ci[1][0].Value);
+						signerInfo.Signature = r.CreateSignature (sig);
+					}
+					signed = true;
+				}
+
+				// certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
+				if (certs.Count > 0) {
+					ASN1 a0 = signedData.Add (new ASN1 (0xA0));
+					foreach (X509Certificate x in certs)
+						a0.Add (new ASN1 (x.RawData));
+				}
+				// crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
+				if (crls.Count > 0) {
+					ASN1 a1 = signedData.Add (new ASN1 (0xA1));
+					foreach (byte[] crl in crls)
+						a1.Add (new ASN1 (crl));
+				}
+				// signerInfos SignerInfos -> SignerInfos ::= SET OF SignerInfo
+				ASN1 signerInfos = signedData.Add (new ASN1 (0x31));
+				if (signerInfo.Key != null)
+					signerInfos.Add (signerInfo.ASN1);
+				return signedData;
+			}
+
+			public byte[] GetBytes () 
+			{
+				return GetASN1 ().GetBytes ();
+			}
+		}
+
+		/*
+		 * SignerInfo ::= SEQUENCE {
+		 *	version Version,
+		 * 	issuerAndSerialNumber IssuerAndSerialNumber,
+		 * 	digestAlgorithm DigestAlgorithmIdentifier,
+		 * 	authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL,
+		 * 	digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier,
+		 * 	encryptedDigest EncryptedDigest,
+		 * 	unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL 
+		 * }
+		 * 
+		 * For version == 3 issuerAndSerialNumber may be replaced by ...
+		 */
+		public class SignerInfo {
+
+			private byte version;
+			private X509Certificate x509;
+			private string hashAlgorithm;
+			private AsymmetricAlgorithm key;
+			private ArrayList authenticatedAttributes;
+			private ArrayList unauthenticatedAttributes;
+			private byte[] signature;
+			private string issuer;
+			private byte[] serial;
+			private byte[] ski;
+
+			public SignerInfo () 
+			{
+				version = 1;
+				authenticatedAttributes = new ArrayList ();
+				unauthenticatedAttributes = new ArrayList ();
+			}
+
+			public SignerInfo (byte[] data) 
+				: this (new ASN1 (data)) {}
+
+			// TODO: INCOMPLETE
+			public SignerInfo (ASN1 asn1) : this () 
+			{
+				if ((asn1[0].Tag != 0x30) || (asn1[0].Count < 5))
+					throw new ArgumentException ("Invalid SignedData");
+
+				// version Version
+				if (asn1[0][0].Tag != 0x02)
+					throw new ArgumentException ("Invalid version");
+				version = asn1[0][0].Value[0];
+
+				// issuerAndSerialNumber IssuerAndSerialNumber
+				ASN1 subjectIdentifierType = asn1 [0][1];
+				if ((subjectIdentifierType.Tag == 0x80) && (version == 3)) {
+					ski = subjectIdentifierType.Value;
+				}
+				else {
+					issuer = X501.ToString (subjectIdentifierType [0]);
+					serial = subjectIdentifierType [1].Value;
+				}
+
+				// digestAlgorithm DigestAlgorithmIdentifier
+				ASN1 digestAlgorithm = asn1 [0][2];
+				hashAlgorithm = ASN1Convert.ToOid (digestAlgorithm [0]);
+
+				// authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL
+				int n = 3;
+				ASN1 authAttributes = asn1 [0][n];
+				if (authAttributes.Tag == 0xA0) {
+					n++;
+					for (int i=0; i < authAttributes.Count; i++)
+						authenticatedAttributes.Add (authAttributes [i]);
+				}
+
+				// digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier
+				n++;
+				// ASN1 digestEncryptionAlgorithm = asn1 [0][n++];
+				// string digestEncryptionAlgorithmOid = ASN1Convert.ToOid (digestEncryptionAlgorithm [0]);
+
+				// encryptedDigest EncryptedDigest
+				ASN1 encryptedDigest = asn1 [0][n++];
+				if (encryptedDigest.Tag == 0x04)
+					signature = encryptedDigest.Value;
+
+				// unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL
+				ASN1 unauthAttributes = asn1 [0][n];
+				if ((unauthAttributes != null) && (unauthAttributes.Tag == 0xA1)) {
+					for (int i=0; i < unauthAttributes.Count; i++)
+						unauthenticatedAttributes.Add (unauthAttributes [i]);
+				}
+			}
+
+			public string IssuerName {
+				get { return issuer; }
+			}
+
+			public byte[] SerialNumber {
+				get { 
+					if (serial == null)
+						return null;
+					return (byte[]) serial.Clone (); 
+				}
+			}
+
+			public byte[] SubjectKeyIdentifier {
+				get { 
+					if (ski == null)
+						return null;
+					return (byte[]) ski.Clone (); 
+				}
+			}
+
+			public ASN1 ASN1 {
+				get { return GetASN1(); }
+			}
+
+			public ArrayList AuthenticatedAttributes {
+				get { return authenticatedAttributes; }
+			}
+
+			public X509Certificate Certificate {
+				get { return x509; }
+				set { x509 = value; }
+			}
+
+			public string HashName {
+				get { return hashAlgorithm; }
+				set { hashAlgorithm = value; }
+			}
+
+			public AsymmetricAlgorithm Key {
+				get { return key; }
+				set { key = value; }
+			}
+
+			public byte[] Signature {
+				get { 
+					if (signature == null)
+						return null;
+					return (byte[]) signature.Clone (); 
+				}
+
+				set {
+					if (value != null) {
+						signature = (byte[]) value.Clone ();
+					}
+				}
+			}
+
+			public ArrayList UnauthenticatedAttributes {
+				get { return unauthenticatedAttributes; }
+			}
+
+			public byte Version {
+				get { return version; }
+				set { version = value; }
+			}
+
+			internal ASN1 GetASN1 () 
+			{
+				if ((key == null) || (hashAlgorithm == null))
+					return null;
+				byte[] ver = { version };
+				ASN1 signerInfo = new ASN1 (0x30);
+				// version Version -> Version ::= INTEGER
+				signerInfo.Add (new ASN1 (0x02, ver));
+				// issuerAndSerialNumber IssuerAndSerialNumber,
+				signerInfo.Add (PKCS7.IssuerAndSerialNumber (x509));
+				// digestAlgorithm DigestAlgorithmIdentifier,
+				string hashOid = CryptoConfig.MapNameToOID (hashAlgorithm);
+				signerInfo.Add (AlgorithmIdentifier (hashOid));
+				// authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL,
+				ASN1 aa = null;
+				if (authenticatedAttributes.Count > 0) {
+					aa = signerInfo.Add (new ASN1 (0xA0));
+					authenticatedAttributes.Sort(new SortedSet ());
+					foreach (ASN1 attr in authenticatedAttributes)
+						aa.Add (attr);
+				}
+				// digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier,
+				if (key is RSA) {
+					signerInfo.Add (AlgorithmIdentifier (PKCS7.Oid.rsaEncryption));
+
+					if (aa != null) {
+						// Calculate the signature here; otherwise it must be set from SignedData
+						RSAPKCS1SignatureFormatter r = new RSAPKCS1SignatureFormatter (key);
+						r.SetHashAlgorithm (hashAlgorithm);
+						byte[] tbs = aa.GetBytes ();
+						tbs [0] = 0x31; // not 0xA0 for signature
+						HashAlgorithm ha = HashAlgorithm.Create (hashAlgorithm);
+						byte[] tbsHash = ha.ComputeHash (tbs);
+						signature = r.CreateSignature (tbsHash);
+					}
+				}
+				else if (key is DSA) {
+					throw new NotImplementedException ("not yet");
+				}
+				else
+					throw new CryptographicException ("Unknown assymetric algorithm");
+				// encryptedDigest EncryptedDigest,
+				signerInfo.Add (new ASN1 (0x04, signature));
+				// unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL 
+				if (unauthenticatedAttributes.Count > 0) {
+					ASN1 ua = signerInfo.Add (new ASN1 (0xA1));
+					unauthenticatedAttributes.Sort(new SortedSet ());
+					foreach (ASN1 attr in unauthenticatedAttributes)
+						ua.Add (attr);
+				}
+				return signerInfo;
+			}
+
+			public byte[] GetBytes () 
+			{
+				return GetASN1 ().GetBytes ();
+			}
+		}
+
+		internal class SortedSet : IComparer {
+
+			public int Compare (object x, object y)
+			{
+				if (x == null)
+					return (y == null) ? 0 : -1;
+				else if (y == null)
+					return 1;
+
+				ASN1 xx = x as ASN1;
+				ASN1 yy = y as ASN1;
+				
+				if ((xx == null) || (yy == null)) {
+					throw new ArgumentException (("Invalid objects."));
+				}
+
+				byte[] xb = xx.GetBytes ();
+				byte[] yb = yy.GetBytes ();
+
+				for (int i = 0; i < xb.Length; i++) {
+					if (i == yb.Length)
+						break;
+
+					if (xb[i] == yb[i]) 
+						continue;
+						
+					return (xb[i] < yb[i]) ? -1 : 1; 
+				}
+
+				// The arrays are equal up to the shortest of them.
+				if (xb.Length > yb.Length)
+					return 1;
+				else if (xb.Length < yb.Length)
+					return -1;
+
+				return 0;
+			}
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS8.cs b/MediaBrowser.Server.Startup.Common/Security/PKCS8.cs
new file mode 100644
index 000000000..b58ebdaf9
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/PKCS8.cs
@@ -0,0 +1,495 @@
+//
+// PKCS8.cs: PKCS #8 - Private-Key Information Syntax Standard
+//	ftp://ftp.rsasecurity.com/pub/pkcs/doc/pkcs-8.doc
+//
+// Author:
+//	Sebastien Pouliot <sebastien@xamarin.com>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 Novell Inc. (http://www.novell.com)
+// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.Security.Cryptography;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    public sealed class PKCS8 {
+
+		public enum KeyInfo {
+			PrivateKey,
+			EncryptedPrivateKey,
+			Unknown
+		}
+
+		private PKCS8 () 
+		{
+		}
+
+		static public KeyInfo GetType (byte[] data) 
+		{
+			if (data == null)
+				throw new ArgumentNullException ("data");
+
+			KeyInfo ki = KeyInfo.Unknown;
+			try {
+				ASN1 top = new ASN1 (data);
+				if ((top.Tag == 0x30) && (top.Count > 0)) {
+					ASN1 firstLevel = top [0];
+					switch (firstLevel.Tag) {
+						case 0x02:
+							ki = KeyInfo.PrivateKey;
+							break;
+						case 0x30:
+							ki = KeyInfo.EncryptedPrivateKey;
+							break;
+					}
+				}
+			}
+			catch {
+				throw new CryptographicException ("invalid ASN.1 data");
+			}
+			return ki;
+		}
+
+		/*
+		 * PrivateKeyInfo ::= SEQUENCE {
+		 *	version Version,
+		 *	privateKeyAlgorithm PrivateKeyAlgorithmIdentifier,
+		 *	privateKey PrivateKey,
+		 *	attributes [0] IMPLICIT Attributes OPTIONAL 
+		 * }
+		 * 
+		 * Version ::= INTEGER
+		 * 
+		 * PrivateKeyAlgorithmIdentifier ::= AlgorithmIdentifier
+		 * 
+		 * PrivateKey ::= OCTET STRING
+		 * 
+		 * Attributes ::= SET OF Attribute
+		 */
+		public class PrivateKeyInfo {
+
+			private int _version;
+			private string _algorithm;
+			private byte[] _key;
+			private ArrayList _list;
+
+			public PrivateKeyInfo () 
+			{
+				_version = 0;
+				_list = new ArrayList ();
+			}
+
+			public PrivateKeyInfo (byte[] data) : this () 
+			{
+				Decode (data);
+			}
+
+			// properties
+
+			public string Algorithm {
+				get { return _algorithm; }
+				set { _algorithm = value; }
+			}
+
+			public ArrayList Attributes {
+				get { return _list; }
+			}
+
+			public byte[] PrivateKey {
+				get {
+					if (_key == null)
+						return null;
+					return (byte[]) _key.Clone (); 
+				}
+				set { 
+					if (value == null)
+						throw new ArgumentNullException ("PrivateKey");
+					_key = (byte[]) value.Clone (); 
+				}
+			}
+
+			public int Version {
+				get { return _version; }
+				set { 
+					if (value < 0)
+						throw new ArgumentOutOfRangeException ("negative version");
+					_version = value; 
+				}
+			}
+
+			// methods
+
+			private void Decode (byte[] data) 
+			{
+				ASN1 privateKeyInfo = new ASN1 (data);
+				if (privateKeyInfo.Tag != 0x30)
+					throw new CryptographicException ("invalid PrivateKeyInfo");
+
+				ASN1 version = privateKeyInfo [0];
+				if (version.Tag != 0x02)
+					throw new CryptographicException ("invalid version");
+				_version = version.Value [0];
+
+				ASN1 privateKeyAlgorithm = privateKeyInfo [1];
+				if (privateKeyAlgorithm.Tag != 0x30)
+					throw new CryptographicException ("invalid algorithm");
+				
+				ASN1 algorithm = privateKeyAlgorithm [0];
+				if (algorithm.Tag != 0x06)
+					throw new CryptographicException ("missing algorithm OID");
+				_algorithm = ASN1Convert.ToOid (algorithm);
+
+				ASN1 privateKey = privateKeyInfo [2];
+				_key = privateKey.Value;
+
+				// attributes [0] IMPLICIT Attributes OPTIONAL
+				if (privateKeyInfo.Count > 3) {
+					ASN1 attributes = privateKeyInfo [3];
+					for (int i=0; i < attributes.Count; i++) {
+						_list.Add (attributes [i]);
+					}
+				}
+			}
+
+			public byte[] GetBytes () 
+			{
+				ASN1 privateKeyAlgorithm = new ASN1 (0x30);
+				privateKeyAlgorithm.Add (ASN1Convert.FromOid (_algorithm));
+				privateKeyAlgorithm.Add (new ASN1 (0x05)); // ASN.1 NULL
+
+				ASN1 pki = new ASN1 (0x30);
+				pki.Add (new ASN1 (0x02, new byte [1] { (byte) _version }));
+				pki.Add (privateKeyAlgorithm);
+				pki.Add (new ASN1 (0x04, _key));
+
+				if (_list.Count > 0) {
+					ASN1 attributes = new ASN1 (0xA0);
+					foreach (ASN1 attribute in _list) {
+						attributes.Add (attribute);
+					}
+					pki.Add (attributes);
+				}
+
+				return pki.GetBytes ();
+			}
+
+			// static methods
+
+			static private byte[] RemoveLeadingZero (byte[] bigInt) 
+			{
+				int start = 0;
+				int length = bigInt.Length;
+				if (bigInt [0] == 0x00) {
+					start = 1;
+					length--;
+				}
+				byte[] bi = new byte [length];
+				Buffer.BlockCopy (bigInt, start, bi, 0, length);
+				return bi;
+			}
+
+			static private byte[] Normalize (byte[] bigInt, int length) 
+			{
+				if (bigInt.Length == length)
+					return bigInt;
+				else if (bigInt.Length > length)
+					return RemoveLeadingZero (bigInt);
+				else {
+					// pad with 0
+					byte[] bi = new byte [length];
+					Buffer.BlockCopy (bigInt, 0, bi, (length - bigInt.Length), bigInt.Length);
+					return bi;
+				}
+			}
+			
+			/*
+			 * RSAPrivateKey ::= SEQUENCE {
+			 *	version           Version, 
+			 *	modulus           INTEGER,  -- n
+			 *	publicExponent    INTEGER,  -- e
+			 *	privateExponent   INTEGER,  -- d
+			 *	prime1            INTEGER,  -- p
+			 *	prime2            INTEGER,  -- q
+			 *	exponent1         INTEGER,  -- d mod (p-1)
+			 *	exponent2         INTEGER,  -- d mod (q-1) 
+			 *	coefficient       INTEGER,  -- (inverse of q) mod p
+			 *	otherPrimeInfos   OtherPrimeInfos OPTIONAL 
+			 * }
+			 */
+			static public RSA DecodeRSA (byte[] keypair) 
+			{
+				ASN1 privateKey = new ASN1 (keypair);
+				if (privateKey.Tag != 0x30)
+					throw new CryptographicException ("invalid private key format");
+
+				ASN1 version = privateKey [0];
+				if (version.Tag != 0x02)
+					throw new CryptographicException ("missing version");
+
+				if (privateKey.Count < 9)
+					throw new CryptographicException ("not enough key parameters");
+
+				RSAParameters param = new RSAParameters ();
+				// note: MUST remove leading 0 - else MS wont import the key
+				param.Modulus = RemoveLeadingZero (privateKey [1].Value);
+				int keysize = param.Modulus.Length;
+				int keysize2 = (keysize >> 1); // half-size
+				// size must be normalized - else MS wont import the key
+				param.D = Normalize (privateKey [3].Value, keysize);
+				param.DP = Normalize (privateKey [6].Value, keysize2);
+				param.DQ = Normalize (privateKey [7].Value, keysize2);
+				param.Exponent = RemoveLeadingZero (privateKey [2].Value);
+				param.InverseQ = Normalize (privateKey [8].Value, keysize2);
+				param.P = Normalize (privateKey [4].Value, keysize2);
+				param.Q = Normalize (privateKey [5].Value, keysize2);
+
+				RSA rsa = null;
+				try {
+					rsa = RSA.Create ();
+					rsa.ImportParameters (param);
+				}
+				catch (CryptographicException) {
+                    // this may cause problem when this code is run under
+                    // the SYSTEM identity on Windows (e.g. ASP.NET). See
+                    // http://bugzilla.ximian.com/show_bug.cgi?id=77559
+                    CspParameters csp = new CspParameters();
+                    csp.Flags = CspProviderFlags.UseMachineKeyStore;
+                    rsa = new RSACryptoServiceProvider(csp);
+                    rsa.ImportParameters(param);
+                }
+                return rsa;
+			}
+
+			/*
+			 * RSAPrivateKey ::= SEQUENCE {
+			 *	version           Version, 
+			 *	modulus           INTEGER,  -- n
+			 *	publicExponent    INTEGER,  -- e
+			 *	privateExponent   INTEGER,  -- d
+			 *	prime1            INTEGER,  -- p
+			 *	prime2            INTEGER,  -- q
+			 *	exponent1         INTEGER,  -- d mod (p-1)
+			 *	exponent2         INTEGER,  -- d mod (q-1) 
+			 *	coefficient       INTEGER,  -- (inverse of q) mod p
+			 *	otherPrimeInfos   OtherPrimeInfos OPTIONAL 
+			 * }
+			 */
+			static public byte[] Encode (RSA rsa) 
+			{
+				RSAParameters param = rsa.ExportParameters (true);
+
+				ASN1 rsaPrivateKey = new ASN1 (0x30);
+				rsaPrivateKey.Add (new ASN1 (0x02, new byte [1] { 0x00 }));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.Modulus));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.Exponent));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.D));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.P));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.Q));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.DP));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.DQ));
+				rsaPrivateKey.Add (ASN1Convert.FromUnsignedBigInteger (param.InverseQ));
+
+				return rsaPrivateKey.GetBytes ();
+			}
+
+			// DSA only encode it's X private key inside an ASN.1 INTEGER (Hint: Tag == 0x02)
+			// which isn't enough for rebuilding the keypair. The other parameters
+			// can be found (98% of the time) in the X.509 certificate associated
+			// with the private key or (2% of the time) the parameters are in it's
+			// issuer X.509 certificate (not supported in the .NET framework).
+			static public DSA DecodeDSA (byte[] privateKey, DSAParameters dsaParameters) 
+			{
+				ASN1 pvk = new ASN1 (privateKey);
+				if (pvk.Tag != 0x02)
+					throw new CryptographicException ("invalid private key format");
+
+				// X is ALWAYS 20 bytes (no matter if the key length is 512 or 1024 bits)
+				dsaParameters.X = Normalize (pvk.Value, 20);
+				DSA dsa = DSA.Create ();
+				dsa.ImportParameters (dsaParameters);
+				return dsa;
+			}
+
+			static public byte[] Encode (DSA dsa) 
+			{
+				DSAParameters param = dsa.ExportParameters (true);
+				return ASN1Convert.FromUnsignedBigInteger (param.X).GetBytes ();
+			}
+
+			static public byte[] Encode (AsymmetricAlgorithm aa) 
+			{
+				if (aa is RSA)
+					return Encode ((RSA)aa);
+				else if (aa is DSA)
+					return Encode ((DSA)aa);
+				else
+					throw new CryptographicException ("Unknown asymmetric algorithm {0}", aa.ToString ());
+			}
+		}
+
+		/*
+		 * EncryptedPrivateKeyInfo ::= SEQUENCE {
+		 *	encryptionAlgorithm EncryptionAlgorithmIdentifier,
+		 *	encryptedData EncryptedData 
+		 * }
+		 * 
+		 * EncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
+		 * 
+		 * EncryptedData ::= OCTET STRING
+		 * 
+		 * --
+		 *  AlgorithmIdentifier  ::= SEQUENCE {
+		 *	algorithm  OBJECT IDENTIFIER,
+		 *	parameters ANY DEFINED BY algorithm OPTIONAL
+		 * }
+		 * 
+		 * -- from PKCS#5
+		 * PBEParameter ::= SEQUENCE {
+		 *	salt OCTET STRING SIZE(8),
+		 *	iterationCount INTEGER 
+		 * }
+		 */
+		public class EncryptedPrivateKeyInfo {
+
+			private string _algorithm;
+			private byte[] _salt;
+			private int _iterations;
+			private byte[] _data;
+
+			public EncryptedPrivateKeyInfo () {}
+
+			public EncryptedPrivateKeyInfo (byte[] data) : this () 
+			{
+				Decode (data);
+			}
+
+			// properties
+
+			public string Algorithm {
+				get { return _algorithm; }
+				set { _algorithm = value; }
+			}
+
+			public byte[] EncryptedData {
+				get { return (_data == null) ? null : (byte[]) _data.Clone (); }
+				set { _data = (value == null) ? null : (byte[]) value.Clone (); }
+			}
+
+			public byte[] Salt {
+				get { 
+					if (_salt == null) {
+						RandomNumberGenerator rng = RandomNumberGenerator.Create ();
+						_salt = new byte [8];
+						rng.GetBytes (_salt);
+					}
+					return (byte[]) _salt.Clone (); 
+				}
+				set { _salt = (byte[]) value.Clone (); }
+			}
+
+			public int IterationCount {
+				get { return _iterations; }
+				set { 
+					if (value < 0)
+						throw new ArgumentOutOfRangeException ("IterationCount", "Negative");
+					_iterations = value; 
+				}
+			}
+
+			// methods
+
+			private void Decode (byte[] data) 
+			{
+				ASN1 encryptedPrivateKeyInfo = new ASN1 (data);
+				if (encryptedPrivateKeyInfo.Tag != 0x30)
+					throw new CryptographicException ("invalid EncryptedPrivateKeyInfo");
+
+				ASN1 encryptionAlgorithm = encryptedPrivateKeyInfo [0];
+				if (encryptionAlgorithm.Tag != 0x30)
+					throw new CryptographicException ("invalid encryptionAlgorithm");
+				ASN1 algorithm = encryptionAlgorithm [0];
+				if (algorithm.Tag != 0x06)
+					throw new CryptographicException ("invalid algorithm");
+				_algorithm = ASN1Convert.ToOid (algorithm);
+				// parameters ANY DEFINED BY algorithm OPTIONAL
+				if (encryptionAlgorithm.Count > 1) {
+					ASN1 parameters = encryptionAlgorithm [1];
+					if (parameters.Tag != 0x30)
+						throw new CryptographicException ("invalid parameters");
+
+					ASN1 salt = parameters [0];
+					if (salt.Tag != 0x04)
+						throw new CryptographicException ("invalid salt");
+					_salt = salt.Value;
+
+					ASN1 iterationCount = parameters [1];
+					if (iterationCount.Tag != 0x02)
+						throw new CryptographicException ("invalid iterationCount");
+					_iterations = ASN1Convert.ToInt32 (iterationCount);
+				}
+
+				ASN1 encryptedData = encryptedPrivateKeyInfo [1];
+				if (encryptedData.Tag != 0x04)
+					throw new CryptographicException ("invalid EncryptedData");
+				_data = encryptedData.Value;
+			}
+
+			// Note: PKCS#8 doesn't define how to generate the key required for encryption
+			// so you're on your own. Just don't try to copy the big guys too much ;)
+			// Netscape:	http://www.cs.auckland.ac.nz/~pgut001/pubs/netscape.txt
+			// Microsoft:	http://www.cs.auckland.ac.nz/~pgut001/pubs/breakms.txt
+			public byte[] GetBytes ()
+			{
+				if (_algorithm == null)
+					throw new CryptographicException ("No algorithm OID specified");
+
+				ASN1 encryptionAlgorithm = new ASN1 (0x30);
+				encryptionAlgorithm.Add (ASN1Convert.FromOid (_algorithm));
+
+				// parameters ANY DEFINED BY algorithm OPTIONAL
+				if ((_iterations > 0) || (_salt != null)) {
+					ASN1 salt = new ASN1 (0x04, _salt);
+					ASN1 iterations = ASN1Convert.FromInt32 (_iterations);
+
+					ASN1 parameters = new ASN1 (0x30);
+					parameters.Add (salt);
+					parameters.Add (iterations);
+					encryptionAlgorithm.Add (parameters);
+				}
+
+				// encapsulates EncryptedData into an OCTET STRING
+				ASN1 encryptedData = new ASN1 (0x04, _data);
+
+				ASN1 encryptedPrivateKeyInfo = new ASN1 (0x30);
+				encryptedPrivateKeyInfo.Add (encryptionAlgorithm);
+				encryptedPrivateKeyInfo.Add (encryptedData);
+
+				return encryptedPrivateKeyInfo.GetBytes ();
+			}
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/PfxGenerator.cs b/MediaBrowser.Server.Startup.Common/Security/PfxGenerator.cs
new file mode 100644
index 000000000..3f9b90ac1
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/PfxGenerator.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections;
+using System.Security.Cryptography;
+
+namespace Emby.Common.Implementations.Security
+{
+    public class PFXGenerator
+    {
+        // http://www.freekpaans.nl/2015/04/creating-self-signed-x-509-certificates-using-mono-security/
+        public static byte[] GeneratePfx(string certificateName, string password)
+        {
+            byte[] sn = GenerateSerialNumber();
+            string subject = string.Format("CN={0}", certificateName);
+
+            DateTime notBefore = DateTime.Now;
+            DateTime notAfter = DateTime.Now.AddYears(20);
+
+            RSA subjectKey = new RSACryptoServiceProvider(2048);
+
+
+            string hashName = "SHA256";
+
+            X509CertificateBuilder cb = new X509CertificateBuilder(3);
+            cb.SerialNumber = sn;
+            cb.IssuerName = subject;
+            cb.NotBefore = notBefore;
+            cb.NotAfter = notAfter;
+            cb.SubjectName = subject;
+            cb.SubjectPublicKey = subjectKey;
+            cb.Hash = hashName;
+
+            byte[] rawcert = cb.Sign(subjectKey);
+
+
+            PKCS12 p12 = new PKCS12();
+            p12.Password = password;
+
+            Hashtable attributes = GetAttributes();
+
+            p12.AddCertificate(new X509Certificate(rawcert), attributes);
+            p12.AddPkcs8ShroudedKeyBag(subjectKey, attributes);
+
+            return p12.GetBytes();
+        }
+
+        private static Hashtable GetAttributes()
+        {
+            ArrayList list = new ArrayList();
+            // we use a fixed array to avoid endianess issues 
+            // (in case some tools requires the ID to be 1).
+            list.Add(new byte[4] { 1, 0, 0, 0 });
+            Hashtable attributes = new Hashtable(1);
+            attributes.Add(PKCS9.localKeyId, list);
+            return attributes;
+        }
+
+        private static byte[] GenerateSerialNumber()
+        {
+            byte[] sn = Guid.NewGuid().ToByteArray();
+
+            //must be positive
+            if ((sn[0] & 0x80) == 0x80)
+                sn[0] -= 0x80;
+            return sn;
+        }
+
+        public static byte[] GetCertificateForBytes(byte[] pfx, string password)
+        {
+            var pkcs = new PKCS12(pfx, password);
+            var cert = pkcs.GetCertificate(GetAttributes());
+
+            return cert.RawData;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X501Name.cs b/MediaBrowser.Server.Startup.Common/Security/X501Name.cs
new file mode 100644
index 000000000..93e1a6bef
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X501Name.cs
@@ -0,0 +1,393 @@
+//
+// X501Name.cs: X.501 Distinguished Names stuff 
+//
+// Author:
+//	Sebastien Pouliot <sebastien@ximian.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    // References:
+    // 1.	Information technology - Open Systems Interconnection - The Directory: Models
+    //	http://www.itu.int/rec/recommendation.asp?type=items&lang=e&parent=T-REC-X.501-200102-I
+    // 2.	RFC2253: Lightweight Directory Access Protocol (v3): UTF-8 String Representation of Distinguished Names
+    //	http://www.ietf.org/rfc/rfc2253.txt
+
+    /*
+	 * Name ::= CHOICE { RDNSequence }
+	 * 
+	 * RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
+	 * 
+	 * RelativeDistinguishedName ::= SET OF AttributeTypeAndValue
+	 */
+    public sealed class X501 {
+
+		static byte[] countryName = { 0x55, 0x04, 0x06 };
+		static byte[] organizationName = { 0x55, 0x04, 0x0A };
+		static byte[] organizationalUnitName = { 0x55, 0x04, 0x0B };
+		static byte[] commonName = { 0x55, 0x04, 0x03 };
+		static byte[] localityName = { 0x55, 0x04, 0x07 };
+		static byte[] stateOrProvinceName = { 0x55, 0x04, 0x08 };
+		static byte[] streetAddress = { 0x55, 0x04, 0x09 };
+		//static byte[] serialNumber = { 0x55, 0x04, 0x05 };
+		static byte[] domainComponent = { 0x09, 0x92, 0x26, 0x89, 0x93, 0xF2, 0x2C, 0x64, 0x01, 0x19 };
+		static byte[] userid = { 0x09, 0x92, 0x26, 0x89, 0x93, 0xF2, 0x2C, 0x64, 0x01, 0x01 };
+		static byte[] email = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01 };
+		static byte[] dnQualifier = { 0x55, 0x04, 0x2E };
+		static byte[] title = { 0x55, 0x04, 0x0C };
+		static byte[] surname = { 0x55, 0x04, 0x04 };
+		static byte[] givenName = { 0x55, 0x04, 0x2A };
+		static byte[] initial = { 0x55, 0x04, 0x2B };
+
+		private X501 () 
+		{
+		}
+
+		static public string ToString (ASN1 seq) 
+		{
+			StringBuilder sb = new StringBuilder ();
+			for (int i = 0; i < seq.Count; i++) {
+				ASN1 entry = seq [i];
+				AppendEntry (sb, entry, true);
+
+				// separator (not on last iteration)
+				if (i < seq.Count - 1)
+					sb.Append (", ");
+			}
+			return sb.ToString ();
+		}
+
+		static public string ToString (ASN1 seq, bool reversed, string separator, bool quotes)
+		{
+			StringBuilder sb = new StringBuilder ();
+
+			if (reversed) {
+				for (int i = seq.Count - 1; i >= 0; i--) {
+					ASN1 entry = seq [i];
+					AppendEntry (sb, entry, quotes);
+
+					// separator (not on last iteration)
+					if (i > 0)
+						sb.Append (separator);
+				}
+			} else {
+				for (int i = 0; i < seq.Count; i++) {
+					ASN1 entry = seq [i];
+					AppendEntry (sb, entry, quotes);
+
+					// separator (not on last iteration)
+					if (i < seq.Count - 1)
+						sb.Append (separator);
+				}
+			}
+			return sb.ToString ();
+		}
+
+		static private void AppendEntry (StringBuilder sb, ASN1 entry, bool quotes)
+		{
+			// multiple entries are valid
+			for (int k = 0; k < entry.Count; k++) {
+				ASN1 pair = entry [k];
+				ASN1 s = pair [1];
+				if (s == null)
+					continue;
+
+				ASN1 poid = pair [0];
+				if (poid == null)
+					continue;
+
+				if (poid.CompareValue (countryName))
+					sb.Append ("C=");
+				else if (poid.CompareValue (organizationName))
+					sb.Append ("O=");
+				else if (poid.CompareValue (organizationalUnitName))
+					sb.Append ("OU=");
+				else if (poid.CompareValue (commonName))
+					sb.Append ("CN=");
+				else if (poid.CompareValue (localityName))
+					sb.Append ("L=");
+				else if (poid.CompareValue (stateOrProvinceName))
+					sb.Append ("S=");	// NOTE: RFC2253 uses ST=
+				else if (poid.CompareValue (streetAddress))
+					sb.Append ("STREET=");
+				else if (poid.CompareValue (domainComponent))
+					sb.Append ("DC=");
+				else if (poid.CompareValue (userid))
+					sb.Append ("UID=");
+				else if (poid.CompareValue (email))
+					sb.Append ("E=");	// NOTE: Not part of RFC2253
+				else if (poid.CompareValue (dnQualifier))
+					sb.Append ("dnQualifier=");
+				else if (poid.CompareValue (title))
+					sb.Append ("T=");
+				else if (poid.CompareValue (surname))
+					sb.Append ("SN=");
+				else if (poid.CompareValue (givenName))
+					sb.Append ("G=");
+				else if (poid.CompareValue (initial))
+					sb.Append ("I=");
+				else {
+					// unknown OID
+					sb.Append ("OID.");	// NOTE: Not present as RFC2253
+					sb.Append (ASN1Convert.ToOid (poid));
+					sb.Append ("=");
+				}
+
+				string sValue = null;
+				// 16bits or 8bits string ? TODO not complete (+special chars!)
+				if (s.Tag == 0x1E) {
+					// BMPSTRING
+					StringBuilder sb2 = new StringBuilder ();
+					for (int j = 1; j < s.Value.Length; j += 2)
+						sb2.Append ((char)s.Value[j]);
+					sValue = sb2.ToString ();
+				} else {
+					if (s.Tag == 0x14)
+						sValue = Encoding.UTF7.GetString (s.Value);
+					else
+						sValue = Encoding.UTF8.GetString (s.Value);
+					// in some cases we must quote (") the value
+					// Note: this doesn't seems to conform to RFC2253
+					char[] specials = { ',', '+', '"', '\\', '<', '>', ';' };
+					if (quotes) {
+						if ((sValue.IndexOfAny (specials, 0, sValue.Length) > 0) ||
+						    sValue.StartsWith (" ") || (sValue.EndsWith (" ")))
+							sValue = "\"" + sValue + "\"";
+					}
+				}
+
+				sb.Append (sValue);
+
+				// separator (not on last iteration)
+				if (k < entry.Count - 1)
+					sb.Append (", ");
+			}
+		}
+
+		static private X520.AttributeTypeAndValue GetAttributeFromOid (string attributeType) 
+		{
+			string s = attributeType.ToUpper (CultureInfo.InvariantCulture).Trim ();
+			switch (s) {
+				case "C":
+					return new X520.CountryName ();
+				case "O":
+					return new X520.OrganizationName ();
+				case "OU":
+					return new X520.OrganizationalUnitName ();
+				case "CN":
+					return new X520.CommonName ();
+				case "L":
+					return new X520.LocalityName ();
+				case "S":	// Microsoft
+				case "ST":	// RFC2253
+					return new X520.StateOrProvinceName ();
+				case "E":	// NOTE: Not part of RFC2253
+					return new X520.EmailAddress ();
+				case "DC":	// RFC2247
+					return new X520.DomainComponent ();
+				case "UID":	// RFC1274
+					return new X520.UserId ();
+				case "DNQUALIFIER":
+					return new X520.DnQualifier ();
+				case "T":
+					return new X520.Title ();
+				case "SN":
+					return new X520.Surname ();
+				case "G":
+					return new X520.GivenName ();
+				case "I":
+					return new X520.Initial ();
+				default:
+					if (s.StartsWith ("OID.")) {
+						// MUST support it but it OID may be without it
+						return new X520.Oid (s.Substring (4));
+					} else {
+						if (IsOid (s))
+							return new X520.Oid (s);
+						else
+							return null;
+					}
+			}
+		}
+
+		static private bool IsOid (string oid)
+		{
+			try {
+				ASN1 asn = ASN1Convert.FromOid (oid);
+				return (asn.Tag == 0x06);
+			}
+			catch {
+				return false;
+			}
+		}
+
+		// no quote processing
+		static private X520.AttributeTypeAndValue ReadAttribute (string value, ref int pos)
+		{
+			while ((value[pos] == ' ') && (pos < value.Length))
+				pos++;
+
+			// get '=' position in substring
+			int equal = value.IndexOf ('=', pos);
+			if (equal == -1) {
+				string msg =  ("No attribute found.");
+				throw new FormatException (msg);
+			}
+
+			string s = value.Substring (pos, equal - pos);
+			X520.AttributeTypeAndValue atv = GetAttributeFromOid (s);
+			if (atv == null) {
+				string msg =  ("Unknown attribute '{0}'.");
+				throw new FormatException (String.Format (msg, s));
+			}
+			pos = equal + 1; // skip the '='
+			return atv;
+		}
+
+		static private bool IsHex (char c)
+		{
+			if (Char.IsDigit (c))
+				return true;
+			char up = Char.ToUpper (c, CultureInfo.InvariantCulture);
+			return ((up >= 'A') && (up <= 'F'));
+		}
+
+		static string ReadHex (string value, ref int pos)
+		{
+			StringBuilder sb = new StringBuilder ();
+			// it is (at least an) 8 bits char
+			sb.Append (value[pos++]);
+			sb.Append (value[pos]);
+			// look ahead for a 16 bits char
+			if ((pos < value.Length - 4) && (value[pos+1] == '\\') && IsHex (value[pos+2])) {
+				pos += 2; // pass last char and skip \
+				sb.Append (value[pos++]);
+				sb.Append (value[pos]);
+			}
+			byte[] data = CryptoConvert.FromHex (sb.ToString ());
+			return Encoding.UTF8.GetString (data);
+		}
+
+		static private int ReadEscaped (StringBuilder sb, string value, int pos)
+		{
+			switch (value[pos]) {
+			case '\\':
+			case '"':
+			case '=':
+			case ';':
+			case '<':
+			case '>':
+			case '+':
+			case '#':
+			case ',':
+				sb.Append (value[pos]);
+				return pos;
+			default:
+				if (pos >= value.Length - 2) {
+					string msg = ("Malformed escaped value '{0}'.");
+					throw new FormatException (string.Format (msg, value.Substring (pos)));
+				}
+				// it's either a 8 bits or 16 bits char
+				sb.Append (ReadHex (value, ref pos));
+				return pos;
+			}
+		}
+
+		static private int ReadQuoted (StringBuilder sb, string value, int pos)
+		{
+			int original = pos;
+			while (pos <= value.Length) {
+				switch (value[pos]) {
+				case '"':
+					return pos;
+				case '\\':
+					return ReadEscaped (sb, value, pos);
+				default:
+					sb.Append (value[pos]);
+					pos++;
+					break;
+				}
+			}
+			string msg = ("Malformed quoted value '{0}'.");
+			throw new FormatException (string.Format (msg, value.Substring (original)));
+		}
+
+		static private string ReadValue (string value, ref int pos)
+		{
+			int original = pos;
+			StringBuilder sb = new StringBuilder ();
+			while (pos < value.Length) {
+				switch (value [pos]) {
+				case '\\':
+					pos = ReadEscaped (sb, value, ++pos);
+					break;
+				case '"':
+					pos = ReadQuoted (sb, value, ++pos);
+					break;
+				case '=':
+				case ';':
+				case '<':
+				case '>':
+					string msg =("Malformed value '{0}' contains '{1}' outside quotes.");
+					throw new FormatException (string.Format (msg, value.Substring (original), value[pos]));
+				case '+':
+				case '#':
+					throw new NotImplementedException ();
+				case ',':
+					pos++;
+					return sb.ToString ();
+				default:
+					sb.Append (value[pos]);
+					break;
+				}
+				pos++;
+			}
+			return sb.ToString ();
+		}
+
+		static public ASN1 FromString (string rdn) 
+		{
+			if (rdn == null)
+				throw new ArgumentNullException ("rdn");
+
+			int pos = 0;
+			ASN1 asn1 = new ASN1 (0x30);
+			while (pos < rdn.Length) {
+				X520.AttributeTypeAndValue atv = ReadAttribute (rdn, ref pos);
+				atv.Value = ReadValue (rdn, ref pos);
+
+				ASN1 sequence = new ASN1 (0x31);
+				sequence.Add (atv.GetASN1 ());
+				asn1.Add (sequence); 
+			}
+			return asn1;
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Builder.cs b/MediaBrowser.Server.Startup.Common/Security/X509Builder.cs
new file mode 100644
index 000000000..e16855959
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X509Builder.cs
@@ -0,0 +1,153 @@
+//
+// X509Builder.cs: Abstract builder class for X509 objects
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2004 Novell (http://www.novell.com) 
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.Security.Cryptography;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    public abstract class X509Builder {
+
+		private const string defaultHash = "SHA1";
+		private string hashName;
+
+		protected X509Builder ()
+		{
+			hashName = defaultHash;
+		}
+
+		protected abstract ASN1 ToBeSigned (string hashName);
+
+		// move to PKCS1
+		protected string GetOid (string hashName) 
+		{
+			switch (hashName.ToLower (CultureInfo.InvariantCulture)) {
+				case "md2":
+					// md2withRSAEncryption (1 2 840 113549 1 1 2)
+					return "1.2.840.113549.1.1.2";
+				case "md4":
+					// md4withRSAEncryption (1 2 840 113549 1 1 3)
+					return "1.2.840.113549.1.1.3";
+				case "md5":
+					// md5withRSAEncryption (1 2 840 113549 1 1 4)
+					return "1.2.840.113549.1.1.4";
+				case "sha1":
+					// sha1withRSAEncryption (1 2 840 113549 1 1 5)
+					return "1.2.840.113549.1.1.5";
+				case "sha256":
+					// sha256WithRSAEncryption 	OBJECT IDENTIFIER ::= { pkcs-1 11 }
+					return "1.2.840.113549.1.1.11";
+				case "sha384":
+					// sha384WithRSAEncryption 	OBJECT IDENTIFIER ::= { pkcs-1 12 }
+					return "1.2.840.113549.1.1.12";
+				case "sha512":
+					// sha512WithRSAEncryption 	OBJECT IDENTIFIER ::= { pkcs-1 13 }
+					return "1.2.840.113549.1.1.13";
+				default:
+					throw new NotSupportedException ("Unknown hash algorithm " + hashName);
+			}
+		}
+
+		public string Hash {
+			get { return hashName; }
+			set { 
+				if (hashName == null)
+					hashName = defaultHash;
+				else
+					hashName = value;
+			}
+		}
+
+		public virtual byte[] Sign (AsymmetricAlgorithm aa) 
+		{
+			if (aa is RSA)
+				return Sign (aa as RSA);
+			else if (aa is DSA)
+				return Sign (aa as DSA);
+			else
+				throw new NotSupportedException ("Unknown Asymmetric Algorithm " + aa.ToString());
+		}
+
+		private byte[] Build (ASN1 tbs, string hashoid, byte[] signature) 
+		{
+			ASN1 builder = new ASN1 (0x30);
+			builder.Add (tbs);
+			builder.Add (PKCS7.AlgorithmIdentifier (hashoid));
+			// first byte of BITSTRING is the number of unused bits in the first byte
+			byte[] bitstring = new byte [signature.Length + 1];
+			Buffer.BlockCopy (signature, 0, bitstring, 1, signature.Length);
+			builder.Add (new ASN1 (0x03, bitstring));
+			return builder.GetBytes ();
+		}
+
+		public virtual byte[] Sign (RSA key)
+		{
+			string oid = GetOid (hashName);
+			ASN1 tbs = ToBeSigned (oid);
+			HashAlgorithm ha = HashAlgorithm.Create (hashName);
+			byte[] hash = ha.ComputeHash (tbs.GetBytes ());
+
+			RSAPKCS1SignatureFormatter pkcs1 = new RSAPKCS1SignatureFormatter (key);
+			pkcs1.SetHashAlgorithm (hashName);
+			byte[] signature = pkcs1.CreateSignature (hash);
+
+			return Build (tbs, oid, signature);
+		}
+
+		public virtual byte[] Sign (DSA key) 
+		{
+			string oid = "1.2.840.10040.4.3";
+			ASN1 tbs = ToBeSigned (oid);
+			HashAlgorithm ha = HashAlgorithm.Create (hashName);
+			if (!(ha is SHA1))
+				throw new NotSupportedException ("Only SHA-1 is supported for DSA");
+			byte[] hash = ha.ComputeHash (tbs.GetBytes ());
+
+			DSASignatureFormatter dsa = new DSASignatureFormatter (key);
+			dsa.SetHashAlgorithm (hashName);
+			byte[] rs = dsa.CreateSignature (hash);
+
+			// split R and S
+			byte[] r = new byte [20];
+			Buffer.BlockCopy (rs, 0, r, 0, 20);
+			byte[] s = new byte [20];
+			Buffer.BlockCopy (rs, 20, s, 0, 20);
+			ASN1 signature = new ASN1 (0x30);
+			signature.Add (new ASN1 (0x02, r));
+			signature.Add (new ASN1 (0x02, s));
+
+			// dsaWithSha1 (1 2 840 10040 4 3)
+			return Build (tbs, oid, signature.GetBytes ());
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Certificate.cs b/MediaBrowser.Server.Startup.Common/Security/X509Certificate.cs
new file mode 100644
index 000000000..f49445f0e
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X509Certificate.cs
@@ -0,0 +1,563 @@
+//
+// X509Certificates.cs: Handles X.509 certificates.
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@xamarin.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
+// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Cryptography;
+using System.Security.Permissions;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    // References:
+    // a.	Internet X.509 Public Key Infrastructure Certificate and CRL Profile
+    //	http://www.ietf.org/rfc/rfc3280.txt
+    // b.	ITU ASN.1 standards (free download)
+    //	http://www.itu.int/ITU-T/studygroups/com17/languages/
+
+    public class X509Certificate : ISerializable
+    {
+
+        private ASN1 decoder;
+
+		private byte[] m_encodedcert;
+		private DateTime m_from;
+		private DateTime m_until;
+		private ASN1 issuer;
+		private string m_issuername;
+		private string m_keyalgo;
+		private byte[] m_keyalgoparams;
+		private ASN1 subject;
+		private string m_subject;
+		private byte[] m_publickey;
+		private byte[] signature;
+		private string m_signaturealgo;
+		private byte[] m_signaturealgoparams;
+		private byte[] certhash;
+		private RSA _rsa;
+		private DSA _dsa;
+
+		// from http://msdn.microsoft.com/en-gb/library/ff635835.aspx
+		private const string OID_DSA = "1.2.840.10040.4.1";
+		private const string OID_RSA = "1.2.840.113549.1.1.1";
+		
+		// from http://www.ietf.org/rfc/rfc2459.txt
+		//
+		//Certificate  ::=  SEQUENCE  {
+		//     tbsCertificate       TBSCertificate,
+		//     signatureAlgorithm   AlgorithmIdentifier,
+		//     signature            BIT STRING  }
+		//
+		//TBSCertificate  ::=  SEQUENCE  {
+		//     version         [0]  Version DEFAULT v1,
+		//     serialNumber         CertificateSerialNumber,
+		//     signature            AlgorithmIdentifier,
+		//     issuer               Name,
+		//     validity             Validity,
+		//     subject              Name,
+		//     subjectPublicKeyInfo SubjectPublicKeyInfo,
+		//     issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
+		//                          -- If present, version shall be v2 or v3
+		//     subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
+		//                          -- If present, version shall be v2 or v3
+		//     extensions      [3]  Extensions OPTIONAL
+		//                          -- If present, version shall be v3 --  }
+		private int version;
+		private byte[] serialnumber;
+
+		private byte[] issuerUniqueID;
+		private byte[] subjectUniqueID;
+		private X509ExtensionCollection extensions;
+
+		private static string encoding_error = ("Input data cannot be coded as a valid certificate.");
+
+
+		// that's were the real job is!
+		private void Parse (byte[] data) 
+		{
+			try {
+				decoder = new ASN1 (data);
+				// Certificate 
+				if (decoder.Tag != 0x30)
+					throw new CryptographicException (encoding_error);
+				// Certificate / TBSCertificate
+				if (decoder [0].Tag != 0x30)
+					throw new CryptographicException (encoding_error);
+
+				ASN1 tbsCertificate = decoder [0];
+
+				int tbs = 0;
+				// Certificate / TBSCertificate / Version
+				ASN1 v = decoder [0][tbs];
+				version = 1;			// DEFAULT v1
+				if ((v.Tag == 0xA0) && (v.Count > 0)) {
+					// version (optional) is present only in v2+ certs
+					version += v [0].Value [0];	// zero based
+					tbs++;
+				}
+
+				// Certificate / TBSCertificate / CertificateSerialNumber
+				ASN1 sn = decoder [0][tbs++];
+				if (sn.Tag != 0x02) 
+					throw new CryptographicException (encoding_error);
+				serialnumber = sn.Value;
+				Array.Reverse (serialnumber, 0, serialnumber.Length);
+		
+				// Certificate / TBSCertificate / AlgorithmIdentifier
+				tbs++;
+				// ASN1 signatureAlgo = tbsCertificate.Element (tbs++, 0x30); 
+		
+				issuer = tbsCertificate.Element (tbs++, 0x30); 
+				m_issuername = X501.ToString (issuer);
+		
+				ASN1 validity = tbsCertificate.Element (tbs++, 0x30);
+				ASN1 notBefore = validity [0];
+				m_from = ASN1Convert.ToDateTime (notBefore);
+				ASN1 notAfter = validity [1];
+				m_until = ASN1Convert.ToDateTime (notAfter);
+		
+				subject = tbsCertificate.Element (tbs++, 0x30);
+				m_subject = X501.ToString (subject);
+		
+				ASN1 subjectPublicKeyInfo = tbsCertificate.Element (tbs++, 0x30);
+		
+				ASN1 algorithm = subjectPublicKeyInfo.Element (0, 0x30);
+				ASN1 algo = algorithm.Element (0, 0x06);
+				m_keyalgo = ASN1Convert.ToOid (algo);
+				// parameters ANY DEFINED BY algorithm OPTIONAL
+				// so we dont ask for a specific (Element) type and return DER
+				ASN1 parameters = algorithm [1];
+				m_keyalgoparams = ((algorithm.Count > 1) ? parameters.GetBytes () : null);
+		
+				ASN1 subjectPublicKey = subjectPublicKeyInfo.Element (1, 0x03); 
+				// we must drop th first byte (which is the number of unused bits
+				// in the BITSTRING)
+				int n = subjectPublicKey.Length - 1;
+				m_publickey = new byte [n];
+				Buffer.BlockCopy (subjectPublicKey.Value, 1, m_publickey, 0, n);
+
+				// signature processing
+				byte[] bitstring = decoder [2].Value;
+				// first byte contains unused bits in first byte
+				signature = new byte [bitstring.Length - 1];
+				Buffer.BlockCopy (bitstring, 1, signature, 0, signature.Length);
+
+				algorithm = decoder [1];
+				algo = algorithm.Element (0, 0x06);
+				m_signaturealgo = ASN1Convert.ToOid (algo);
+				parameters = algorithm [1];
+				if (parameters != null)
+					m_signaturealgoparams = parameters.GetBytes ();
+				else
+					m_signaturealgoparams = null;
+
+				// Certificate / TBSCertificate / issuerUniqueID
+				ASN1 issuerUID = tbsCertificate.Element (tbs, 0x81);
+				if (issuerUID != null) {
+					tbs++;
+					issuerUniqueID = issuerUID.Value;
+				}
+
+				// Certificate / TBSCertificate / subjectUniqueID
+				ASN1 subjectUID = tbsCertificate.Element (tbs, 0x82);
+				if (subjectUID != null) {
+					tbs++;
+					subjectUniqueID = subjectUID.Value;
+				}
+
+				// Certificate / TBSCertificate / Extensions
+				ASN1 extns = tbsCertificate.Element (tbs, 0xA3);
+				if ((extns != null) && (extns.Count == 1))
+					extensions = new X509ExtensionCollection (extns [0]);
+				else
+					extensions = new X509ExtensionCollection (null);
+
+				// keep a copy of the original data
+				m_encodedcert = (byte[]) data.Clone ();
+			}
+			catch (Exception ex) {
+				throw new CryptographicException (encoding_error, ex);
+			}
+		}
+
+		// constructors
+
+		public X509Certificate (byte[] data) 
+		{
+			if (data != null) {
+				// does it looks like PEM ?
+				if ((data.Length > 0) && (data [0] != 0x30)) {
+					try {
+						data = PEM ("CERTIFICATE", data);
+					}
+					catch (Exception ex) {
+						throw new CryptographicException (encoding_error, ex);
+					}
+				}
+				Parse (data);
+			}
+		}
+
+		private byte[] GetUnsignedBigInteger (byte[] integer) 
+		{
+			if (integer [0] == 0x00) {
+				// this first byte is added so we're sure it's an unsigned integer
+				// however we can't feed it into RSAParameters or DSAParameters
+				int length = integer.Length - 1;
+				byte[] uinteger = new byte [length];
+				Buffer.BlockCopy (integer, 1, uinteger, 0, length);
+				return uinteger;
+			}
+			else
+				return integer;
+		}
+
+		// public methods
+
+		public DSA DSA {
+			get {
+				if (m_keyalgoparams == null)
+					throw new CryptographicException ("Missing key algorithm parameters.");
+
+				if (_dsa == null && m_keyalgo == OID_DSA) {
+					DSAParameters dsaParams = new DSAParameters ();
+					// for DSA m_publickey contains 1 ASN.1 integer - Y
+					ASN1 pubkey = new ASN1 (m_publickey);
+					if ((pubkey == null) || (pubkey.Tag != 0x02))
+						return null;
+					dsaParams.Y = GetUnsignedBigInteger (pubkey.Value);
+
+					ASN1 param = new ASN1 (m_keyalgoparams);
+					if ((param == null) || (param.Tag != 0x30) || (param.Count < 3))
+						return null;
+					if ((param [0].Tag != 0x02) || (param [1].Tag != 0x02) || (param [2].Tag != 0x02))
+						return null;
+					dsaParams.P = GetUnsignedBigInteger (param [0].Value);
+					dsaParams.Q = GetUnsignedBigInteger (param [1].Value);
+					dsaParams.G = GetUnsignedBigInteger (param [2].Value);
+
+					// BUG: MS BCL 1.0 can't import a key which 
+					// isn't the same size as the one present in
+					// the container.
+					_dsa = (DSA) new DSACryptoServiceProvider (dsaParams.Y.Length << 3);
+					_dsa.ImportParameters (dsaParams);
+				}
+				return _dsa; 
+			}
+
+			set {
+				_dsa = value;
+				if (value != null)
+					_rsa = null;
+			}
+		}
+
+		public X509ExtensionCollection Extensions {
+			get { return extensions; }
+		}
+
+		public byte[] Hash {
+			get {
+				if (certhash == null) {
+					if ((decoder == null) || (decoder.Count < 1))
+						return null;
+					string algo = PKCS1.HashNameFromOid (m_signaturealgo, false);
+					if (algo == null)
+						return null;
+					byte[] toBeSigned = decoder [0].GetBytes ();
+					using (var hash = PKCS1.CreateFromName (algo))
+						certhash = hash.ComputeHash (toBeSigned, 0, toBeSigned.Length);
+				}
+				return (byte[]) certhash.Clone ();
+			}
+		}
+
+		public virtual string IssuerName {
+			get { return m_issuername; }
+		}
+
+		public virtual string KeyAlgorithm {
+			get { return m_keyalgo; }
+		}
+
+		public virtual byte[] KeyAlgorithmParameters {
+			get {
+				if (m_keyalgoparams == null)
+					return null;
+				return (byte[]) m_keyalgoparams.Clone (); 
+			}
+			set { m_keyalgoparams = value; }
+		}
+
+		public virtual byte[] PublicKey	{
+			get { 
+				if (m_publickey == null)
+					return null;
+				return (byte[]) m_publickey.Clone ();
+			}
+		}
+
+		public virtual RSA RSA {
+			get {
+				if (_rsa == null && m_keyalgo == OID_RSA) {
+					RSAParameters rsaParams = new RSAParameters ();
+					// for RSA m_publickey contains 2 ASN.1 integers
+					// the modulus and the public exponent
+					ASN1 pubkey = new ASN1 (m_publickey);
+					ASN1 modulus = pubkey [0];
+					if ((modulus == null) || (modulus.Tag != 0x02))
+						return null;
+					ASN1 exponent = pubkey [1];
+					if (exponent.Tag != 0x02)
+						return null;
+
+					rsaParams.Modulus = GetUnsignedBigInteger (modulus.Value);
+					rsaParams.Exponent = exponent.Value;
+
+					// BUG: MS BCL 1.0 can't import a key which 
+					// isn't the same size as the one present in
+					// the container.
+					int keySize = (rsaParams.Modulus.Length << 3);
+					_rsa = (RSA) new RSACryptoServiceProvider (keySize);
+					_rsa.ImportParameters (rsaParams);
+				}
+				return _rsa; 
+			}
+
+			set {
+				if (value != null)
+					_dsa = null;
+				_rsa = value;
+			}
+		}
+	        
+		public virtual byte[] RawData {
+			get {
+				if (m_encodedcert == null)
+					return null;
+				return (byte[]) m_encodedcert.Clone ();
+			}
+		}
+
+		public virtual byte[] SerialNumber {
+			get { 
+				if (serialnumber == null)
+					return null;
+				return (byte[]) serialnumber.Clone (); 
+			}
+		}
+
+		public virtual byte[] Signature {
+			get { 
+				if (signature == null)
+					return null;
+
+				switch (m_signaturealgo) {
+					case "1.2.840.113549.1.1.2":	// MD2 with RSA encryption 
+					case "1.2.840.113549.1.1.3":	// MD4 with RSA encryption 
+					case "1.2.840.113549.1.1.4":	// MD5 with RSA encryption 
+					case "1.2.840.113549.1.1.5":	// SHA-1 with RSA Encryption 
+					case "1.3.14.3.2.29":		// SHA1 with RSA signature
+					case "1.2.840.113549.1.1.11":	// SHA-256 with RSA Encryption
+					case "1.2.840.113549.1.1.12":	// SHA-384 with RSA Encryption
+					case "1.2.840.113549.1.1.13":	// SHA-512 with RSA Encryption
+					case "1.3.36.3.3.1.2":			// RIPEMD160 with RSA Encryption
+						return (byte[]) signature.Clone ();
+
+					case "1.2.840.10040.4.3":	// SHA-1 with DSA
+						ASN1 sign = new ASN1 (signature);
+						if ((sign == null) || (sign.Count != 2))
+							return null;
+						byte[] part1 = sign [0].Value;
+						byte[] part2 = sign [1].Value;
+						byte[] sig = new byte [40];
+						// parts may be less than 20 bytes (i.e. first bytes were 0x00)
+						// parts may be more than 20 bytes (i.e. first byte > 0x80, negative)
+						int s1 = System.Math.Max (0, part1.Length - 20);
+						int e1 = System.Math.Max (0, 20 - part1.Length);
+						Buffer.BlockCopy (part1, s1, sig, e1, part1.Length - s1);
+						int s2 = System.Math.Max (0, part2.Length - 20);
+						int e2 = System.Math.Max (20, 40 - part2.Length);
+						Buffer.BlockCopy (part2, s2, sig, e2, part2.Length - s2);
+						return sig;
+
+					default:
+						throw new CryptographicException ("Unsupported hash algorithm: " + m_signaturealgo);
+				}
+			}
+		}
+
+		public virtual string SignatureAlgorithm {
+			get { return m_signaturealgo; }
+		}
+
+		public virtual byte[] SignatureAlgorithmParameters {
+			get { 
+				if (m_signaturealgoparams == null)
+					return m_signaturealgoparams;
+				return (byte[]) m_signaturealgoparams.Clone ();
+			}
+		}
+
+		public virtual string SubjectName {
+			get { return m_subject; }
+		}
+
+		public virtual DateTime ValidFrom {
+			get { return m_from; }
+		}
+
+		public virtual DateTime ValidUntil {
+			get { return m_until; }
+		}
+
+		public int Version {
+			get { return version; }
+		}
+
+		public bool IsCurrent {
+			get { return WasCurrent (DateTime.UtcNow); }
+		}
+
+		public bool WasCurrent (DateTime instant) 
+		{
+			return ((instant > ValidFrom) && (instant <= ValidUntil));
+		}
+
+		// uncommon v2 "extension"
+		public byte[] IssuerUniqueIdentifier {
+			get {
+				if (issuerUniqueID == null)
+					return null;
+				return (byte[]) issuerUniqueID.Clone ();
+			}
+		}
+
+		// uncommon v2 "extension"
+		public byte[] SubjectUniqueIdentifier {
+			get {
+				if (subjectUniqueID == null)
+					return null;
+				return (byte[]) subjectUniqueID.Clone ();
+			}
+		}
+
+		internal bool VerifySignature (DSA dsa) 
+		{
+			// signatureOID is check by both this.Hash and this.Signature
+			DSASignatureDeformatter v = new DSASignatureDeformatter (dsa);
+			// only SHA-1 is supported
+			v.SetHashAlgorithm ("SHA1");
+			return v.VerifySignature (this.Hash, this.Signature);
+		}
+
+		internal bool VerifySignature (RSA rsa) 
+		{
+			// SHA1-1 with DSA
+			if (m_signaturealgo == "1.2.840.10040.4.3")
+				return false;
+			RSAPKCS1SignatureDeformatter v = new RSAPKCS1SignatureDeformatter (rsa);
+			v.SetHashAlgorithm (PKCS1.HashNameFromOid (m_signaturealgo));
+			return v.VerifySignature (this.Hash, this.Signature);
+		}
+
+		public bool VerifySignature (AsymmetricAlgorithm aa) 
+		{
+			if (aa == null)
+				throw new ArgumentNullException ("aa");
+
+			if (aa is RSA)
+				return VerifySignature (aa as RSA);
+			else if (aa is DSA)
+				return VerifySignature (aa as DSA);
+			else 
+				throw new NotSupportedException ("Unknown Asymmetric Algorithm " + aa.ToString ());
+		}
+
+		public bool CheckSignature (byte[] hash, string hashAlgorithm, byte[] signature) 
+		{
+			RSACryptoServiceProvider r = (RSACryptoServiceProvider) RSA;
+			return r.VerifyHash (hash, hashAlgorithm, signature);
+		}
+
+		public bool IsSelfSigned {
+			get { 
+				if (m_issuername != m_subject)
+					return false;
+
+				try {
+					if (RSA != null)
+						return VerifySignature (RSA);
+					else if (DSA != null)
+						return VerifySignature (DSA);
+					else
+						return false; // e.g. a certificate with only DSA parameters
+				}
+				catch (CryptographicException) {
+					return false;
+				}
+			}
+		}
+
+		public ASN1 GetIssuerName ()
+		{
+			return issuer;
+		}
+
+		public ASN1 GetSubjectName ()
+		{
+			return subject;
+		}
+
+		protected X509Certificate (SerializationInfo info, StreamingContext context)
+		{
+			Parse ((byte[]) info.GetValue ("raw", typeof (byte[])));
+		}
+
+		[SecurityPermission (SecurityAction.Demand, SerializationFormatter = true)]
+		public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue ("raw", m_encodedcert);
+			// note: we NEVER serialize the private key
+		}
+
+		static byte[] PEM (string type, byte[] data) 
+		{
+			string pem = Encoding.ASCII.GetString (data);
+			string header = String.Format ("-----BEGIN {0}-----", type);
+			string footer = String.Format ("-----END {0}-----", type);
+			int start = pem.IndexOf (header) + header.Length;
+			int end = pem.IndexOf (footer, start);
+			string base64 = pem.Substring (start, (end - start));
+			return Convert.FromBase64String (base64);
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509CertificateBuilder.cs b/MediaBrowser.Server.Startup.Common/Security/X509CertificateBuilder.cs
new file mode 100644
index 000000000..fb6f8ec72
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X509CertificateBuilder.cs
@@ -0,0 +1,245 @@
+//
+// X509CertificateBuilder.cs: Handles building of X.509 certificates.
+//
+// Author:
+//	Sebastien Pouliot <sebastien@ximian.com>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2004 Novell (http://www.novell.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Security.Cryptography;
+
+namespace Emby.Common.Implementations.Security
+{
+    // From RFC3280
+    /*
+	 * Certificate  ::=  SEQUENCE  {
+	 *      tbsCertificate       TBSCertificate,
+	 *      signatureAlgorithm   AlgorithmIdentifier,
+	 *      signature            BIT STRING  
+	 * }
+	 * TBSCertificate  ::=  SEQUENCE  {
+	 *      version         [0]  Version DEFAULT v1,
+	 *      serialNumber         CertificateSerialNumber,
+	 *      signature            AlgorithmIdentifier,
+	 *      issuer               Name,
+	 *      validity             Validity,
+	 *      subject              Name,
+	 *      subjectPublicKeyInfo SubjectPublicKeyInfo,
+	 *      issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
+	 *                           -- If present, version MUST be v2 or v3
+	 *      subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
+	 *                           -- If present, version MUST be v2 or v3
+	 *      extensions      [3]  Extensions OPTIONAL
+	 *                           -- If present, version MUST be v3 --  
+	 * }
+	 * Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+	 * CertificateSerialNumber  ::=  INTEGER
+	 * Validity ::= SEQUENCE {
+	 *      notBefore      Time,
+	 *      notAfter       Time  
+	 * }
+	 * Time ::= CHOICE {
+	 *      utcTime        UTCTime,
+	 *      generalTime    GeneralizedTime 
+	 * }
+	 */
+    public class X509CertificateBuilder : X509Builder {
+ 
+		private byte version;
+		private byte[] sn;
+		private string issuer;
+		private DateTime notBefore;
+		private DateTime notAfter;
+		private string subject;
+		private AsymmetricAlgorithm aa;
+		private byte[] issuerUniqueID;
+		private byte[] subjectUniqueID;
+		private X509ExtensionCollection extensions;
+
+		public X509CertificateBuilder () : this (3) {}
+	
+		public X509CertificateBuilder (byte version) 
+		{
+			if (version > 3)
+				throw new ArgumentException ("Invalid certificate version");
+			this.version = version;
+			extensions = new X509ExtensionCollection ();
+		}
+
+		public byte Version {
+			get { return version; }
+			set { version = value; }
+		}
+
+		public byte[] SerialNumber {
+			get { return sn; }
+			set { sn = value; }
+		}
+
+		public string IssuerName {
+			get { return issuer; }
+			set { issuer = value; }
+		}
+
+		public DateTime NotBefore {
+			get { return notBefore; }
+			set { notBefore = value; }
+		}
+
+		public DateTime NotAfter {
+			get { return notAfter; }
+			set { notAfter = value; }
+		}
+
+		public string SubjectName {
+			get { return subject; }
+			set { subject = value; }
+		}
+
+		public AsymmetricAlgorithm SubjectPublicKey {
+			get { return aa; }
+			set { aa = value; }
+		}
+
+		public byte[] IssuerUniqueId {
+			get { return issuerUniqueID; }
+			set { issuerUniqueID = value; }
+		}
+
+		public byte[] SubjectUniqueId {
+			get { return subjectUniqueID; }
+			set { subjectUniqueID = value; }
+		}
+
+		public X509ExtensionCollection Extensions {
+			get { return extensions; }
+		}
+
+
+		/* SubjectPublicKeyInfo  ::=  SEQUENCE  {
+		 *      algorithm            AlgorithmIdentifier,
+		 *      subjectPublicKey     BIT STRING  }
+		 */
+		private ASN1 SubjectPublicKeyInfo () 
+		{
+			ASN1 keyInfo = new ASN1 (0x30);
+			if (aa is RSA) {
+				keyInfo.Add (PKCS7.AlgorithmIdentifier ("1.2.840.113549.1.1.1"));
+				RSAParameters p = (aa as RSA).ExportParameters (false);
+				/* RSAPublicKey ::= SEQUENCE {
+				 *       modulus            INTEGER,    -- n
+				 *       publicExponent     INTEGER  }  -- e
+				 */
+				ASN1 key = new ASN1 (0x30);
+				key.Add (ASN1Convert.FromUnsignedBigInteger (p.Modulus));
+				key.Add (ASN1Convert.FromUnsignedBigInteger (p.Exponent));
+				keyInfo.Add (new ASN1 (UniqueIdentifier (key.GetBytes ())));
+			}
+			else if (aa is DSA) {
+				DSAParameters p = (aa as DSA).ExportParameters (false);
+				/* Dss-Parms  ::=  SEQUENCE  {
+				 *       p             INTEGER,
+				 *       q             INTEGER,
+				 *       g             INTEGER  }
+				 */
+				ASN1 param = new ASN1 (0x30);
+				param.Add (ASN1Convert.FromUnsignedBigInteger (p.P));
+				param.Add (ASN1Convert.FromUnsignedBigInteger (p.Q));
+				param.Add (ASN1Convert.FromUnsignedBigInteger (p.G));
+				keyInfo.Add (PKCS7.AlgorithmIdentifier ("1.2.840.10040.4.1", param));
+				ASN1 key = keyInfo.Add (new ASN1 (0x03));
+				// DSAPublicKey ::= INTEGER  -- public key, y
+				key.Add (ASN1Convert.FromUnsignedBigInteger (p.Y));
+			}
+			else
+				throw new NotSupportedException ("Unknown Asymmetric Algorithm " + aa.ToString ());
+			return keyInfo;
+		}
+
+		private byte[] UniqueIdentifier (byte[] id) 
+		{
+			// UniqueIdentifier  ::=  BIT STRING
+			ASN1 uid = new ASN1 (0x03);
+			// first byte in a BITSTRING is the number of unused bits in the first byte
+			byte[] v = new byte [id.Length + 1];
+			Buffer.BlockCopy (id, 0, v, 1, id.Length);
+			uid.Value = v;
+			return uid.GetBytes ();
+		}
+
+		protected override ASN1 ToBeSigned (string oid) 
+		{
+			// TBSCertificate
+			ASN1 tbsCert = new ASN1 (0x30);
+
+			if (version > 1) {
+				// TBSCertificate / [0] Version DEFAULT v1,
+				byte[] ver = { (byte)(version - 1) };
+				ASN1 v = tbsCert.Add (new ASN1 (0xA0));
+				v.Add (new ASN1 (0x02, ver));
+			}
+
+			// TBSCertificate / CertificateSerialNumber,
+			tbsCert.Add (new ASN1 (0x02, sn));
+
+			// TBSCertificate / AlgorithmIdentifier,
+                        tbsCert.Add (PKCS7.AlgorithmIdentifier (oid));
+
+			// TBSCertificate / Name
+			tbsCert.Add (X501.FromString (issuer));
+
+			// TBSCertificate / Validity
+			ASN1 validity = tbsCert.Add (new ASN1 (0x30));
+			// TBSCertificate / Validity / Time
+			validity.Add (ASN1Convert.FromDateTime (notBefore));
+			// TBSCertificate / Validity / Time
+			validity.Add (ASN1Convert.FromDateTime (notAfter));
+
+			// TBSCertificate / Name
+			tbsCert.Add (X501.FromString (subject));
+
+			// TBSCertificate / SubjectPublicKeyInfo
+			tbsCert.Add (SubjectPublicKeyInfo ());
+                        
+			if (version > 1) {
+				// TBSCertificate / [1]  IMPLICIT UniqueIdentifier OPTIONAL
+				if (issuerUniqueID != null)
+					tbsCert.Add (new ASN1 (0xA1, UniqueIdentifier (issuerUniqueID)));
+
+				// TBSCertificate / [2]  IMPLICIT UniqueIdentifier OPTIONAL
+				if (subjectUniqueID != null)
+					tbsCert.Add (new ASN1 (0xA1, UniqueIdentifier (subjectUniqueID)));
+
+				// TBSCertificate / [3]  Extensions OPTIONAL
+				if ((version > 2) &&  (extensions.Count > 0))
+					tbsCert.Add (new ASN1 (0xA3, extensions.GetBytes ()));
+			}
+
+			return tbsCert;
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509CertificateCollection.cs b/MediaBrowser.Server.Startup.Common/Security/X509CertificateCollection.cs
new file mode 100644
index 000000000..5d353f9cf
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X509CertificateCollection.cs
@@ -0,0 +1,201 @@
+//
+// Based on System.Security.Cryptography.X509Certificates.X509CertificateCollection
+//	in System assembly
+//
+// Authors:
+//	Lawrence Pit (loz@cable.a2000.nl)
+//	Sebastien Pouliot <sebastien@ximian.com>
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    [Serializable]
+    public class X509CertificateCollection : CollectionBase, IEnumerable {
+		
+		public X509CertificateCollection () 
+		{
+		}
+		
+		public X509CertificateCollection (X509Certificate [] value) 
+		{
+			AddRange (value);
+		}
+		
+		public X509CertificateCollection (X509CertificateCollection value)
+		{
+			AddRange (value);
+		}
+		
+		// Properties
+		
+		public X509Certificate this [int index] {
+			get { return (X509Certificate) InnerList [index]; }
+			set { InnerList [index] = value; }
+		}
+		
+		// Methods
+
+		public int Add (X509Certificate value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value");
+			
+			return InnerList.Add (value);
+		}
+		
+		public void AddRange (X509Certificate [] value) 
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value");
+
+			for (int i = 0; i < value.Length; i++) 
+				InnerList.Add (value [i]);
+		}
+		
+		public void AddRange (X509CertificateCollection value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value");
+
+			for (int i = 0; i < value.InnerList.Count; i++) 
+				InnerList.Add (value [i]);
+		}
+		
+		public bool Contains (X509Certificate value) 
+		{
+			return (IndexOf (value) != -1);
+		}
+
+		public void CopyTo (X509Certificate[] array, int index)
+		{
+			InnerList.CopyTo (array, index);
+		}
+		
+		public new X509CertificateEnumerator GetEnumerator ()
+		{
+			return new X509CertificateEnumerator (this);
+		}
+		
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return InnerList.GetEnumerator ();
+		}
+		
+		public override int GetHashCode () 
+		{
+			return InnerList.GetHashCode ();
+		}
+		
+		public int IndexOf (X509Certificate value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value");
+
+			byte[] hash = value.Hash;
+			for (int i=0; i < InnerList.Count; i++) {
+				X509Certificate x509 = (X509Certificate) InnerList [i];
+				if (Compare (x509.Hash, hash))
+					return i;
+			}
+			return -1;
+		}
+		
+		public void Insert (int index, X509Certificate value)
+		{
+			InnerList.Insert (index, value);
+		}
+		
+		public void Remove (X509Certificate value)
+		{
+			InnerList.Remove (value);
+		}
+
+		// private stuff
+
+		private bool Compare (byte[] array1, byte[] array2) 
+		{
+			if ((array1 == null) && (array2 == null))
+				return true;
+			if ((array1 == null) || (array2 == null))
+				return false;
+			if (array1.Length != array2.Length)
+				return false;
+			for (int i=0; i < array1.Length; i++) {
+				if (array1 [i] != array2 [i])
+					return false;
+			}
+			return true;
+		}
+
+		// Inner Class
+		
+		public class X509CertificateEnumerator : IEnumerator {
+
+			private IEnumerator enumerator;
+
+			// Constructors
+			
+			public X509CertificateEnumerator (X509CertificateCollection mappings)
+			{
+				enumerator = ((IEnumerable) mappings).GetEnumerator ();
+			}
+
+			// Properties
+			
+			public X509Certificate Current {
+				get { return (X509Certificate) enumerator.Current; }
+			}
+			
+			object IEnumerator.Current {
+				get { return enumerator.Current; }
+			}
+
+			// Methods
+			
+			bool IEnumerator.MoveNext ()
+			{
+				return enumerator.MoveNext ();
+			}
+			
+			void IEnumerator.Reset () 
+			{
+				enumerator.Reset ();
+			}
+			
+			public bool MoveNext () 
+			{
+				return enumerator.MoveNext ();
+			}
+			
+			public void Reset ()
+			{
+				enumerator.Reset ();
+			}
+		}		
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Extension.cs b/MediaBrowser.Server.Startup.Common/Security/X509Extension.cs
new file mode 100644
index 000000000..e82f52bac
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X509Extension.cs
@@ -0,0 +1,208 @@
+//
+// X509Extension.cs: Base class for all X.509 extensions.
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security
+{
+    /*
+	 * Extension  ::=  SEQUENCE  {
+	 *	extnID      OBJECT IDENTIFIER,
+	 *	critical    BOOLEAN DEFAULT FALSE,
+	 *	extnValue   OCTET STRING  
+	 * }
+	 */
+    public class X509Extension {
+
+		protected string extnOid;
+		protected bool extnCritical;
+		protected ASN1 extnValue;
+
+		protected X509Extension () 
+		{
+			extnCritical = false;
+		}
+
+		public X509Extension (ASN1 asn1) 
+		{
+			if ((asn1.Tag != 0x30) || (asn1.Count < 2))
+				throw new ArgumentException (("Invalid X.509 extension."));
+			if (asn1[0].Tag != 0x06)
+				throw new ArgumentException (("Invalid X.509 extension."));
+
+			extnOid = ASN1Convert.ToOid (asn1[0]);
+			extnCritical = ((asn1[1].Tag == 0x01) && (asn1[1].Value[0] == 0xFF));
+			// last element is an octet string which may need to be decoded
+			extnValue = asn1 [asn1.Count - 1];
+			if ((extnValue.Tag == 0x04) && (extnValue.Length > 0) && (extnValue.Count == 0)) {
+				try {
+					ASN1 encapsulated = new ASN1 (extnValue.Value);
+					extnValue.Value = null;
+					extnValue.Add (encapsulated);
+				}
+				catch {
+					// data isn't ASN.1
+				}
+			}
+			Decode ();
+		}
+
+		public X509Extension (X509Extension extension)
+		{
+			if (extension == null)
+				throw new ArgumentNullException ("extension");
+			if ((extension.Value == null) || (extension.Value.Tag != 0x04) || (extension.Value.Count != 1))
+				throw new ArgumentException (("Invalid X.509 extension."));
+
+			extnOid = extension.Oid;
+			extnCritical = extension.Critical;
+			extnValue = extension.Value;
+			Decode ();
+		}
+
+		// encode the extension *into* an OCTET STRING
+		protected virtual void Decode () 
+		{
+		}
+
+		// decode the extension from *inside* an OCTET STRING
+		protected virtual void Encode ()
+		{
+		}
+
+		public ASN1 ASN1 {
+			get {
+				ASN1 extension = new ASN1 (0x30);
+				extension.Add (ASN1Convert.FromOid (extnOid));
+				if (extnCritical)
+					extension.Add (new ASN1 (0x01, new byte [1] { 0xFF }));
+				Encode ();
+				extension.Add (extnValue);
+				return extension;
+			}
+		}
+
+		public string Oid {
+			get { return extnOid; }
+		}
+
+		public bool Critical {
+			get { return extnCritical; }
+			set { extnCritical = value; }
+		}
+
+		// this gets overrided with more meaningful names
+		public virtual string Name {
+			get { return extnOid; }
+		}
+
+		public ASN1 Value {
+			get {
+				if (extnValue == null) {
+					Encode ();
+				}
+				return extnValue;
+			}
+		}
+
+		public override bool Equals (object obj) 
+		{
+			if (obj == null)
+				return false;
+			
+			X509Extension ex = (obj as X509Extension);
+			if (ex == null)
+				return false;
+
+			if (extnCritical != ex.extnCritical)
+				return false;
+			if (extnOid != ex.extnOid)
+				return false;
+			if (extnValue.Length != ex.extnValue.Length)
+				return false;
+			
+                        for (int i=0; i < extnValue.Length; i++) {
+				if (extnValue [i] != ex.extnValue [i])
+					return false;
+			}
+			return true;
+		}
+
+		public byte[] GetBytes () 
+		{
+			return ASN1.GetBytes ();
+		}
+
+		public override int GetHashCode () 
+		{
+			// OID should be unique in a collection of extensions
+			return extnOid.GetHashCode ();
+		}
+
+		private void WriteLine (StringBuilder sb, int n, int pos) 
+		{
+			byte[] value = extnValue.Value;
+			int p = pos;
+			for (int j=0; j < 8; j++) {
+				if (j < n) {
+					sb.Append (value [p++].ToString ("X2", CultureInfo.InvariantCulture));
+					sb.Append (" ");
+				}
+				else
+					sb.Append ("   ");
+			}
+			sb.Append ("  ");
+			p = pos;
+			for (int j=0; j < n; j++) {
+				byte b = value [p++];
+				if (b < 0x20)
+					sb.Append (".");
+				else
+					sb.Append (Convert.ToChar (b));
+			}
+			sb.Append (Environment.NewLine);
+		}
+
+		public override string ToString () 
+		{
+			StringBuilder sb = new StringBuilder ();
+			int div = (extnValue.Length >> 3);
+			int rem = (extnValue.Length - (div << 3));
+			int x = 0;
+			for (int i=0; i < div; i++) {
+				WriteLine (sb, 8, x);
+				x += 8;
+			}
+			WriteLine (sb, rem, x);
+			return sb.ToString ();
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Extensions.cs b/MediaBrowser.Server.Startup.Common/Security/X509Extensions.cs
new file mode 100644
index 000000000..c7d5f0046
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X509Extensions.cs
@@ -0,0 +1,195 @@
+//
+// X509Extensions.cs: Handles X.509 extensions.
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2004 Novell (http://www.novell.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+
+namespace Emby.Common.Implementations.Security
+{
+    /*
+	 * Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
+	 * 
+	 * Note: 1..MAX -> There shouldn't be 0 Extensions in the ASN1 structure
+	 */
+    public sealed class X509ExtensionCollection : CollectionBase, IEnumerable {
+
+		private bool readOnly;
+
+		public X509ExtensionCollection () : base ()
+		{
+		}
+
+		public X509ExtensionCollection (ASN1 asn1) : this ()
+		{
+			readOnly = true;
+			if (asn1 == null)
+				return;
+			if (asn1.Tag != 0x30)
+				throw new Exception ("Invalid extensions format");
+			for (int i=0; i < asn1.Count; i++) {
+				X509Extension extension = new X509Extension (asn1 [i]);
+				InnerList.Add (extension);
+			}
+		}
+
+		public int Add (X509Extension extension) 
+		{
+			if (extension == null)
+				throw new ArgumentNullException ("extension");
+			if (readOnly)
+				throw new NotSupportedException ("Extensions are read only");
+		
+			return InnerList.Add (extension);
+		}
+
+		public void AddRange (X509Extension[] extension) 
+		{
+			if (extension == null)
+				throw new ArgumentNullException ("extension");
+			if (readOnly)
+				throw new NotSupportedException ("Extensions are read only");
+
+			for (int i = 0; i < extension.Length; i++) 
+				InnerList.Add (extension [i]);
+		}
+	
+		public void AddRange (X509ExtensionCollection collection) 
+		{
+			if (collection == null)
+				throw new ArgumentNullException ("collection");
+			if (readOnly)
+				throw new NotSupportedException ("Extensions are read only");
+
+			for (int i = 0; i < collection.InnerList.Count; i++) 
+				InnerList.Add (collection [i]);
+		}
+
+		public bool Contains (X509Extension extension) 
+		{
+			return (IndexOf (extension) != -1);
+		}
+
+		public bool Contains (string oid) 
+		{
+			return (IndexOf (oid) != -1);
+		}
+
+		public void CopyTo (X509Extension[] extensions, int index) 
+		{
+			if (extensions == null)
+				throw new ArgumentNullException ("extensions");
+
+			InnerList.CopyTo (extensions, index);
+		}
+
+		public int IndexOf (X509Extension extension) 
+		{
+			if (extension == null)
+				throw new ArgumentNullException ("extension");
+
+			for (int i=0; i < InnerList.Count; i++) {
+				X509Extension ex = (X509Extension) InnerList [i];
+				if (ex.Equals (extension))
+					return i;
+			}
+			return -1;
+		}
+
+		public int IndexOf (string oid) 
+		{
+			if (oid == null)
+				throw new ArgumentNullException ("oid");
+
+			for (int i=0; i < InnerList.Count; i++) {
+				X509Extension ex = (X509Extension) InnerList [i];
+				if (ex.Oid == oid)
+					return i;
+			}
+			return -1;
+		}
+
+		public void Insert (int index, X509Extension extension) 
+		{
+			if (extension == null)
+				throw new ArgumentNullException ("extension");
+
+			InnerList.Insert (index, extension);
+		}
+
+		public void Remove (X509Extension extension) 
+		{
+			if (extension == null)
+				throw new ArgumentNullException ("extension");
+
+			InnerList.Remove (extension);
+		}
+
+		public void Remove (string oid) 
+		{
+			if (oid == null)
+				throw new ArgumentNullException ("oid");
+
+			int index = IndexOf (oid);
+			if (index != -1)
+				InnerList.RemoveAt (index);
+		}
+
+		IEnumerator IEnumerable.GetEnumerator () 
+		{
+			return InnerList.GetEnumerator ();
+		}
+
+		public X509Extension this [int index] {
+			get { return (X509Extension) InnerList [index]; }
+		}
+
+		public X509Extension this [string oid] {
+			get {
+				int index = IndexOf (oid);
+				if (index == -1)
+					return null;
+				return (X509Extension) InnerList [index];
+			}
+		}
+
+		public byte[] GetBytes () 
+		{
+			if (InnerList.Count < 1)
+				return null;
+			ASN1 sequence = new ASN1 (0x30);
+			for (int i=0; i < InnerList.Count; i++) {
+				X509Extension x = (X509Extension) InnerList [i];
+				sequence.Add (x.ASN1);
+			}
+			return sequence.GetBytes ();
+		}
+	}
+}
diff --git a/MediaBrowser.Server.Startup.Common/Security/X520Attributes.cs b/MediaBrowser.Server.Startup.Common/Security/X520Attributes.cs
new file mode 100644
index 000000000..5062bf80a
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Security/X520Attributes.cs
@@ -0,0 +1,346 @@
+//
+// X520.cs: X.520 related stuff (attributes, RDN)
+//
+// Author:
+//	Sebastien Pouliot <sebastien@ximian.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+namespace Emby.Common.Implementations.Security
+{
+
+    // References:
+    // 1.	Information technology - Open Systems Interconnection - The Directory: Selected attribute types 
+    //	http://www.itu.int/rec/recommendation.asp?type=folders&lang=e&parent=T-REC-X.520 
+    // 2.	Internet X.509 Public Key Infrastructure Certificate and CRL Profile
+    //	http://www.ietf.org/rfc/rfc3280.txt
+    // 3.	A Summary of the X.500(96) User Schema for use with LDAPv3
+    //	http://www.faqs.org/rfcs/rfc2256.html
+    // 4.	RFC 2247 - Using Domains in LDAP/X.500 Distinguished Names
+    //	http://www.faqs.org/rfcs/rfc2247.html
+
+    /* 
+	 * AttributeTypeAndValue ::= SEQUENCE {
+	 * 	type     AttributeType,
+	 * 	value    AttributeValue 
+	 * }
+	 * 
+	 * AttributeType ::= OBJECT IDENTIFIER
+	 * 
+	 * AttributeValue ::= ANY DEFINED BY AttributeType
+	 */
+    public class X520 {
+
+		public abstract class AttributeTypeAndValue {
+			private string oid;
+			private string attrValue;
+			private int upperBound;
+			private byte encoding;
+
+			protected AttributeTypeAndValue (string oid, int upperBound)
+			{
+				this.oid = oid;
+				this.upperBound = upperBound;
+				this.encoding = 0xFF;
+			}
+
+			protected AttributeTypeAndValue (string oid, int upperBound, byte encoding) 
+			{
+				this.oid = oid;
+				this.upperBound = upperBound;
+				this.encoding = encoding;
+			}
+
+			public string Value {
+				get { return attrValue; }
+				set { 
+					if ((attrValue != null) && (attrValue.Length > upperBound)) {
+						string msg = ("Value length bigger than upperbound ({0}).");
+						throw new FormatException (String.Format (msg, upperBound));
+					}
+					attrValue = value; 
+				}
+			}
+
+			public ASN1 ASN1 {
+				get { return GetASN1 (); }
+			}
+
+			internal ASN1 GetASN1 (byte encoding) 
+			{
+				byte encode = encoding;
+				if (encode == 0xFF)
+					encode = SelectBestEncoding ();
+					
+				ASN1 asn1 = new ASN1 (0x30);
+				asn1.Add (ASN1Convert.FromOid (oid));
+				switch (encode) {
+					case 0x13:
+						// PRINTABLESTRING
+						asn1.Add (new ASN1 (0x13, Encoding.ASCII.GetBytes (attrValue)));
+						break;
+					case 0x16:
+						// IA5STRING
+						asn1.Add (new ASN1 (0x16, Encoding.ASCII.GetBytes (attrValue)));
+						break;
+					case 0x1E:
+						// BMPSTRING
+						asn1.Add (new ASN1 (0x1E, Encoding.BigEndianUnicode.GetBytes (attrValue)));
+						break;
+				}
+				return asn1;
+			}
+
+			internal ASN1 GetASN1 () 
+			{
+				return GetASN1 (encoding);
+			}
+
+			public byte[] GetBytes (byte encoding) 
+			{
+				return GetASN1 (encoding) .GetBytes ();
+			}
+
+			public byte[] GetBytes () 
+			{
+				return GetASN1 () .GetBytes ();
+			}
+
+			private byte SelectBestEncoding ()
+			{
+				foreach (char c in attrValue) {
+					switch (c) {
+					case '@':
+					case '_':
+						return 0x1E; // BMPSTRING
+					default:
+						if (c > 127)
+							return 0x1E; // BMPSTRING
+						break;
+					}
+				}
+				return 0x13; // PRINTABLESTRING
+			}
+		}
+
+		public class Name : AttributeTypeAndValue {
+
+			public Name () : base ("2.5.4.41", 32768) 
+			{
+			}
+		}
+
+		public class CommonName : AttributeTypeAndValue {
+
+			public CommonName () : base ("2.5.4.3", 64) 
+			{
+			}
+		}
+
+		// RFC2256, Section 5.6
+		public class SerialNumber : AttributeTypeAndValue {
+
+			// max length 64 bytes, Printable String only
+			public SerialNumber ()
+				: base ("2.5.4.5", 64, 0x13)
+			{
+			}
+		}
+
+		public class LocalityName : AttributeTypeAndValue {
+
+			public LocalityName () : base ("2.5.4.7", 128)
+			{
+			}
+		}
+
+		public class StateOrProvinceName : AttributeTypeAndValue {
+
+			public StateOrProvinceName () : base ("2.5.4.8", 128) 
+			{
+			}
+		}
+		 
+		public class OrganizationName : AttributeTypeAndValue {
+
+			public OrganizationName () : base ("2.5.4.10", 64)
+			{
+			}
+		}
+		 
+		public class OrganizationalUnitName : AttributeTypeAndValue {
+
+			public OrganizationalUnitName () : base ("2.5.4.11", 64)
+			{
+			}
+		}
+
+		// NOTE: Not part of RFC2253
+		public class EmailAddress : AttributeTypeAndValue {
+
+			public EmailAddress () : base ("1.2.840.113549.1.9.1", 128, 0x16)
+			{
+			}
+		}
+
+		// RFC2247, Section 4
+		public class DomainComponent : AttributeTypeAndValue {
+
+			// no maximum length defined
+			public DomainComponent ()
+				: base ("0.9.2342.19200300.100.1.25", Int32.MaxValue, 0x16)
+			{
+			}
+		}
+
+		// RFC1274, Section 9.3.1
+		public class UserId : AttributeTypeAndValue {
+
+			public UserId ()
+				: base ("0.9.2342.19200300.100.1.1", 256)
+			{
+			}
+		}
+
+		public class Oid : AttributeTypeAndValue {
+
+			public Oid (string oid)
+				: base (oid, Int32.MaxValue)
+			{
+			}
+		}
+
+		/* -- Naming attributes of type X520Title
+		 * id-at-title             AttributeType ::= { id-at 12 }
+		 * 
+		 * X520Title ::= CHOICE {
+		 *       teletexString     TeletexString   (SIZE (1..ub-title)),
+		 *       printableString   PrintableString (SIZE (1..ub-title)),
+		 *       universalString   UniversalString (SIZE (1..ub-title)),
+		 *       utf8String        UTF8String      (SIZE (1..ub-title)),
+		 *       bmpString         BMPString       (SIZE (1..ub-title)) 
+		 * }
+		 */
+		public class Title : AttributeTypeAndValue {
+
+			public Title () : base ("2.5.4.12", 64)
+			{
+			}
+		}
+
+		public class CountryName : AttributeTypeAndValue {
+
+			// (0x13) PRINTABLESTRING
+			public CountryName () : base ("2.5.4.6", 2, 0x13) 
+			{
+			}
+		}
+
+		public class DnQualifier : AttributeTypeAndValue {
+
+			// (0x13) PRINTABLESTRING
+			public DnQualifier () : base ("2.5.4.46", 2, 0x13) 
+			{
+			}
+		}
+
+		public class Surname : AttributeTypeAndValue {
+
+			public Surname () : base ("2.5.4.4", 32768) 
+			{
+			}
+		}
+
+		public class GivenName : AttributeTypeAndValue {
+
+			public GivenName () : base ("2.5.4.42", 16) 
+			{
+			}
+		}
+
+		public class Initial : AttributeTypeAndValue {
+
+			public Initial () : base ("2.5.4.43", 5) 
+			{
+			}
+		}
+
+	}
+        
+	/* From RFC3280
+	 * --  specifications of Upper Bounds MUST be regarded as mandatory
+	 * --  from Annex B of ITU-T X.411 Reference Definition of MTS Parameter
+	 * 
+	 * --  Upper Bounds
+	 * 
+	 * ub-name INTEGER ::= 32768
+	 * ub-common-name INTEGER ::= 64
+	 * ub-locality-name INTEGER ::= 128
+	 * ub-state-name INTEGER ::= 128
+	 * ub-organization-name INTEGER ::= 64
+	 * ub-organizational-unit-name INTEGER ::= 64
+	 * ub-title INTEGER ::= 64
+	 * ub-serial-number INTEGER ::= 64
+	 * ub-match INTEGER ::= 128
+	 * ub-emailaddress-length INTEGER ::= 128
+	 * ub-common-name-length INTEGER ::= 64
+	 * ub-country-name-alpha-length INTEGER ::= 2
+	 * ub-country-name-numeric-length INTEGER ::= 3
+	 * ub-domain-defined-attributes INTEGER ::= 4
+	 * ub-domain-defined-attribute-type-length INTEGER ::= 8
+	 * ub-domain-defined-attribute-value-length INTEGER ::= 128
+	 * ub-domain-name-length INTEGER ::= 16
+	 * ub-extension-attributes INTEGER ::= 256
+	 * ub-e163-4-number-length INTEGER ::= 15
+	 * ub-e163-4-sub-address-length INTEGER ::= 40
+	 * ub-generation-qualifier-length INTEGER ::= 3
+	 * ub-given-name-length INTEGER ::= 16
+	 * ub-initials-length INTEGER ::= 5
+	 * ub-integer-options INTEGER ::= 256
+	 * ub-numeric-user-id-length INTEGER ::= 32
+	 * ub-organization-name-length INTEGER ::= 64
+	 * ub-organizational-unit-name-length INTEGER ::= 32
+	 * ub-organizational-units INTEGER ::= 4
+	 * ub-pds-name-length INTEGER ::= 16
+	 * ub-pds-parameter-length INTEGER ::= 30
+	 * ub-pds-physical-address-lines INTEGER ::= 6
+	 * ub-postal-code-length INTEGER ::= 16
+	 * ub-pseudonym INTEGER ::= 128
+	 * ub-surname-length INTEGER ::= 40
+	 * ub-terminal-id-length INTEGER ::= 24
+	 * ub-unformatted-address-length INTEGER ::= 180
+	 * ub-x121-address-length INTEGER ::= 16
+	 * 
+	 * -- Note - upper bounds on string types, such as TeletexString, are
+	 * -- measured in characters.  Excepting PrintableString or IA5String, a
+	 * -- significantly greater number of octets will be required to hold
+	 * -- such a value.  As a minimum, 16 octets, or twice the specified
+	 * -- upper bound, whichever is the larger, should be allowed for
+	 * -- TeletexString.  For UTF8String or UniversalString at least four
+	 * -- times the upper bound should be allowed.
+	 */
+}
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 666ba640e..eaf4f3148 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -131,7 +131,6 @@
     <Compile Include="Native\Standby.cs" />
     <Compile Include="Native\ServerAuthorization.cs" />
     <Compile Include="Native\WindowsApp.cs" />
-    <Compile Include="Networking\CertificateGenerator.cs" />
     <Compile Include="Networking\NativeMethods.cs" />
     <Compile Include="Networking\NetworkManager.cs" />
     <Compile Include="Networking\NetworkShares.cs" />
diff --git a/MediaBrowser.ServerApplication/Networking/CertificateGenerator.cs b/MediaBrowser.ServerApplication/Networking/CertificateGenerator.cs
deleted file mode 100644
index a7b0d6c32..000000000
--- a/MediaBrowser.ServerApplication/Networking/CertificateGenerator.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-using MediaBrowser.Model.Logging;
-using System;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace MediaBrowser.ServerApplication.Networking
-{
-        // Copied from: http://blogs.msdn.com/b/dcook/archive/2014/05/16/9143036.aspx
-    // In case anybody is interested, source code is attached and is free for use by anybody as long as you don't hold me or Microsoft liable for it -- 
-    // I have no idea whether this is actually the right or best way to do this. Give it the X500 distinguished name, validity start and end dates, 
-    // and an optional password for encrypting the key data, and it will give you the PFX file data. Let me know if you find any bugs or have any suggestions.
-    internal class CertificateGenerator
-    {
-        internal static void CreateSelfSignCertificatePfx(
-            string fileName,
-            string hostname,
-            ILogger logger)
-        {
-            if (string.IsNullOrWhiteSpace(fileName))
-            {
-                throw new ArgumentNullException("fileName");
-            }
-
-            string x500 = string.Format("CN={0}", hostname);
-
-            DateTime startTime = DateTime.Now.AddDays(-2);
-            DateTime endTime = DateTime.Now.AddYears(10);
-
-            byte[] pfxData = CreateSelfSignCertificatePfx(
-                x500,
-                startTime,
-                endTime);
-
-            File.WriteAllBytes(fileName, pfxData);
-        }
-
-        private static byte[] CreateSelfSignCertificatePfx(
-            string x500,
-            DateTime startTime,
-            DateTime endTime)
-        {
-            byte[] pfxData;
-
-            if (x500 == null)
-            {
-                x500 = "";
-            }
-
-            SystemTime startSystemTime = ToSystemTime(startTime);
-            SystemTime endSystemTime = ToSystemTime(endTime);
-            string containerName = Guid.NewGuid().ToString();
-
-            GCHandle dataHandle = new GCHandle();
-            IntPtr providerContext = IntPtr.Zero;
-            IntPtr cryptKey = IntPtr.Zero;
-            IntPtr certContext = IntPtr.Zero;
-            IntPtr certStore = IntPtr.Zero;
-            IntPtr storeCertContext = IntPtr.Zero;
-            IntPtr passwordPtr = IntPtr.Zero;
-            RuntimeHelpers.PrepareConstrainedRegions();
-            try
-            {
-                Check(NativeMethods.CryptAcquireContextW(
-                    out providerContext,
-                    containerName,
-                    null,
-                    1, // PROV_RSA_FULL
-                    8)); // CRYPT_NEWKEYSET
-
-                Check(NativeMethods.CryptGenKey(
-                    providerContext,
-                    1, // AT_KEYEXCHANGE
-                    1 | 2048 << 16, // CRYPT_EXPORTABLE 2048 bit key
-                    out cryptKey));
-
-                IntPtr errorStringPtr;
-                int nameDataLength = 0;
-                byte[] nameData;
-
-                // errorStringPtr gets a pointer into the middle of the x500 string,
-                // so x500 needs to be pinned until after we've copied the value
-                // of errorStringPtr.
-                dataHandle = GCHandle.Alloc(x500, GCHandleType.Pinned);
-
-                if (!NativeMethods.CertStrToNameW(
-                    0x00010001, // X509_ASN_ENCODING | PKCS_7_ASN_ENCODING
-                    dataHandle.AddrOfPinnedObject(),
-                    3, // CERT_X500_NAME_STR = 3
-                    IntPtr.Zero,
-                    null,
-                    ref nameDataLength,
-                    out errorStringPtr))
-                {
-                    string error = Marshal.PtrToStringUni(errorStringPtr);
-                    throw new ArgumentException(error);
-                }
-
-                nameData = new byte[nameDataLength];
-
-                if (!NativeMethods.CertStrToNameW(
-                    0x00010001, // X509_ASN_ENCODING | PKCS_7_ASN_ENCODING
-                    dataHandle.AddrOfPinnedObject(),
-                    3, // CERT_X500_NAME_STR = 3
-                    IntPtr.Zero,
-                    nameData,
-                    ref nameDataLength,
-                    out errorStringPtr))
-                {
-                    string error = Marshal.PtrToStringUni(errorStringPtr);
-                    throw new ArgumentException(error);
-                }
-
-                dataHandle.Free();
-
-                dataHandle = GCHandle.Alloc(nameData, GCHandleType.Pinned);
-                CryptoApiBlob nameBlob = new CryptoApiBlob(
-                    nameData.Length,
-                    dataHandle.AddrOfPinnedObject());
-
-                CryptKeyProviderInformation kpi = new CryptKeyProviderInformation();
-                kpi.ContainerName = containerName;
-                kpi.ProviderType = 1; // PROV_RSA_FULL
-                kpi.KeySpec = 1; // AT_KEYEXCHANGE
-
-                CryptAlgorithmIdentifier sha256Identifier = new CryptAlgorithmIdentifier();
-                sha256Identifier.pszObjId = "1.2.840.113549.1.1.11";
-
-                certContext = NativeMethods.CertCreateSelfSignCertificate(
-                    providerContext,
-                    ref nameBlob,
-                    0,
-                    ref kpi,
-                    ref sha256Identifier,
-                    ref startSystemTime,
-                    ref endSystemTime,
-                    IntPtr.Zero);
-                Check(certContext != IntPtr.Zero);
-                dataHandle.Free();
-
-                certStore = NativeMethods.CertOpenStore(
-                    "Memory", // sz_CERT_STORE_PROV_MEMORY
-                    0,
-                    IntPtr.Zero,
-                    0x2000, // CERT_STORE_CREATE_NEW_FLAG
-                    IntPtr.Zero);
-                Check(certStore != IntPtr.Zero);
-
-                Check(NativeMethods.CertAddCertificateContextToStore(
-                    certStore,
-                    certContext,
-                    1, // CERT_STORE_ADD_NEW
-                    out storeCertContext));
-
-                NativeMethods.CertSetCertificateContextProperty(
-                    storeCertContext,
-                    2, // CERT_KEY_PROV_INFO_PROP_ID
-                    0,
-                    ref kpi);
-
-                CryptoApiBlob pfxBlob = new CryptoApiBlob();
-                Check(NativeMethods.PFXExportCertStoreEx(
-                    certStore,
-                    ref pfxBlob,
-                    passwordPtr,
-                    IntPtr.Zero,
-                    7)); // EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY | REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY
-
-                pfxData = new byte[pfxBlob.DataLength];
-                dataHandle = GCHandle.Alloc(pfxData, GCHandleType.Pinned);
-                pfxBlob.Data = dataHandle.AddrOfPinnedObject();
-                Check(NativeMethods.PFXExportCertStoreEx(
-                    certStore,
-                    ref pfxBlob,
-                    passwordPtr,
-                    IntPtr.Zero,
-                    7)); // EXPORT_PRIVATE_KEYS | REPORT_NO_PRIVATE_KEY | REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY
-                dataHandle.Free();
-            }
-            finally
-            {
-                if (passwordPtr != IntPtr.Zero)
-                {
-                    Marshal.ZeroFreeCoTaskMemUnicode(passwordPtr);
-                }
-
-                if (dataHandle.IsAllocated)
-                {
-                    dataHandle.Free();
-                }
-
-                if (certContext != IntPtr.Zero)
-                {
-                    NativeMethods.CertFreeCertificateContext(certContext);
-                }
-
-                if (storeCertContext != IntPtr.Zero)
-                {
-                    NativeMethods.CertFreeCertificateContext(storeCertContext);
-                }
-
-                if (certStore != IntPtr.Zero)
-                {
-                    NativeMethods.CertCloseStore(certStore, 0);
-                }
-
-                if (cryptKey != IntPtr.Zero)
-                {
-                    NativeMethods.CryptDestroyKey(cryptKey);
-                }
-
-                if (providerContext != IntPtr.Zero)
-                {
-                    NativeMethods.CryptReleaseContext(providerContext, 0);
-                    NativeMethods.CryptAcquireContextW(
-                        out providerContext,
-                        containerName,
-                        null,
-                        1, // PROV_RSA_FULL
-                        0x10); // CRYPT_DELETEKEYSET
-                }
-            }
-
-            return pfxData;
-        }
-
-        private static SystemTime ToSystemTime(DateTime dateTime)
-        {
-            long fileTime = dateTime.ToFileTime();
-            SystemTime systemTime;
-            Check(NativeMethods.FileTimeToSystemTime(ref fileTime, out systemTime));
-            return systemTime;
-        }
-
-        private static void Check(bool nativeCallSucceeded)
-        {
-            if (!nativeCallSucceeded)
-            {
-                int error = Marshal.GetHRForLastWin32Error();
-                Marshal.ThrowExceptionForHR(error);
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.ServerApplication/Networking/NetworkManager.cs b/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
index 62e1b5228..7b4379abf 100644
--- a/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
+++ b/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.IO;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using System;
@@ -8,14 +7,13 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Emby.Common.Implementations.Networking;
 
 namespace MediaBrowser.ServerApplication.Networking
 {
     /// <summary>
     /// Class NetUtils
     /// </summary>
-    public class NetworkManager : BaseNetworkManager, INetworkManager
+    public class NetworkManager : Server.Startup.Common.Networking.NetworkManager
     {
         public NetworkManager(ILogger logger)
             : base(logger)
@@ -160,16 +158,6 @@ namespace MediaBrowser.ServerApplication.Networking
             });
         }
 
-        /// <summary>
-        /// Generates a self signed certificate at the locatation specified by <paramref name="certificatePath"/>.
-        /// </summary>
-        /// <param name="certificatePath">The path to generate the certificate.</param>
-        /// <param name="hostname">The common name for the certificate.</param>
-        public void GenerateSelfSignedSslCertificate(string certificatePath, string hostname)
-        {
-            CertificateGenerator.CreateSelfSignCertificatePfx(certificatePath, hostname, Logger);
-        }
-
         /// <summary>
         /// Gets the network prefix.
         /// </summary>
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 6803ad306..ebd11ca9a 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -79,19 +79,19 @@ namespace MediaBrowser.WebDashboard.Api
     /// <summary>
     /// Class DashboardService
     /// </summary>
-    public class DashboardService : IService, IHasResultFactory
+    public class DashboardService : IService, IRequiresRequest
     {
         /// <summary>
         /// Gets or sets the logger.
         /// </summary>
         /// <value>The logger.</value>
-        public ILogger Logger { get; set; }
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Gets or sets the HTTP result factory.
         /// </summary>
         /// <value>The HTTP result factory.</value>
-        public IHttpResultFactory ResultFactory { get; set; }
+        private readonly IHttpResultFactory _resultFactory;
 
         /// <summary>
         /// Gets or sets the request context.
@@ -120,7 +120,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// <param name="appHost">The app host.</param>
         /// <param name="serverConfigurationManager">The server configuration manager.</param>
         /// <param name="fileSystem">The file system.</param>
-        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, IAssemblyInfo assemblyInfo)
+        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, IAssemblyInfo assemblyInfo, ILogger logger, IHttpResultFactory resultFactory)
         {
             _appHost = appHost;
             _serverConfigurationManager = serverConfigurationManager;
@@ -128,6 +128,8 @@ namespace MediaBrowser.WebDashboard.Api
             _localization = localization;
             _jsonSerializer = jsonSerializer;
             _assemblyInfo = assemblyInfo;
+            _logger = logger;
+            _resultFactory = resultFactory;
         }
 
         /// <summary>
@@ -159,7 +161,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             if (plugin != null && stream != null)
             {
-                return ResultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator().ModifyHtml("dummy.html", stream, null, _appHost.ApplicationVersion.ToString(), null, false));
+                return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator().ModifyHtml("dummy.html", stream, null, _appHost.ApplicationVersion.ToString(), null, false));
             }
 
             throw new ResourceNotFoundException();
@@ -203,7 +205,7 @@ namespace MediaBrowser.WebDashboard.Api
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error getting plugin information from {0}", ex, p.GetType().Name);
+                    _logger.ErrorException("Error getting plugin information from {0}", ex, p.GetType().Name);
                     return null;
                 }
             })
@@ -212,7 +214,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             configPages.AddRange(_appHost.Plugins.SelectMany(GetConfigPages));
 
-            return ResultFactory.GetOptimizedResult(Request, configPages);
+            return _resultFactory.GetOptimizedResult(Request, configPages);
         }
 
         private IEnumerable<Tuple<PluginPageInfo, IPlugin>> GetPluginPages()
@@ -280,7 +282,7 @@ namespace MediaBrowser.WebDashboard.Api
                 !contentType.StartsWith("font/", StringComparison.OrdinalIgnoreCase))
             {
                 var stream = await GetResourceStream(path, localizationCulture).ConfigureAwait(false);
-                return ResultFactory.GetResult(stream, contentType);
+                return _resultFactory.GetResult(stream, contentType);
             }
 
             TimeSpan? cacheDuration = null;
@@ -294,7 +296,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             var cacheKey = (_appHost.ApplicationVersion.ToString() + (localizationCulture ?? string.Empty) + path).GetMD5();
 
-            return await ResultFactory.GetStaticResult(Request, cacheKey, null, cacheDuration, contentType, () => GetResourceStream(path, localizationCulture)).ConfigureAwait(false);
+            return await _resultFactory.GetStaticResult(Request, cacheKey, null, cacheDuration, contentType, () => GetResourceStream(path, localizationCulture)).ConfigureAwait(false);
         }
 
         private string GetLocalizationCulture()
@@ -318,7 +320,7 @@ namespace MediaBrowser.WebDashboard.Api
 
         private PackageCreator GetPackageCreator()
         {
-            return new PackageCreator(_fileSystem, _localization, Logger, _serverConfigurationManager, _jsonSerializer);
+            return new PackageCreator(_fileSystem, _localization, _logger, _serverConfigurationManager, _jsonSerializer);
         }
 
         private List<string> GetDeployIgnoreExtensions()
-- 
cgit v1.2.3


From 01fc207b62151a858c0d7edb802a24690505bb95 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 10 Nov 2016 20:37:20 -0500
Subject: update portable components

---
 .../Serialization/JsonSerializer.cs                | 227 ++++++
 Emby.Common.Implementations/project.json           |  45 +-
 .../Emby.Server.Implementations.csproj             |   4 +
 .../HttpServer/HttpResultFactory.cs                | 847 +++++++++++++++++++++
 .../Library/Validators/PeopleValidator.cs          |  18 +-
 .../HttpServer/HttpListenerHost.cs                 |  60 +-
 .../HttpServer/HttpResultFactory.cs                | 835 --------------------
 .../SocketSharp/WebSocketSharpRequest.cs           |  32 +-
 .../MediaBrowser.Server.Implementations.csproj     |  13 +-
 .../Serialization/JsonSerializer.cs                | 227 ------
 .../packages.config                                |   1 +
 .../ApplicationHost.cs                             |   3 +-
 12 files changed, 1173 insertions(+), 1139 deletions(-)
 create mode 100644 Emby.Common.Implementations/Serialization/JsonSerializer.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
 delete mode 100644 MediaBrowser.Server.Implementations/Serialization/JsonSerializer.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Common.Implementations/Serialization/JsonSerializer.cs b/Emby.Common.Implementations/Serialization/JsonSerializer.cs
new file mode 100644
index 000000000..c9db33689
--- /dev/null
+++ b/Emby.Common.Implementations/Serialization/JsonSerializer.cs
@@ -0,0 +1,227 @@
+using System;
+using System.IO;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+
+namespace Emby.Common.Implementations.Serialization
+{
+    /// <summary>
+    /// Provides a wrapper around third party json serialization.
+    /// </summary>
+    public class JsonSerializer : IJsonSerializer
+    {
+        private readonly IFileSystem _fileSystem;
+        private readonly ILogger _logger;
+
+        public JsonSerializer(IFileSystem fileSystem, ILogger logger)
+        {
+            _fileSystem = fileSystem;
+            _logger = logger;
+            Configure();
+        }
+
+        /// <summary>
+        /// Serializes to stream.
+        /// </summary>
+        /// <param name="obj">The obj.</param>
+        /// <param name="stream">The stream.</param>
+        /// <exception cref="System.ArgumentNullException">obj</exception>
+        public void SerializeToStream(object obj, Stream stream)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+
+            if (stream == null)
+            {
+                throw new ArgumentNullException("stream");
+            }
+
+            ServiceStack.Text.JsonSerializer.SerializeToStream(obj, obj.GetType(), stream);
+        }
+
+        /// <summary>
+        /// Serializes to file.
+        /// </summary>
+        /// <param name="obj">The obj.</param>
+        /// <param name="file">The file.</param>
+        /// <exception cref="System.ArgumentNullException">obj</exception>
+        public void SerializeToFile(object obj, string file)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+
+            if (string.IsNullOrEmpty(file))
+            {
+                throw new ArgumentNullException("file");
+            }
+
+			using (Stream stream = _fileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+            {
+                SerializeToStream(obj, stream);
+            }
+        }
+
+        private Stream OpenFile(string path)
+        {
+            _logger.Debug("Deserializing file {0}", path);
+            return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 131072);
+        }
+
+        /// <summary>
+        /// Deserializes from file.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="file">The file.</param>
+        /// <returns>System.Object.</returns>
+        /// <exception cref="System.ArgumentNullException">type</exception>
+        public object DeserializeFromFile(Type type, string file)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException("type");
+            }
+
+            if (string.IsNullOrEmpty(file))
+            {
+                throw new ArgumentNullException("file");
+            }
+
+            using (Stream stream = OpenFile(file))
+            {
+                return DeserializeFromStream(stream, type);
+            }
+        }
+
+        /// <summary>
+        /// Deserializes from file.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="file">The file.</param>
+        /// <returns>``0.</returns>
+        /// <exception cref="System.ArgumentNullException">file</exception>
+        public T DeserializeFromFile<T>(string file)
+            where T : class
+        {
+            if (string.IsNullOrEmpty(file))
+            {
+                throw new ArgumentNullException("file");
+            }
+
+            using (Stream stream = OpenFile(file))
+            {
+                return DeserializeFromStream<T>(stream);
+            }
+        }
+
+        /// <summary>
+        /// Deserializes from stream.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="stream">The stream.</param>
+        /// <returns>``0.</returns>
+        /// <exception cref="System.ArgumentNullException">stream</exception>
+        public T DeserializeFromStream<T>(Stream stream)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException("stream");
+            }
+
+            return ServiceStack.Text.JsonSerializer.DeserializeFromStream<T>(stream);
+        }
+
+        /// <summary>
+        /// Deserializes from string.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="text">The text.</param>
+        /// <returns>``0.</returns>
+        /// <exception cref="System.ArgumentNullException">text</exception>
+        public T DeserializeFromString<T>(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                throw new ArgumentNullException("text");
+            }
+
+            return ServiceStack.Text.JsonSerializer.DeserializeFromString<T>(text);
+        }
+
+        /// <summary>
+        /// Deserializes from stream.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <param name="type">The type.</param>
+        /// <returns>System.Object.</returns>
+        /// <exception cref="System.ArgumentNullException">stream</exception>
+        public object DeserializeFromStream(Stream stream, Type type)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException("stream");
+            }
+
+            if (type == null)
+            {
+                throw new ArgumentNullException("type");
+            }
+
+            return ServiceStack.Text.JsonSerializer.DeserializeFromStream(type, stream);
+        }
+
+        /// <summary>
+        /// Configures this instance.
+        /// </summary>
+        private void Configure()
+        {
+            ServiceStack.Text.JsConfig.DateHandler = ServiceStack.Text.DateHandler.ISO8601;
+            ServiceStack.Text.JsConfig.ExcludeTypeInfo = true;
+            ServiceStack.Text.JsConfig.IncludeNullValues = false;
+            ServiceStack.Text.JsConfig.AlwaysUseUtc = true;
+            ServiceStack.Text.JsConfig.AssumeUtc = true;
+        }
+
+        /// <summary>
+        /// Deserializes from string.
+        /// </summary>
+        /// <param name="json">The json.</param>
+        /// <param name="type">The type.</param>
+        /// <returns>System.Object.</returns>
+        /// <exception cref="System.ArgumentNullException">json</exception>
+        public object DeserializeFromString(string json, Type type)
+        {
+            if (string.IsNullOrEmpty(json))
+            {
+                throw new ArgumentNullException("json");
+            }
+
+            if (type == null)
+            {
+                throw new ArgumentNullException("type");
+            }
+
+            return ServiceStack.Text.JsonSerializer.DeserializeFromString(json, type);
+        }
+
+        /// <summary>
+        /// Serializes to string.
+        /// </summary>
+        /// <param name="obj">The obj.</param>
+        /// <returns>System.String.</returns>
+        /// <exception cref="System.ArgumentNullException">obj</exception>
+        public string SerializeToString(object obj)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+
+            return ServiceStack.Text.JsonSerializer.SerializeToString(obj, obj.GetType());
+        }
+    }
+}
diff --git a/Emby.Common.Implementations/project.json b/Emby.Common.Implementations/project.json
index 2b2357e38..dd304606b 100644
--- a/Emby.Common.Implementations/project.json
+++ b/Emby.Common.Implementations/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    
+
   },
 
   "frameworks": {
@@ -19,46 +19,49 @@
         "System.Text.Encoding": "4.0.0.0",
         "System.Threading": "4.0.0.0",
         "System.Threading.Tasks": "4.0.0.0",
-		"System.Xml.ReaderWriter": "4.0.0"
+        "System.Xml.ReaderWriter": "4.0.0"
       },
       "dependencies": {
         "SimpleInjector": "3.2.4",
+        "ServiceStack.Text": "4.5.4",
         "NLog": "4.4.0-betaV15",
         "MediaBrowser.Model": {
           "target": "project"
         },
         "MediaBrowser.Common": {
           "target": "project"
-        }      
-	}
+        }
+      }
     },
     "netstandard1.6": {
       "imports": "dnxcore50",
       "dependencies": {
         "NETStandard.Library": "1.6.0",
-		"System.IO.FileSystem.DriveInfo": "4.0.0",
-		"System.Diagnostics.Process": "4.1.0",
-		"System.Threading.Timer": "4.0.1",
-		"System.Net.Requests": "4.0.11",
-		"System.Xml.ReaderWriter": "4.0.11",
-		"System.Xml.XmlSerializer": "4.0.11",
-		"System.Net.Http": "4.1.0",
-		"System.Net.Primitives": "4.0.11",
-		"System.Net.Sockets": "4.1.0",
-		"System.Net.NetworkInformation": "4.1.0",
-		"System.Net.NameResolution": "4.0.0",
-		"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
-		"System.Reflection": "4.1.0",
-		"System.Reflection.Primitives": "4.0.1",
-		"System.Runtime.Loader": "4.0.0",
-		"SimpleInjector": "3.2.4",
+        "System.IO.FileSystem.DriveInfo": "4.0.0",
+        "System.Diagnostics.Process": "4.1.0",
+        "System.Threading.Timer": "4.0.1",
+        "System.Net.Requests": "4.0.11",
+        "System.Xml.ReaderWriter": "4.0.11",
+        "System.Xml.XmlSerializer": "4.0.11",
+        "System.Net.Http": "4.1.0",
+        "System.Net.Primitives": "4.0.11",
+        "System.Net.Sockets": "4.1.0",
+        "System.Net.NetworkInformation": "4.1.0",
+        "System.Net.NameResolution": "4.0.0",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
+        "System.Reflection": "4.1.0",
+        "System.Reflection.Primitives": "4.0.1",
+        "System.Runtime.Loader": "4.0.0",
+        "SimpleInjector": "3.2.4",
+        "ServiceStack.Text.Core": "1.0.27",
         "NLog": "4.4.0-betaV15",
         "MediaBrowser.Model": {
           "target": "project"
         },
         "MediaBrowser.Common": {
           "target": "project"
-        }      }
+        }
+      }
     }
   }
 }
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 7e885b779..3f55bd7fb 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -69,6 +69,7 @@
     <Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
     <Compile Include="FileOrganization\TvFolderOrganizer.cs" />
     <Compile Include="HttpServer\GetSwaggerResource.cs" />
+    <Compile Include="HttpServer\HttpResultFactory.cs" />
     <Compile Include="HttpServer\LoggerUtils.cs" />
     <Compile Include="HttpServer\RangeRequestWriter.cs" />
     <Compile Include="HttpServer\ResponseFilter.cs" />
@@ -263,6 +264,9 @@
       <Project>{442b5058-dcaf-4263-bb6a-f21e31120a1b}</Project>
       <Name>MediaBrowser.Providers</Name>
     </ProjectReference>
+    <Reference Include="ServiceStack">
+      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
+    </Reference>
     <Reference Include="SocketHttpListener.Portable">
       <HintPath>..\ThirdParty\emby\SocketHttpListener.Portable.dll</HintPath>
     </Reference>
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
new file mode 100644
index 000000000..bbd556661
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -0,0 +1,847 @@
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Net;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using Emby.Server.Implementations.HttpServer;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Services;
+using ServiceStack;
+using ServiceStack.Host;
+using IRequest = MediaBrowser.Model.Services.IRequest;
+using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
+using StreamWriter = Emby.Server.Implementations.HttpServer.StreamWriter;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    /// <summary>
+    /// Class HttpResultFactory
+    /// </summary>
+    public class HttpResultFactory : IHttpResultFactory
+    {
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+        private readonly IFileSystem _fileSystem;
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly IXmlSerializer _xmlSerializer;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpResultFactory" /> class.
+        /// </summary>
+        /// <param name="logManager">The log manager.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <param name="jsonSerializer">The json serializer.</param>
+        public HttpResultFactory(ILogManager logManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer)
+        {
+            _fileSystem = fileSystem;
+            _jsonSerializer = jsonSerializer;
+            _xmlSerializer = xmlSerializer;
+            _logger = logManager.GetLogger("HttpResultFactory");
+        }
+
+        /// <summary>
+        /// Gets the result.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <param name="responseHeaders">The response headers.</param>
+        /// <returns>System.Object.</returns>
+        public object GetResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
+        {
+            return GetHttpResult(content, contentType, responseHeaders);
+        }
+
+        /// <summary>
+        /// Gets the HTTP result.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <param name="responseHeaders">The response headers.</param>
+        /// <returns>IHasHeaders.</returns>
+        private IHasHeaders GetHttpResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
+        {
+            IHasHeaders result;
+
+            var stream = content as Stream;
+
+            if (stream != null)
+            {
+                result = new StreamWriter(stream, contentType, _logger);
+            }
+
+            else
+            {
+                var bytes = content as byte[];
+
+                if (bytes != null)
+                {
+                    result = new StreamWriter(bytes, contentType, _logger);
+                }
+                else
+                {
+                    var text = content as string;
+
+                    if (text != null)
+                    {
+                        result = new StreamWriter(Encoding.UTF8.GetBytes(text), contentType, _logger);
+                    }
+                    else
+                    {
+                        result = new HttpResult(content, contentType);
+                    }
+                }
+            }
+            if (responseHeaders == null)
+            {
+                responseHeaders = new Dictionary<string, string>();
+            }
+
+            responseHeaders["Expires"] = "-1";
+            AddResponseHeaders(result, responseHeaders);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the optimized result.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="requestContext">The request context.</param>
+        /// <param name="result">The result.</param>
+        /// <param name="responseHeaders">The response headers.</param>
+        /// <returns>System.Object.</returns>
+        /// <exception cref="System.ArgumentNullException">result</exception>
+        public object GetOptimizedResult<T>(IRequest requestContext, T result, IDictionary<string, string> responseHeaders = null)
+            where T : class
+        {
+            return GetOptimizedResultInternal<T>(requestContext, result, true, responseHeaders);
+        }
+
+        private object GetOptimizedResultInternal<T>(IRequest requestContext, T result, bool addCachePrevention, IDictionary<string, string> responseHeaders = null)
+          where T : class
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException("result");
+            }
+
+            var optimizedResult = ToOptimizedResult(requestContext, result);
+
+            if (responseHeaders == null)
+            {
+                responseHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            if (addCachePrevention)
+            {
+                responseHeaders["Expires"] = "-1";
+            }
+
+            // Apply headers
+            var hasHeaders = optimizedResult as IHasHeaders;
+
+            if (hasHeaders != null)
+            {
+                AddResponseHeaders(hasHeaders, responseHeaders);
+            }
+
+            return optimizedResult;
+        }
+
+        public static string GetCompressionType(IRequest request)
+        {
+            var acceptEncoding = request.Headers["Accept-Encoding"];
+
+            if (!string.IsNullOrWhiteSpace(acceptEncoding))
+            {
+                if (acceptEncoding.Contains("deflate"))
+                    return "deflate";
+
+                if (acceptEncoding.Contains("gzip"))
+                    return "gzip";
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the optimized result for the IRequestContext. 
+        /// Does not use or store results in any cache.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public object ToOptimizedResult<T>(IRequest request, T dto)
+        {
+            request.Response.Dto = dto;
+
+            var compressionType = GetCompressionType(request);
+            if (compressionType == null)
+            {
+                var contentType = request.ResponseContentType;
+
+                switch (GetRealContentType(contentType))
+                {
+                    case "application/xml":
+                    case "text/xml":
+                    case "text/xml; charset=utf-8": //"text/xml; charset=utf-8" also matches xml
+                        return SerializeToXmlString(dto);
+
+                    case "application/json":
+                    case "text/json":
+                        return _jsonSerializer.SerializeToString(dto);
+                }
+            }
+
+            using (var ms = new MemoryStream())
+            {
+                using (var compressionStream = GetCompressionStream(ms, compressionType))
+                {
+                    ContentTypes.Instance.SerializeToStream(request, dto, compressionStream);
+                    compressionStream.Dispose();
+
+                    var compressedBytes = ms.ToArray();
+
+                    var httpResult = new HttpResult(compressedBytes, request.ResponseContentType)
+                    {
+                        Status = request.Response.StatusCode
+                    };
+
+                    httpResult.Headers["Content-Length"] = compressedBytes.Length.ToString(UsCulture);
+                    httpResult.Headers["Content-Encoding"] = compressionType;
+
+                    return httpResult;
+                }
+            }
+        }
+
+        public static string GetRealContentType(string contentType)
+        {
+            return contentType == null
+                       ? null
+                       : contentType.Split(';')[0].ToLower().Trim();
+        }
+
+        public static string SerializeToXmlString(object from)
+        {
+            using (var ms = new MemoryStream())
+            {
+                var xwSettings = new XmlWriterSettings();
+                xwSettings.Encoding = new UTF8Encoding(false);
+                xwSettings.OmitXmlDeclaration = false;
+
+                using (var xw = XmlWriter.Create(ms, xwSettings))
+                {
+                    var serializer = new DataContractSerializer(from.GetType());
+                    serializer.WriteObject(xw, from);
+                    xw.Flush();
+                    ms.Seek(0, SeekOrigin.Begin);
+                    var reader = new StreamReader(ms);
+                    return reader.ReadToEnd();
+                }
+            }
+        }
+
+        private static Stream GetCompressionStream(Stream outputStream, string compressionType)
+        {
+            if (compressionType == "deflate")
+                return new DeflateStream(outputStream, CompressionMode.Compress);
+            if (compressionType == "gzip")
+                return new GZipStream(outputStream, CompressionMode.Compress);
+
+            throw new NotSupportedException(compressionType);
+        }
+
+        /// <summary>
+        /// Gets the optimized result using cache.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="requestContext">The request context.</param>
+        /// <param name="cacheKey">The cache key.</param>
+        /// <param name="lastDateModified">The last date modified.</param>
+        /// <param name="cacheDuration">Duration of the cache.</param>
+        /// <param name="factoryFn">The factory fn.</param>
+        /// <param name="responseHeaders">The response headers.</param>
+        /// <returns>System.Object.</returns>
+        /// <exception cref="System.ArgumentNullException">cacheKey
+        /// or
+        /// factoryFn</exception>
+        public object GetOptimizedResultUsingCache<T>(IRequest requestContext, Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration, Func<T> factoryFn, IDictionary<string, string> responseHeaders = null)
+               where T : class
+        {
+            if (cacheKey == Guid.Empty)
+            {
+                throw new ArgumentNullException("cacheKey");
+            }
+            if (factoryFn == null)
+            {
+                throw new ArgumentNullException("factoryFn");
+            }
+
+            var key = cacheKey.ToString("N");
+
+            if (responseHeaders == null)
+            {
+                responseHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            // See if the result is already cached in the browser
+            var result = GetCachedResult(requestContext, responseHeaders, cacheKey, key, lastDateModified, cacheDuration, null);
+
+            if (result != null)
+            {
+                return result;
+            }
+
+            return GetOptimizedResultInternal(requestContext, factoryFn(), false, responseHeaders);
+        }
+
+        /// <summary>
+        /// To the cached result.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="requestContext">The request context.</param>
+        /// <param name="cacheKey">The cache key.</param>
+        /// <param name="lastDateModified">The last date modified.</param>
+        /// <param name="cacheDuration">Duration of the cache.</param>
+        /// <param name="factoryFn">The factory fn.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <param name="responseHeaders">The response headers.</param>
+        /// <returns>System.Object.</returns>
+        /// <exception cref="System.ArgumentNullException">cacheKey</exception>
+        public object GetCachedResult<T>(IRequest requestContext, Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration, Func<T> factoryFn, string contentType, IDictionary<string, string> responseHeaders = null)
+          where T : class
+        {
+            if (cacheKey == Guid.Empty)
+            {
+                throw new ArgumentNullException("cacheKey");
+            }
+            if (factoryFn == null)
+            {
+                throw new ArgumentNullException("factoryFn");
+            }
+
+            var key = cacheKey.ToString("N");
+
+            if (responseHeaders == null)
+            {
+                responseHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            // See if the result is already cached in the browser
+            var result = GetCachedResult(requestContext, responseHeaders, cacheKey, key, lastDateModified, cacheDuration, contentType);
+
+            if (result != null)
+            {
+                return result;
+            }
+
+            result = factoryFn();
+
+            // Apply caching headers
+            var hasHeaders = result as IHasHeaders;
+
+            if (hasHeaders != null)
+            {
+                AddResponseHeaders(hasHeaders, responseHeaders);
+                return hasHeaders;
+            }
+
+            IHasHeaders httpResult;
+
+            var stream = result as Stream;
+
+            if (stream != null)
+            {
+                httpResult = new StreamWriter(stream, contentType, _logger);
+            }
+            else
+            {
+                // Otherwise wrap into an HttpResult
+                httpResult = new HttpResult(result, contentType ?? "text/html", HttpStatusCode.NotModified);
+            }
+
+            AddResponseHeaders(httpResult, responseHeaders);
+
+            return httpResult;
+        }
+
+        /// <summary>
+        /// Pres the process optimized result.
+        /// </summary>
+        /// <param name="requestContext">The request context.</param>
+        /// <param name="responseHeaders">The responseHeaders.</param>
+        /// <param name="cacheKey">The cache key.</param>
+        /// <param name="cacheKeyString">The cache key string.</param>
+        /// <param name="lastDateModified">The last date modified.</param>
+        /// <param name="cacheDuration">Duration of the cache.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <returns>System.Object.</returns>
+        private object GetCachedResult(IRequest requestContext, IDictionary<string, string> responseHeaders, Guid cacheKey, string cacheKeyString, DateTime? lastDateModified, TimeSpan? cacheDuration, string contentType)
+        {
+            responseHeaders["ETag"] = string.Format("\"{0}\"", cacheKeyString);
+
+            if (IsNotModified(requestContext, cacheKey, lastDateModified, cacheDuration))
+            {
+                AddAgeHeader(responseHeaders, lastDateModified);
+                AddExpiresHeader(responseHeaders, cacheKeyString, cacheDuration);
+
+                var result = new HttpResult(new byte[] { }, contentType ?? "text/html", HttpStatusCode.NotModified);
+
+                AddResponseHeaders(result, responseHeaders);
+
+                return result;
+            }
+
+            AddCachingHeaders(responseHeaders, cacheKeyString, lastDateModified, cacheDuration);
+
+            return null;
+        }
+
+        public Task<object> GetStaticFileResult(IRequest requestContext,
+            string path,
+            FileShareMode fileShare = FileShareMode.Read)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentNullException("path");
+            }
+
+            return GetStaticFileResult(requestContext, new StaticFileResultOptions
+            {
+                Path = path,
+                FileShare = fileShare
+            });
+        }
+
+        public Task<object> GetStaticFileResult(IRequest requestContext,
+            StaticFileResultOptions options)
+        {
+            var path = options.Path;
+            var fileShare = options.FileShare;
+
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentNullException("path");
+            }
+
+            if (fileShare != FileShareMode.Read && fileShare != FileShareMode.ReadWrite)
+            {
+                throw new ArgumentException("FileShare must be either Read or ReadWrite");
+            }
+
+            if (string.IsNullOrWhiteSpace(options.ContentType))
+            {
+                options.ContentType = MimeTypes.GetMimeType(path);
+            }
+
+            if (!options.DateLastModified.HasValue)
+            {
+                options.DateLastModified = _fileSystem.GetLastWriteTimeUtc(path);
+            }
+
+            var cacheKey = path + options.DateLastModified.Value.Ticks;
+
+            options.CacheKey = cacheKey.GetMD5();
+            options.ContentFactory = () => Task.FromResult(GetFileStream(path, fileShare));
+
+            return GetStaticResult(requestContext, options);
+        }
+
+        /// <summary>
+        /// Gets the file stream.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="fileShare">The file share.</param>
+        /// <returns>Stream.</returns>
+        private Stream GetFileStream(string path, FileShareMode fileShare)
+        {
+            return _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, fileShare);
+        }
+
+        public Task<object> GetStaticResult(IRequest requestContext,
+            Guid cacheKey,
+            DateTime? lastDateModified,
+            TimeSpan? cacheDuration,
+            string contentType,
+            Func<Task<Stream>> factoryFn,
+            IDictionary<string, string> responseHeaders = null,
+            bool isHeadRequest = false)
+        {
+            return GetStaticResult(requestContext, new StaticResultOptions
+            {
+                CacheDuration = cacheDuration,
+                CacheKey = cacheKey,
+                ContentFactory = factoryFn,
+                ContentType = contentType,
+                DateLastModified = lastDateModified,
+                IsHeadRequest = isHeadRequest,
+                ResponseHeaders = responseHeaders
+            });
+        }
+
+        public async Task<object> GetStaticResult(IRequest requestContext, StaticResultOptions options)
+        {
+            var cacheKey = options.CacheKey;
+            options.ResponseHeaders = options.ResponseHeaders ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            var contentType = options.ContentType;
+
+            if (cacheKey == Guid.Empty)
+            {
+                throw new ArgumentNullException("cacheKey");
+            }
+            if (options.ContentFactory == null)
+            {
+                throw new ArgumentNullException("factoryFn");
+            }
+
+            var key = cacheKey.ToString("N");
+
+            // See if the result is already cached in the browser
+            var result = GetCachedResult(requestContext, options.ResponseHeaders, cacheKey, key, options.DateLastModified, options.CacheDuration, contentType);
+
+            if (result != null)
+            {
+                return result;
+            }
+
+            var compress = ShouldCompressResponse(requestContext, contentType);
+            var hasHeaders = await GetStaticResult(requestContext, options, compress).ConfigureAwait(false);
+            AddResponseHeaders(hasHeaders, options.ResponseHeaders);
+
+            return hasHeaders;
+        }
+
+        /// <summary>
+        /// Shoulds the compress response.
+        /// </summary>
+        /// <param name="requestContext">The request context.</param>
+        /// <param name="contentType">Type of the content.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
+        private bool ShouldCompressResponse(IRequest requestContext, string contentType)
+        {
+            // It will take some work to support compression with byte range requests
+            if (!string.IsNullOrEmpty(requestContext.Headers.Get("Range")))
+            {
+                return false;
+            }
+
+            // Don't compress media
+            if (contentType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase) || contentType.StartsWith("video/", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            // Don't compress images
+            if (contentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            if (contentType.StartsWith("font/", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+            if (contentType.StartsWith("application/", StringComparison.OrdinalIgnoreCase))
+            {
+                if (string.Equals(contentType, "application/x-javascript", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+                if (string.Equals(contentType, "application/xml", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// The us culture
+        /// </summary>
+        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
+        private async Task<IHasHeaders> GetStaticResult(IRequest requestContext, StaticResultOptions options, bool compress)
+        {
+            var isHeadRequest = options.IsHeadRequest;
+            var factoryFn = options.ContentFactory;
+            var contentType = options.ContentType;
+            var responseHeaders = options.ResponseHeaders;
+
+            var requestedCompressionType = GetCompressionType(requestContext);
+
+            if (!compress || string.IsNullOrEmpty(requestedCompressionType))
+            {
+                var rangeHeader = requestContext.Headers.Get("Range");
+
+                var stream = await factoryFn().ConfigureAwait(false);
+
+                if (!string.IsNullOrEmpty(rangeHeader))
+                {
+                    return new RangeRequestWriter(rangeHeader, stream, contentType, isHeadRequest, _logger)
+                    {
+                        OnComplete = options.OnComplete
+                    };
+                }
+
+                responseHeaders["Content-Length"] = stream.Length.ToString(UsCulture);
+
+                if (isHeadRequest)
+                {
+                    stream.Dispose();
+
+                    return GetHttpResult(new byte[] { }, contentType);
+                }
+
+                return new StreamWriter(stream, contentType, _logger)
+                {
+                    OnComplete = options.OnComplete,
+                    OnError = options.OnError
+                };
+            }
+
+            string content;
+
+            using (var stream = await factoryFn().ConfigureAwait(false))
+            {
+                using (var reader = new StreamReader(stream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var contents = Compress(content, requestedCompressionType);
+
+            responseHeaders["Content-Length"] = contents.Length.ToString(UsCulture);
+            responseHeaders["Content-Encoding"] = requestedCompressionType;
+
+            if (isHeadRequest)
+            {
+                return GetHttpResult(new byte[] { }, contentType);
+            }
+
+            return GetHttpResult(contents, contentType, responseHeaders);
+        }
+
+        public static byte[] Compress(string text, string compressionType)
+        {
+            if (compressionType == "deflate")
+                return Deflate(text);
+
+            if (compressionType == "gzip")
+                return GZip(text);
+
+            throw new NotSupportedException(compressionType);
+        }
+
+        public static byte[] Deflate(string text)
+        {
+            return Deflate(Encoding.UTF8.GetBytes(text));
+        }
+
+        public static byte[] Deflate(byte[] bytes)
+        {
+            // In .NET FX incompat-ville, you can't access compressed bytes without closing DeflateStream
+            // Which means we must use MemoryStream since you have to use ToArray() on a closed Stream
+            using (var ms = new MemoryStream())
+            using (var zipStream = new DeflateStream(ms, CompressionMode.Compress))
+            {
+                zipStream.Write(bytes, 0, bytes.Length);
+                zipStream.Dispose();
+
+                return ms.ToArray();
+            }
+        }
+
+        public static byte[] GZip(string text)
+        {
+            return GZip(Encoding.UTF8.GetBytes(text));
+        }
+
+        public static byte[] GZip(byte[] buffer)
+        {
+            using (var ms = new MemoryStream())
+            using (var zipStream = new GZipStream(ms, CompressionMode.Compress))
+            {
+                zipStream.Write(buffer, 0, buffer.Length);
+                zipStream.Dispose();
+
+                return ms.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Adds the caching responseHeaders.
+        /// </summary>
+        /// <param name="responseHeaders">The responseHeaders.</param>
+        /// <param name="cacheKey">The cache key.</param>
+        /// <param name="lastDateModified">The last date modified.</param>
+        /// <param name="cacheDuration">Duration of the cache.</param>
+        private void AddCachingHeaders(IDictionary<string, string> responseHeaders, string cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
+        {
+            // Don't specify both last modified and Etag, unless caching unconditionally. They are redundant
+            // https://developers.google.com/speed/docs/best-practices/caching#LeverageBrowserCaching
+            if (lastDateModified.HasValue && (string.IsNullOrEmpty(cacheKey) || cacheDuration.HasValue))
+            {
+                AddAgeHeader(responseHeaders, lastDateModified);
+                responseHeaders["Last-Modified"] = lastDateModified.Value.ToString("r");
+            }
+
+            if (cacheDuration.HasValue)
+            {
+                responseHeaders["Cache-Control"] = "public, max-age=" + Convert.ToInt32(cacheDuration.Value.TotalSeconds);
+            }
+            else if (!string.IsNullOrEmpty(cacheKey))
+            {
+                responseHeaders["Cache-Control"] = "public";
+            }
+            else
+            {
+                responseHeaders["Cache-Control"] = "no-cache, no-store, must-revalidate";
+                responseHeaders["pragma"] = "no-cache, no-store, must-revalidate";
+            }
+
+            AddExpiresHeader(responseHeaders, cacheKey, cacheDuration);
+        }
+
+        /// <summary>
+        /// Adds the expires header.
+        /// </summary>
+        /// <param name="responseHeaders">The responseHeaders.</param>
+        /// <param name="cacheKey">The cache key.</param>
+        /// <param name="cacheDuration">Duration of the cache.</param>
+        private void AddExpiresHeader(IDictionary<string, string> responseHeaders, string cacheKey, TimeSpan? cacheDuration)
+        {
+            if (cacheDuration.HasValue)
+            {
+                responseHeaders["Expires"] = DateTime.UtcNow.Add(cacheDuration.Value).ToString("r");
+            }
+            else if (string.IsNullOrEmpty(cacheKey))
+            {
+                responseHeaders["Expires"] = "-1";
+            }
+        }
+
+        /// <summary>
+        /// Adds the age header.
+        /// </summary>
+        /// <param name="responseHeaders">The responseHeaders.</param>
+        /// <param name="lastDateModified">The last date modified.</param>
+        private void AddAgeHeader(IDictionary<string, string> responseHeaders, DateTime? lastDateModified)
+        {
+            if (lastDateModified.HasValue)
+            {
+                responseHeaders["Age"] = Convert.ToInt64((DateTime.UtcNow - lastDateModified.Value).TotalSeconds).ToString(CultureInfo.InvariantCulture);
+            }
+        }
+        /// <summary>
+        /// Determines whether [is not modified] [the specified cache key].
+        /// </summary>
+        /// <param name="requestContext">The request context.</param>
+        /// <param name="cacheKey">The cache key.</param>
+        /// <param name="lastDateModified">The last date modified.</param>
+        /// <param name="cacheDuration">Duration of the cache.</param>
+        /// <returns><c>true</c> if [is not modified] [the specified cache key]; otherwise, <c>false</c>.</returns>
+        private bool IsNotModified(IRequest requestContext, Guid? cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
+        {
+            var isNotModified = true;
+
+            var ifModifiedSinceHeader = requestContext.Headers.Get("If-Modified-Since");
+
+            if (!string.IsNullOrEmpty(ifModifiedSinceHeader))
+            {
+                DateTime ifModifiedSince;
+
+                if (DateTime.TryParse(ifModifiedSinceHeader, out ifModifiedSince))
+                {
+                    isNotModified = IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified);
+                }
+            }
+
+            var ifNoneMatchHeader = requestContext.Headers.Get("If-None-Match");
+
+            // Validate If-None-Match
+            if (isNotModified && (cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader)))
+            {
+                Guid ifNoneMatch;
+
+                if (Guid.TryParse(ifNoneMatchHeader ?? string.Empty, out ifNoneMatch))
+                {
+                    if (cacheKey.HasValue && cacheKey.Value == ifNoneMatch)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Determines whether [is not modified] [the specified if modified since].
+        /// </summary>
+        /// <param name="ifModifiedSince">If modified since.</param>
+        /// <param name="cacheDuration">Duration of the cache.</param>
+        /// <param name="dateModified">The date modified.</param>
+        /// <returns><c>true</c> if [is not modified] [the specified if modified since]; otherwise, <c>false</c>.</returns>
+        private bool IsNotModified(DateTime ifModifiedSince, TimeSpan? cacheDuration, DateTime? dateModified)
+        {
+            if (dateModified.HasValue)
+            {
+                var lastModified = NormalizeDateForComparison(dateModified.Value);
+                ifModifiedSince = NormalizeDateForComparison(ifModifiedSince);
+
+                return lastModified <= ifModifiedSince;
+            }
+
+            if (cacheDuration.HasValue)
+            {
+                var cacheExpirationDate = ifModifiedSince.Add(cacheDuration.Value);
+
+                if (DateTime.UtcNow < cacheExpirationDate)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+
+        /// <summary>
+        /// When the browser sends the IfModifiedDate, it's precision is limited to seconds, so this will account for that
+        /// </summary>
+        /// <param name="date">The date.</param>
+        /// <returns>DateTime.</returns>
+        private DateTime NormalizeDateForComparison(DateTime date)
+        {
+            return new DateTime(date.Year, date.Month, date.Day, date.Hour, date.Minute, date.Second, date.Kind);
+        }
+
+        /// <summary>
+        /// Adds the response headers.
+        /// </summary>
+        /// <param name="hasHeaders">The has options.</param>
+        /// <param name="responseHeaders">The response headers.</param>
+        private void AddResponseHeaders(IHasHeaders hasHeaders, IEnumerable<KeyValuePair<string, string>> responseHeaders)
+        {
+            foreach (var item in responseHeaders)
+            {
+                hasHeaders.Headers[item.Key] = item.Value;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
index 813f07fff..c32af8eb1 100644
--- a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -127,23 +127,7 @@ namespace Emby.Server.Implementations.Library.Validators
                 {
                     var item = _libraryManager.GetPerson(person.Key);
 
-                    var hasMetdata = !string.IsNullOrWhiteSpace(item.Overview);
-                    var performFullRefresh = !hasMetdata && (DateTime.UtcNow - item.DateLastRefreshed).TotalDays >= 30;
-
-                    var defaultMetadataRefreshMode = performFullRefresh
-                        ? MetadataRefreshMode.FullRefresh
-                        : MetadataRefreshMode.Default;
-
-                    var imageRefreshMode = performFullRefresh
-                        ? ImageRefreshMode.FullRefresh
-                        : ImageRefreshMode.Default;
-
-                    var options = new MetadataRefreshOptions(_fileSystem)
-                    {
-                        MetadataRefreshMode = person.Value ? defaultMetadataRefreshMode : MetadataRefreshMode.ValidationOnly,
-                        ImageRefreshMode = person.Value ? imageRefreshMode : ImageRefreshMode.ValidationOnly,
-                        ForceSave = performFullRefresh
-                    };
+                    var options = new MetadataRefreshOptions(_fileSystem);
 
                     await item.RefreshMetadata(options, cancellationToken).ConfigureAwait(false);
                 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 643d0c956..4218370ac 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -28,6 +28,7 @@ using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Text;
+using ServiceStack.Text.Jsv;
 using SocketHttpListener.Net;
 using SocketHttpListener.Primitives;
 
@@ -87,9 +88,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         public override void Configure()
         {
-            HostConfig.Instance.DefaultRedirectPath = DefaultRedirectPath;
-
-            HostConfig.Instance.MapExceptionToStatusCode = new Dictionary<Type, int>
+            var mapExceptionToStatusCode = new Dictionary<Type, int>
             {
                 {typeof (InvalidOperationException), 500},
                 {typeof (NotImplementedException), 500},
@@ -126,21 +125,24 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return _appHost.Resolve<T>();
         }
 
-        public override T TryResolve<T>()
+        public override Type[] GetGenericArguments(Type type)
         {
-            return _appHost.TryResolve<T>();
+            return type.GetGenericArguments();
         }
 
-        public override object CreateInstance(Type type)
+        public override bool IsAssignableFrom(Type type1, Type type2)
         {
-            return _appHost.CreateInstance(type);
+            return type1.IsAssignableFrom(type2);
         }
 
-        public override void OnConfigLoad()
+        public override T TryResolve<T>()
         {
-            base.OnConfigLoad();
+            return _appHost.TryResolve<T>();
+        }
 
-            Config.HandlerFactoryPath = null;
+        public override object CreateInstance(Type type)
+        {
+            return _appHost.CreateInstance(type);
         }
 
         protected override ServiceController CreateServiceController(params Assembly[] assembliesWithServices)
@@ -156,12 +158,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return this;
         }
 
+        public static string HandlerFactoryPath;
+
         /// <summary>
         /// Starts the Web Service
         /// </summary>
         private void StartListener()
         {
-            HostContext.Config.HandlerFactoryPath = GetHandlerPathIfAny(UrlPrefixes.First());
+            HandlerFactoryPath = GetHandlerPathIfAny(UrlPrefixes.First());
 
             _listener = GetListener();
 
@@ -610,6 +614,40 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return routes.ToArray();
         }
 
+        public override object GetTaskResult(Task task, string requestName)
+        {
+            try
+            {
+                var taskObject = task as Task<object>;
+                if (taskObject != null)
+                {
+                    return taskObject.Result;
+                }
+
+                task.Wait();
+
+                var type = task.GetType();
+                if (!type.IsGenericType)
+                {
+                    return null;
+                }
+
+                Logger.Warn("Getting task result from " + requestName + " using reflection. For better performance have your api return Task<object>");
+                return type.GetProperty("Result").GetValue(task);
+            }
+            catch (TypeAccessException)
+            {
+                return null; //return null for void Task's
+            }
+        }
+
+        public override Func<string, object> GetParseFn(Type propertyType)
+        {
+            var fn = JsvReader.GetParseFn(propertyType);
+
+            return s => fn(s);
+        }
+
         public override void SerializeToJson(object o, Stream stream)
         {
             _jsonSerializer.SerializeToStream(o, stream);
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
deleted file mode 100644
index b013a0952..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ /dev/null
@@ -1,835 +0,0 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using Emby.Server.Implementations.HttpServer;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Services;
-using ServiceStack;
-using ServiceStack.Host;
-using IRequest = MediaBrowser.Model.Services.IRequest;
-using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
-using StreamWriter = Emby.Server.Implementations.HttpServer.StreamWriter;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    /// <summary>
-    /// Class HttpResultFactory
-    /// </summary>
-    public class HttpResultFactory : IHttpResultFactory
-    {
-        /// <summary>
-        /// The _logger
-        /// </summary>
-        private readonly ILogger _logger;
-        private readonly IFileSystem _fileSystem;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IXmlSerializer _xmlSerializer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpResultFactory" /> class.
-        /// </summary>
-        /// <param name="logManager">The log manager.</param>
-        /// <param name="fileSystem">The file system.</param>
-        /// <param name="jsonSerializer">The json serializer.</param>
-        public HttpResultFactory(ILogManager logManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer)
-        {
-            _fileSystem = fileSystem;
-            _jsonSerializer = jsonSerializer;
-            _xmlSerializer = xmlSerializer;
-            _logger = logManager.GetLogger("HttpResultFactory");
-        }
-
-        /// <summary>
-        /// Gets the result.
-        /// </summary>
-        /// <param name="content">The content.</param>
-        /// <param name="contentType">Type of the content.</param>
-        /// <param name="responseHeaders">The response headers.</param>
-        /// <returns>System.Object.</returns>
-        public object GetResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
-        {
-            return GetHttpResult(content, contentType, responseHeaders);
-        }
-
-        /// <summary>
-        /// Gets the HTTP result.
-        /// </summary>
-        /// <param name="content">The content.</param>
-        /// <param name="contentType">Type of the content.</param>
-        /// <param name="responseHeaders">The response headers.</param>
-        /// <returns>IHasHeaders.</returns>
-        private IHasHeaders GetHttpResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
-        {
-            IHasHeaders result;
-
-            var stream = content as Stream;
-
-            if (stream != null)
-            {
-                result = new StreamWriter(stream, contentType, _logger);
-            }
-
-            else
-            {
-                var bytes = content as byte[];
-
-                if (bytes != null)
-                {
-                    result = new StreamWriter(bytes, contentType, _logger);
-                }
-                else
-                {
-                    var text = content as string;
-
-                    if (text != null)
-                    {
-                        result = new StreamWriter(Encoding.UTF8.GetBytes(text), contentType, _logger);
-                    }
-                    else
-                    {
-                        result = new HttpResult(content, contentType);
-                    }
-                }
-            }
-            if (responseHeaders == null)
-            {
-                responseHeaders = new Dictionary<string, string>();
-            }
-
-            responseHeaders["Expires"] = "-1";
-            AddResponseHeaders(result, responseHeaders);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Gets the optimized result.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="requestContext">The request context.</param>
-        /// <param name="result">The result.</param>
-        /// <param name="responseHeaders">The response headers.</param>
-        /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">result</exception>
-        public object GetOptimizedResult<T>(IRequest requestContext, T result, IDictionary<string, string> responseHeaders = null)
-            where T : class
-        {
-            return GetOptimizedResultInternal<T>(requestContext, result, true, responseHeaders);
-        }
-
-        private object GetOptimizedResultInternal<T>(IRequest requestContext, T result, bool addCachePrevention, IDictionary<string, string> responseHeaders = null)
-          where T : class
-        {
-            if (result == null)
-            {
-                throw new ArgumentNullException("result");
-            }
-
-            var optimizedResult = ToOptimizedResult(requestContext, result);
-
-            if (responseHeaders == null)
-            {
-                responseHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            }
-
-            if (addCachePrevention)
-            {
-                responseHeaders["Expires"] = "-1";
-            }
-
-            // Apply headers
-            var hasHeaders = optimizedResult as IHasHeaders;
-
-            if (hasHeaders != null)
-            {
-                AddResponseHeaders(hasHeaders, responseHeaders);
-            }
-
-            return optimizedResult;
-        }
-
-        public static string GetCompressionType(IRequest request)
-        {
-            var prefs = new RequestPreferences(request);
-
-            if (prefs.AcceptsDeflate)
-                return "deflate";
-
-            if (prefs.AcceptsGzip)
-                return "gzip";
-
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the optimized result for the IRequestContext. 
-        /// Does not use or store results in any cache.
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public object ToOptimizedResult<T>(IRequest request, T dto)
-        {
-            request.Response.Dto = dto;
-
-            var compressionType = GetCompressionType(request);
-            if (compressionType == null)
-            {
-                var contentType = request.ResponseContentType;
-                var contentTypeAttr = ContentFormat.GetEndpointAttributes(contentType);
-
-                switch (contentTypeAttr)
-                {
-                    case RequestAttributes.Xml:
-                        return SerializeToXmlString(dto);
-
-                    case RequestAttributes.Json:
-                        return _jsonSerializer.SerializeToString(dto);
-                }
-            }
-
-            using (var ms = new MemoryStream())
-            {
-                using (var compressionStream = GetCompressionStream(ms, compressionType))
-                {
-                    ContentTypes.Instance.SerializeToStream(request, dto, compressionStream);
-                    compressionStream.Close();
-
-                    var compressedBytes = ms.ToArray();
-
-                    var httpResult = new HttpResult(compressedBytes, request.ResponseContentType)
-                    {
-                        Status = request.Response.StatusCode
-                    };
-
-                    httpResult.Headers["Content-Length"] = compressedBytes.Length.ToString(UsCulture);
-                    httpResult.Headers["Content-Encoding"] = compressionType;
-
-                    return httpResult;
-                }
-            }
-        }
-
-        public static string SerializeToXmlString(object from)
-        {
-            using (var ms = new MemoryStream())
-            {
-                var xwSettings = new XmlWriterSettings();
-                xwSettings.Encoding = new UTF8Encoding(false);
-                xwSettings.OmitXmlDeclaration = false;
-
-                using (var xw = XmlWriter.Create(ms, xwSettings))
-                {
-                    var serializer = new DataContractSerializer(from.GetType());
-                    serializer.WriteObject(xw, from);
-                    xw.Flush();
-                    ms.Seek(0, SeekOrigin.Begin);
-                    var reader = new StreamReader(ms);
-                    return reader.ReadToEnd();
-                }
-            }
-        }
-
-        private static Stream GetCompressionStream(Stream outputStream, string compressionType)
-        {
-            if (compressionType == "deflate")
-                return new DeflateStream(outputStream, CompressionMode.Compress);
-            if (compressionType == "gzip")
-                return new GZipStream(outputStream, CompressionMode.Compress);
-
-            throw new NotSupportedException(compressionType);
-        }
-
-        /// <summary>
-        /// Gets the optimized result using cache.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="requestContext">The request context.</param>
-        /// <param name="cacheKey">The cache key.</param>
-        /// <param name="lastDateModified">The last date modified.</param>
-        /// <param name="cacheDuration">Duration of the cache.</param>
-        /// <param name="factoryFn">The factory fn.</param>
-        /// <param name="responseHeaders">The response headers.</param>
-        /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">cacheKey
-        /// or
-        /// factoryFn</exception>
-        public object GetOptimizedResultUsingCache<T>(IRequest requestContext, Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration, Func<T> factoryFn, IDictionary<string, string> responseHeaders = null)
-               where T : class
-        {
-            if (cacheKey == Guid.Empty)
-            {
-                throw new ArgumentNullException("cacheKey");
-            }
-            if (factoryFn == null)
-            {
-                throw new ArgumentNullException("factoryFn");
-            }
-
-            var key = cacheKey.ToString("N");
-
-            if (responseHeaders == null)
-            {
-                responseHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            }
-
-            // See if the result is already cached in the browser
-            var result = GetCachedResult(requestContext, responseHeaders, cacheKey, key, lastDateModified, cacheDuration, null);
-
-            if (result != null)
-            {
-                return result;
-            }
-
-            return GetOptimizedResultInternal(requestContext, factoryFn(), false, responseHeaders);
-        }
-
-        /// <summary>
-        /// To the cached result.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="requestContext">The request context.</param>
-        /// <param name="cacheKey">The cache key.</param>
-        /// <param name="lastDateModified">The last date modified.</param>
-        /// <param name="cacheDuration">Duration of the cache.</param>
-        /// <param name="factoryFn">The factory fn.</param>
-        /// <param name="contentType">Type of the content.</param>
-        /// <param name="responseHeaders">The response headers.</param>
-        /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">cacheKey</exception>
-        public object GetCachedResult<T>(IRequest requestContext, Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration, Func<T> factoryFn, string contentType, IDictionary<string, string> responseHeaders = null)
-          where T : class
-        {
-            if (cacheKey == Guid.Empty)
-            {
-                throw new ArgumentNullException("cacheKey");
-            }
-            if (factoryFn == null)
-            {
-                throw new ArgumentNullException("factoryFn");
-            }
-
-            var key = cacheKey.ToString("N");
-
-            if (responseHeaders == null)
-            {
-                responseHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            }
-
-            // See if the result is already cached in the browser
-            var result = GetCachedResult(requestContext, responseHeaders, cacheKey, key, lastDateModified, cacheDuration, contentType);
-
-            if (result != null)
-            {
-                return result;
-            }
-
-            result = factoryFn();
-
-            // Apply caching headers
-            var hasHeaders = result as IHasHeaders;
-
-            if (hasHeaders != null)
-            {
-                AddResponseHeaders(hasHeaders, responseHeaders);
-                return hasHeaders;
-            }
-
-            IHasHeaders httpResult;
-
-            var stream = result as Stream;
-
-            if (stream != null)
-            {
-                httpResult = new StreamWriter(stream, contentType, _logger);
-            }
-            else
-            {
-                // Otherwise wrap into an HttpResult
-                httpResult = new HttpResult(result, contentType ?? "text/html", HttpStatusCode.NotModified);
-            }
-
-            AddResponseHeaders(httpResult, responseHeaders);
-
-            return httpResult;
-        }
-
-        /// <summary>
-        /// Pres the process optimized result.
-        /// </summary>
-        /// <param name="requestContext">The request context.</param>
-        /// <param name="responseHeaders">The responseHeaders.</param>
-        /// <param name="cacheKey">The cache key.</param>
-        /// <param name="cacheKeyString">The cache key string.</param>
-        /// <param name="lastDateModified">The last date modified.</param>
-        /// <param name="cacheDuration">Duration of the cache.</param>
-        /// <param name="contentType">Type of the content.</param>
-        /// <returns>System.Object.</returns>
-        private object GetCachedResult(IRequest requestContext, IDictionary<string, string> responseHeaders, Guid cacheKey, string cacheKeyString, DateTime? lastDateModified, TimeSpan? cacheDuration, string contentType)
-        {
-            responseHeaders["ETag"] = string.Format("\"{0}\"", cacheKeyString);
-
-            if (IsNotModified(requestContext, cacheKey, lastDateModified, cacheDuration))
-            {
-                AddAgeHeader(responseHeaders, lastDateModified);
-                AddExpiresHeader(responseHeaders, cacheKeyString, cacheDuration);
-
-                var result = new HttpResult(new byte[] { }, contentType ?? "text/html", HttpStatusCode.NotModified);
-
-                AddResponseHeaders(result, responseHeaders);
-
-                return result;
-            }
-
-            AddCachingHeaders(responseHeaders, cacheKeyString, lastDateModified, cacheDuration);
-
-            return null;
-        }
-
-        public Task<object> GetStaticFileResult(IRequest requestContext,
-            string path,
-            FileShareMode fileShare = FileShareMode.Read)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException("path");
-            }
-
-            return GetStaticFileResult(requestContext, new StaticFileResultOptions
-            {
-                Path = path,
-                FileShare = fileShare
-            });
-        }
-
-        public Task<object> GetStaticFileResult(IRequest requestContext,
-            StaticFileResultOptions options)
-        {
-            var path = options.Path;
-            var fileShare = options.FileShare;
-
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException("path");
-            }
-
-            if (fileShare != FileShareMode.Read && fileShare != FileShareMode.ReadWrite)
-            {
-                throw new ArgumentException("FileShare must be either Read or ReadWrite");
-            }
-
-            if (string.IsNullOrWhiteSpace(options.ContentType))
-            {
-                options.ContentType = MimeTypes.GetMimeType(path);
-            }
-
-            if (!options.DateLastModified.HasValue)
-            {
-                options.DateLastModified = _fileSystem.GetLastWriteTimeUtc(path);
-            }
-
-            var cacheKey = path + options.DateLastModified.Value.Ticks;
-
-            options.CacheKey = cacheKey.GetMD5();
-            options.ContentFactory = () => Task.FromResult(GetFileStream(path, fileShare));
-
-            return GetStaticResult(requestContext, options);
-        }
-
-        /// <summary>
-        /// Gets the file stream.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="fileShare">The file share.</param>
-        /// <returns>Stream.</returns>
-        private Stream GetFileStream(string path, FileShareMode fileShare)
-        {
-            return _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, fileShare);
-        }
-
-        public Task<object> GetStaticResult(IRequest requestContext,
-            Guid cacheKey,
-            DateTime? lastDateModified,
-            TimeSpan? cacheDuration,
-            string contentType,
-            Func<Task<Stream>> factoryFn,
-            IDictionary<string, string> responseHeaders = null,
-            bool isHeadRequest = false)
-        {
-            return GetStaticResult(requestContext, new StaticResultOptions
-            {
-                CacheDuration = cacheDuration,
-                CacheKey = cacheKey,
-                ContentFactory = factoryFn,
-                ContentType = contentType,
-                DateLastModified = lastDateModified,
-                IsHeadRequest = isHeadRequest,
-                ResponseHeaders = responseHeaders
-            });
-        }
-
-        public async Task<object> GetStaticResult(IRequest requestContext, StaticResultOptions options)
-        {
-            var cacheKey = options.CacheKey;
-            options.ResponseHeaders = options.ResponseHeaders ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            var contentType = options.ContentType;
-
-            if (cacheKey == Guid.Empty)
-            {
-                throw new ArgumentNullException("cacheKey");
-            }
-            if (options.ContentFactory == null)
-            {
-                throw new ArgumentNullException("factoryFn");
-            }
-
-            var key = cacheKey.ToString("N");
-
-            // See if the result is already cached in the browser
-            var result = GetCachedResult(requestContext, options.ResponseHeaders, cacheKey, key, options.DateLastModified, options.CacheDuration, contentType);
-
-            if (result != null)
-            {
-                return result;
-            }
-
-            var compress = ShouldCompressResponse(requestContext, contentType);
-            var hasHeaders = await GetStaticResult(requestContext, options, compress).ConfigureAwait(false);
-            AddResponseHeaders(hasHeaders, options.ResponseHeaders);
-
-            return hasHeaders;
-        }
-
-        /// <summary>
-        /// Shoulds the compress response.
-        /// </summary>
-        /// <param name="requestContext">The request context.</param>
-        /// <param name="contentType">Type of the content.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        private bool ShouldCompressResponse(IRequest requestContext, string contentType)
-        {
-            // It will take some work to support compression with byte range requests
-            if (!string.IsNullOrEmpty(requestContext.GetHeader("Range")))
-            {
-                return false;
-            }
-
-            // Don't compress media
-            if (contentType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase) || contentType.StartsWith("video/", StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-
-            // Don't compress images
-            if (contentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-
-            if (contentType.StartsWith("font/", StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-            if (contentType.StartsWith("application/", StringComparison.OrdinalIgnoreCase))
-            {
-                if (string.Equals(contentType, "application/x-javascript", StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-                if (string.Equals(contentType, "application/xml", StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// The us culture
-        /// </summary>
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
-        private async Task<IHasHeaders> GetStaticResult(IRequest requestContext, StaticResultOptions options, bool compress)
-        {
-            var isHeadRequest = options.IsHeadRequest;
-            var factoryFn = options.ContentFactory;
-            var contentType = options.ContentType;
-            var responseHeaders = options.ResponseHeaders;
-
-            var requestedCompressionType = GetCompressionType(requestContext);
-
-            if (!compress || string.IsNullOrEmpty(requestedCompressionType))
-            {
-                var rangeHeader = requestContext.GetHeader("Range");
-
-                var stream = await factoryFn().ConfigureAwait(false);
-
-                if (!string.IsNullOrEmpty(rangeHeader))
-                {
-                    return new RangeRequestWriter(rangeHeader, stream, contentType, isHeadRequest, _logger)
-                    {
-                        OnComplete = options.OnComplete
-                    };
-                }
-
-                responseHeaders["Content-Length"] = stream.Length.ToString(UsCulture);
-
-                if (isHeadRequest)
-                {
-                    stream.Dispose();
-
-                    return GetHttpResult(new byte[] { }, contentType);
-                }
-
-                return new StreamWriter(stream, contentType, _logger)
-                {
-                    OnComplete = options.OnComplete,
-                    OnError = options.OnError
-                };
-            }
-
-            string content;
-
-            using (var stream = await factoryFn().ConfigureAwait(false))
-            {
-                using (var reader = new StreamReader(stream))
-                {
-                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
-                }
-            }
-
-            var contents = Compress(content, requestedCompressionType);
-
-            responseHeaders["Content-Length"] = contents.Length.ToString(UsCulture);
-            responseHeaders["Content-Encoding"] = requestedCompressionType;
-
-            if (isHeadRequest)
-            {
-                return GetHttpResult(new byte[] { }, contentType);
-            }
-
-            return GetHttpResult(contents, contentType, responseHeaders);
-        }
-
-        public static byte[] Compress(string text, string compressionType)
-        {
-            if (compressionType == "deflate")
-                return Deflate(text);
-
-            if (compressionType == "gzip")
-                return GZip(text);
-
-            throw new NotSupportedException(compressionType);
-        }
-
-        public static byte[] Deflate(string text)
-        {
-            return Deflate(Encoding.UTF8.GetBytes(text));
-        }
-
-        public static byte[] Deflate(byte[] bytes)
-        {
-            // In .NET FX incompat-ville, you can't access compressed bytes without closing DeflateStream
-            // Which means we must use MemoryStream since you have to use ToArray() on a closed Stream
-            using (var ms = new MemoryStream())
-            using (var zipStream = new DeflateStream(ms, CompressionMode.Compress))
-            {
-                zipStream.Write(bytes, 0, bytes.Length);
-                zipStream.Close();
-
-                return ms.ToArray();
-            }
-        }
-
-        public static byte[] GZip(string text)
-        {
-            return GZip(Encoding.UTF8.GetBytes(text));
-        }
-
-        public static byte[] GZip(byte[] buffer)
-        {
-            using (var ms = new MemoryStream())
-            using (var zipStream = new GZipStream(ms, CompressionMode.Compress))
-            {
-                zipStream.Write(buffer, 0, buffer.Length);
-                zipStream.Close();
-
-                return ms.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Adds the caching responseHeaders.
-        /// </summary>
-        /// <param name="responseHeaders">The responseHeaders.</param>
-        /// <param name="cacheKey">The cache key.</param>
-        /// <param name="lastDateModified">The last date modified.</param>
-        /// <param name="cacheDuration">Duration of the cache.</param>
-        private void AddCachingHeaders(IDictionary<string, string> responseHeaders, string cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
-        {
-            // Don't specify both last modified and Etag, unless caching unconditionally. They are redundant
-            // https://developers.google.com/speed/docs/best-practices/caching#LeverageBrowserCaching
-            if (lastDateModified.HasValue && (string.IsNullOrEmpty(cacheKey) || cacheDuration.HasValue))
-            {
-                AddAgeHeader(responseHeaders, lastDateModified);
-                responseHeaders["Last-Modified"] = lastDateModified.Value.ToString("r");
-            }
-
-            if (cacheDuration.HasValue)
-            {
-                responseHeaders["Cache-Control"] = "public, max-age=" + Convert.ToInt32(cacheDuration.Value.TotalSeconds);
-            }
-            else if (!string.IsNullOrEmpty(cacheKey))
-            {
-                responseHeaders["Cache-Control"] = "public";
-            }
-            else
-            {
-                responseHeaders["Cache-Control"] = "no-cache, no-store, must-revalidate";
-                responseHeaders["pragma"] = "no-cache, no-store, must-revalidate";
-            }
-
-            AddExpiresHeader(responseHeaders, cacheKey, cacheDuration);
-        }
-
-        /// <summary>
-        /// Adds the expires header.
-        /// </summary>
-        /// <param name="responseHeaders">The responseHeaders.</param>
-        /// <param name="cacheKey">The cache key.</param>
-        /// <param name="cacheDuration">Duration of the cache.</param>
-        private void AddExpiresHeader(IDictionary<string, string> responseHeaders, string cacheKey, TimeSpan? cacheDuration)
-        {
-            if (cacheDuration.HasValue)
-            {
-                responseHeaders["Expires"] = DateTime.UtcNow.Add(cacheDuration.Value).ToString("r");
-            }
-            else if (string.IsNullOrEmpty(cacheKey))
-            {
-                responseHeaders["Expires"] = "-1";
-            }
-        }
-
-        /// <summary>
-        /// Adds the age header.
-        /// </summary>
-        /// <param name="responseHeaders">The responseHeaders.</param>
-        /// <param name="lastDateModified">The last date modified.</param>
-        private void AddAgeHeader(IDictionary<string, string> responseHeaders, DateTime? lastDateModified)
-        {
-            if (lastDateModified.HasValue)
-            {
-                responseHeaders["Age"] = Convert.ToInt64((DateTime.UtcNow - lastDateModified.Value).TotalSeconds).ToString(CultureInfo.InvariantCulture);
-            }
-        }
-        /// <summary>
-        /// Determines whether [is not modified] [the specified cache key].
-        /// </summary>
-        /// <param name="requestContext">The request context.</param>
-        /// <param name="cacheKey">The cache key.</param>
-        /// <param name="lastDateModified">The last date modified.</param>
-        /// <param name="cacheDuration">Duration of the cache.</param>
-        /// <returns><c>true</c> if [is not modified] [the specified cache key]; otherwise, <c>false</c>.</returns>
-        private bool IsNotModified(IRequest requestContext, Guid? cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
-        {
-            var isNotModified = true;
-
-            var ifModifiedSinceHeader = requestContext.GetHeader("If-Modified-Since");
-
-            if (!string.IsNullOrEmpty(ifModifiedSinceHeader))
-            {
-                DateTime ifModifiedSince;
-
-                if (DateTime.TryParse(ifModifiedSinceHeader, out ifModifiedSince))
-                {
-                    isNotModified = IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified);
-                }
-            }
-
-            var ifNoneMatchHeader = requestContext.GetHeader("If-None-Match");
-
-            // Validate If-None-Match
-            if (isNotModified && (cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader)))
-            {
-                Guid ifNoneMatch;
-
-                if (Guid.TryParse(ifNoneMatchHeader ?? string.Empty, out ifNoneMatch))
-                {
-                    if (cacheKey.HasValue && cacheKey.Value == ifNoneMatch)
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Determines whether [is not modified] [the specified if modified since].
-        /// </summary>
-        /// <param name="ifModifiedSince">If modified since.</param>
-        /// <param name="cacheDuration">Duration of the cache.</param>
-        /// <param name="dateModified">The date modified.</param>
-        /// <returns><c>true</c> if [is not modified] [the specified if modified since]; otherwise, <c>false</c>.</returns>
-        private bool IsNotModified(DateTime ifModifiedSince, TimeSpan? cacheDuration, DateTime? dateModified)
-        {
-            if (dateModified.HasValue)
-            {
-                var lastModified = NormalizeDateForComparison(dateModified.Value);
-                ifModifiedSince = NormalizeDateForComparison(ifModifiedSince);
-
-                return lastModified <= ifModifiedSince;
-            }
-
-            if (cacheDuration.HasValue)
-            {
-                var cacheExpirationDate = ifModifiedSince.Add(cacheDuration.Value);
-
-                if (DateTime.UtcNow < cacheExpirationDate)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-
-        /// <summary>
-        /// When the browser sends the IfModifiedDate, it's precision is limited to seconds, so this will account for that
-        /// </summary>
-        /// <param name="date">The date.</param>
-        /// <returns>DateTime.</returns>
-        private DateTime NormalizeDateForComparison(DateTime date)
-        {
-            return new DateTime(date.Year, date.Month, date.Day, date.Hour, date.Minute, date.Second, date.Kind);
-        }
-
-        /// <summary>
-        /// Adds the response headers.
-        /// </summary>
-        /// <param name="hasHeaders">The has options.</param>
-        /// <param name="responseHeaders">The response headers.</param>
-        private void AddResponseHeaders(IHasHeaders hasHeaders, IEnumerable<KeyValuePair<string, string>> responseHeaders)
-        {
-            foreach (var item in responseHeaders)
-            {
-                hasHeaders.Headers[item.Key] = item.Value;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
index 95b2ccaba..628e5cc7e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Emby.Server.Implementations.HttpServer;
 using Emby.Server.Implementations.HttpServer.SocketSharp;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Services;
 using ServiceStack;
-using ServiceStack.Host;
 using SocketHttpListener.Net;
 using IHttpFile = MediaBrowser.Model.Services.IHttpFile;
 using IHttpRequest = MediaBrowser.Model.Services.IHttpRequest;
@@ -244,14 +244,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             var specifiedContentType = GetQueryStringContentType(httpReq);
             if (!string.IsNullOrEmpty(specifiedContentType)) return specifiedContentType;
 
+            var serverDefaultContentType = "application/json";
+
             var acceptContentTypes = httpReq.AcceptTypes;
             var defaultContentType = httpReq.ContentType;
             if (HasAnyOfContentTypes(httpReq, FormUrlEncoded, MultiPartFormData))
             {
-                defaultContentType = HostContext.Config.DefaultContentType;
+                defaultContentType = serverDefaultContentType;
             }
 
-            var customContentTypes = ContentTypes.Instance.ContentTypeFormats.Values;
             var preferredContentTypes = new string[] {};
 
             var acceptsAnything = false;
@@ -261,7 +262,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
                 var hasPreferredContentTypes = new bool[preferredContentTypes.Length];
                 foreach (var acceptsType in acceptContentTypes)
                 {
-                    var contentType = ContentFormat.GetRealContentType(acceptsType);
+                    var contentType = HttpResultFactory.GetRealContentType(acceptsType);
                     acceptsAnything = acceptsAnything || contentType == "*/*";
 
                     for (var i = 0; i < preferredContentTypes.Length; i++)
@@ -285,17 +286,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
                 {
                     if (hasDefaultContentType)
                         return defaultContentType;
-                    if (HostContext.Config.DefaultContentType != null)
-                        return HostContext.Config.DefaultContentType;
-                }
-
-                foreach (var contentType in acceptContentTypes)
-                {
-                    foreach (var customContentType in customContentTypes)
-                    {
-                        if (contentType.StartsWith(customContentType, StringComparison.OrdinalIgnoreCase))
-                            return customContentType;
-                    }
+                    if (serverDefaultContentType != null)
+                        return serverDefaultContentType;
                 }
             }
 
@@ -305,8 +297,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             }
 
             //We could also send a '406 Not Acceptable', but this is allowed also
-            return HostContext.Config.DefaultContentType;
+            return serverDefaultContentType;
         }
+
         public const string Soap11 = "text/xml; charset=utf-8";
 
         public static bool HasAnyOfContentTypes(IRequest request, params string[] contentTypes)
@@ -342,10 +335,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             if (format.Contains("json")) return "application/json";
             if (format.Contains("xml")) return Xml;
 
-            string contentType;
-            ContentTypes.Instance.ContentTypeFormats.TryGetValue(format, out contentType);
-
-            return contentType;
+            return null;
         }
 
         public bool HasExplicitResponseContentType { get; private set; }
@@ -357,7 +347,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             {
                 if (this.pathInfo == null)
                 {
-                    var mode = HostContext.Config.HandlerFactoryPath;
+                    var mode = HttpListenerHost.HandlerFactoryPath;
 
                     var pos = request.RawUrl.IndexOf("?");
                     if (pos != -1)
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index a2edc7aa8..a253753c5 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -69,6 +69,10 @@
       <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="ServiceStack.Text, Version=4.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SharpCompress, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath>
@@ -88,9 +92,6 @@
     <Reference Include="ServiceStack">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UniversalDetector.1.0.1\lib\portable-net45+sl4+wp71+win8+wpa81\UniversalDetector.dll</HintPath>
@@ -109,7 +110,6 @@
     <Compile Include="Devices\CameraUploadsFolder.cs" />
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
     <Compile Include="HttpServer\HttpListenerHost.cs" />
-    <Compile Include="HttpServer\HttpResultFactory.cs" />
     <Compile Include="HttpServer\ServerFactory.cs" />
     <Compile Include="HttpServer\SocketSharp\RequestMono.cs" />
     <Compile Include="HttpServer\SocketSharp\WebSocketSharpRequest.cs" />
@@ -141,7 +141,6 @@
     <Compile Include="Persistence\DataExtensions.cs" />
     <Compile Include="Persistence\IDbConnector.cs" />
     <Compile Include="Persistence\MediaStreamColumns.cs" />
-    <Compile Include="Serialization\JsonSerializer.cs" />
     <Compile Include="Social\SharingRepository.cs" />
     <Compile Include="Persistence\SqliteFileOrganizationRepository.cs" />
     <Compile Include="Notifications\SqliteNotificationsRepository.cs" />
@@ -351,7 +350,9 @@
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Serialization\" />
+  </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/MediaBrowser.Server.Implementations/Serialization/JsonSerializer.cs b/MediaBrowser.Server.Implementations/Serialization/JsonSerializer.cs
deleted file mode 100644
index b9a03242c..000000000
--- a/MediaBrowser.Server.Implementations/Serialization/JsonSerializer.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System;
-using System.IO;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Server.Implementations.Serialization
-{
-    /// <summary>
-    /// Provides a wrapper around third party json serialization.
-    /// </summary>
-    public class JsonSerializer : IJsonSerializer
-    {
-        private readonly IFileSystem _fileSystem;
-        private readonly ILogger _logger;
-
-        public JsonSerializer(IFileSystem fileSystem, ILogger logger)
-        {
-            _fileSystem = fileSystem;
-            _logger = logger;
-            Configure();
-        }
-
-        /// <summary>
-        /// Serializes to stream.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <param name="stream">The stream.</param>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        public void SerializeToStream(object obj, Stream stream)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
-
-            if (stream == null)
-            {
-                throw new ArgumentNullException("stream");
-            }
-
-            ServiceStack.Text.JsonSerializer.SerializeToStream(obj, obj.GetType(), stream);
-        }
-
-        /// <summary>
-        /// Serializes to file.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <param name="file">The file.</param>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        public void SerializeToFile(object obj, string file)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
-
-            if (string.IsNullOrEmpty(file))
-            {
-                throw new ArgumentNullException("file");
-            }
-
-			using (Stream stream = _fileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
-            {
-                SerializeToStream(obj, stream);
-            }
-        }
-
-        private Stream OpenFile(string path)
-        {
-            _logger.Debug("Deserializing file {0}", path);
-            return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 131072);
-        }
-
-        /// <summary>
-        /// Deserializes from file.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <param name="file">The file.</param>
-        /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">type</exception>
-        public object DeserializeFromFile(Type type, string file)
-        {
-            if (type == null)
-            {
-                throw new ArgumentNullException("type");
-            }
-
-            if (string.IsNullOrEmpty(file))
-            {
-                throw new ArgumentNullException("file");
-            }
-
-            using (Stream stream = OpenFile(file))
-            {
-                return DeserializeFromStream(stream, type);
-            }
-        }
-
-        /// <summary>
-        /// Deserializes from file.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="file">The file.</param>
-        /// <returns>``0.</returns>
-        /// <exception cref="System.ArgumentNullException">file</exception>
-        public T DeserializeFromFile<T>(string file)
-            where T : class
-        {
-            if (string.IsNullOrEmpty(file))
-            {
-                throw new ArgumentNullException("file");
-            }
-
-            using (Stream stream = OpenFile(file))
-            {
-                return DeserializeFromStream<T>(stream);
-            }
-        }
-
-        /// <summary>
-        /// Deserializes from stream.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="stream">The stream.</param>
-        /// <returns>``0.</returns>
-        /// <exception cref="System.ArgumentNullException">stream</exception>
-        public T DeserializeFromStream<T>(Stream stream)
-        {
-            if (stream == null)
-            {
-                throw new ArgumentNullException("stream");
-            }
-
-            return ServiceStack.Text.JsonSerializer.DeserializeFromStream<T>(stream);
-        }
-
-        /// <summary>
-        /// Deserializes from string.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="text">The text.</param>
-        /// <returns>``0.</returns>
-        /// <exception cref="System.ArgumentNullException">text</exception>
-        public T DeserializeFromString<T>(string text)
-        {
-            if (string.IsNullOrEmpty(text))
-            {
-                throw new ArgumentNullException("text");
-            }
-
-            return ServiceStack.Text.JsonSerializer.DeserializeFromString<T>(text);
-        }
-
-        /// <summary>
-        /// Deserializes from stream.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">stream</exception>
-        public object DeserializeFromStream(Stream stream, Type type)
-        {
-            if (stream == null)
-            {
-                throw new ArgumentNullException("stream");
-            }
-
-            if (type == null)
-            {
-                throw new ArgumentNullException("type");
-            }
-
-            return ServiceStack.Text.JsonSerializer.DeserializeFromStream(type, stream);
-        }
-
-        /// <summary>
-        /// Configures this instance.
-        /// </summary>
-        private void Configure()
-        {
-            ServiceStack.Text.JsConfig.DateHandler = ServiceStack.Text.DateHandler.ISO8601;
-            ServiceStack.Text.JsConfig.ExcludeTypeInfo = true;
-            ServiceStack.Text.JsConfig.IncludeNullValues = false;
-            ServiceStack.Text.JsConfig.AlwaysUseUtc = true;
-            ServiceStack.Text.JsConfig.AssumeUtc = true;
-        }
-
-        /// <summary>
-        /// Deserializes from string.
-        /// </summary>
-        /// <param name="json">The json.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">json</exception>
-        public object DeserializeFromString(string json, Type type)
-        {
-            if (string.IsNullOrEmpty(json))
-            {
-                throw new ArgumentNullException("json");
-            }
-
-            if (type == null)
-            {
-                throw new ArgumentNullException("type");
-            }
-
-            return ServiceStack.Text.JsonSerializer.DeserializeFromString(json, type);
-        }
-
-        /// <summary>
-        /// Serializes to string.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        public string SerializeToString(object obj)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
-
-            return ServiceStack.Text.JsonSerializer.SerializeToString(obj, obj.GetType());
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 84a5d5a1d..16ac6faf3 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -5,5 +5,6 @@
   <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
   <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />
+  <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
   <package id="UniversalDetector" version="1.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index c155a968e..e5a17f8fc 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -77,6 +77,7 @@ using System.Threading.Tasks;
 using Emby.Common.Implementations;
 using Emby.Common.Implementations.Networking;
 using Emby.Common.Implementations.Reflection;
+using Emby.Common.Implementations.Serialization;
 using Emby.Common.Implementations.TextEncoding;
 using Emby.Common.Implementations.Updates;
 using Emby.Common.Implementations.Xml;
@@ -103,6 +104,7 @@ using Emby.Server.Implementations.Devices;
 using Emby.Server.Implementations.Dto;
 using Emby.Server.Implementations.EntryPoints;
 using Emby.Server.Implementations.FileOrganization;
+using Emby.Server.Implementations.HttpServer;
 using Emby.Server.Implementations.HttpServer.Security;
 using Emby.Server.Implementations.Library;
 using Emby.Server.Implementations.LiveTv;
@@ -131,7 +133,6 @@ using MediaBrowser.Model.Social;
 using MediaBrowser.Model.Text;
 using MediaBrowser.Model.Xml;
 using MediaBrowser.Server.Implementations.Archiving;
-using MediaBrowser.Server.Implementations.Serialization;
 using OpenSubtitlesHandler;
 using ServiceStack;
 using StringExtensions = MediaBrowser.Controller.Extensions.StringExtensions;
-- 
cgit v1.2.3


From 836e1fdc30f149d3548dc0b529d31ba96de28734 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 10 Nov 2016 20:58:20 -0500
Subject: make additional classes portable

---
 .../Emby.Server.Implementations.csproj             |   2 +
 .../HttpServer/SocketSharp/RequestMono.cs          | 846 +++++++++++++++++++
 .../SocketSharp/WebSocketSharpRequest.cs           | 620 ++++++++++++++
 .../HttpServer/HttpListenerHost.cs                 |   6 +-
 .../HttpServer/SocketSharp/RequestMono.cs          | 917 ---------------------
 .../SocketSharp/WebSocketSharpRequest.cs           | 609 --------------
 .../MediaBrowser.Server.Implementations.csproj     |   2 -
 7 files changed, 1469 insertions(+), 1533 deletions(-)
 create mode 100644 Emby.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
 create mode 100644 Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 3f55bd7fb..07f3bd020 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -79,8 +79,10 @@
     <Compile Include="HttpServer\Security\AuthorizationContext.cs" />
     <Compile Include="HttpServer\Security\AuthService.cs" />
     <Compile Include="HttpServer\Security\SessionContext.cs" />
+    <Compile Include="HttpServer\SocketSharp\RequestMono.cs" />
     <Compile Include="HttpServer\SocketSharp\SharpWebSocket.cs" />
     <Compile Include="HttpServer\SocketSharp\WebSocketSharpListener.cs" />
+    <Compile Include="HttpServer\SocketSharp\WebSocketSharpRequest.cs" />
     <Compile Include="HttpServer\SocketSharp\WebSocketSharpResponse.cs" />
     <Compile Include="HttpServer\StreamWriter.cs" />
     <Compile Include="HttpServer\SwaggerService.cs" />
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
new file mode 100644
index 000000000..ec14c32c8
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
@@ -0,0 +1,846 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace Emby.Server.Implementations.HttpServer.SocketSharp
+{
+    public partial class WebSocketSharpRequest : IHttpRequest
+    {
+        static internal string GetParameter(string header, string attr)
+        {
+            int ap = header.IndexOf(attr);
+            if (ap == -1)
+                return null;
+
+            ap += attr.Length;
+            if (ap >= header.Length)
+                return null;
+
+            char ending = header[ap];
+            if (ending != '"')
+                ending = ' ';
+
+            int end = header.IndexOf(ending, ap + 1);
+            if (end == -1)
+                return ending == '"' ? null : header.Substring(ap);
+
+            return header.Substring(ap + 1, end - ap - 1);
+        }
+
+        async Task LoadMultiPart()
+        {
+            string boundary = GetParameter(ContentType, "; boundary=");
+            if (boundary == null)
+                return;
+
+            using (var requestStream = GetSubStream(InputStream, _memoryStreamProvider))
+            {
+                //DB: 30/01/11 - Hack to get around non-seekable stream and received HTTP request
+                //Not ending with \r\n?
+                var ms = _memoryStreamProvider.CreateNew(32 * 1024);
+                await requestStream.CopyToAsync(ms).ConfigureAwait(false);
+
+                var input = ms;
+                ms.WriteByte((byte)'\r');
+                ms.WriteByte((byte)'\n');
+
+                input.Position = 0;
+
+                //Uncomment to debug
+                //var content = new StreamReader(ms).ReadToEnd();
+                //Console.WriteLine(boundary + "::" + content);
+                //input.Position = 0;
+
+                var multi_part = new HttpMultipart(input, boundary, ContentEncoding);
+
+                HttpMultipart.Element e;
+                while ((e = multi_part.ReadNextElement()) != null)
+                {
+                    if (e.Filename == null)
+                    {
+                        byte[] copy = new byte[e.Length];
+
+                        input.Position = e.Start;
+                        input.Read(copy, 0, (int)e.Length);
+
+                        form.Add(e.Name, (e.Encoding ?? ContentEncoding).GetString(copy, 0, copy.Length));
+                    }
+                    else
+                    {
+                        //
+                        // We use a substream, as in 2.x we will support large uploads streamed to disk,
+                        //
+                        HttpPostedFile sub = new HttpPostedFile(e.Filename, e.ContentType, input, e.Start, e.Length);
+                        files[e.Name] = sub;
+                    }
+                }
+            }
+        }
+
+        public QueryParamCollection Form
+        {
+            get
+            {
+                if (form == null)
+                {
+                    form = new WebROCollection();
+                    files = new Dictionary<string, HttpPostedFile>();
+
+                    if (IsContentType("multipart/form-data", true))
+                    {
+                        var task = LoadMultiPart();
+                        Task.WaitAll(task);
+                    }
+                    else if (IsContentType("application/x-www-form-urlencoded", true))
+                    {
+                        var task = LoadWwwForm();
+                        Task.WaitAll(task);
+                    }
+
+                    form.Protect();
+                }
+
+#if NET_4_0
+				if (validateRequestNewMode && !checked_form) {
+					// Setting this before calling the validator prevents
+					// possible endless recursion
+					checked_form = true;
+					ValidateNameValueCollection ("Form", query_string_nvc, RequestValidationSource.Form);
+				} else
+#endif
+                if (validate_form && !checked_form)
+                {
+                    checked_form = true;
+                    ValidateNameValueCollection("Form", form);
+                }
+
+                return form;
+            }
+        }
+
+        public string Accept
+        {
+            get
+            {
+                return string.IsNullOrEmpty(request.Headers["Accept"]) ? null : request.Headers["Accept"];
+            }
+        }
+
+        public string Authorization
+        {
+            get
+            {
+                return string.IsNullOrEmpty(request.Headers["Authorization"]) ? null : request.Headers["Authorization"];
+            }
+        }
+
+        protected bool validate_cookies, validate_query_string, validate_form;
+        protected bool checked_cookies, checked_query_string, checked_form;
+
+        static void ThrowValidationException(string name, string key, string value)
+        {
+            string v = "\"" + value + "\"";
+            if (v.Length > 20)
+                v = v.Substring(0, 16) + "...\"";
+
+            string msg = String.Format("A potentially dangerous Request.{0} value was " +
+                            "detected from the client ({1}={2}).", name, key, v);
+
+            throw new Exception(msg);
+        }
+
+        static void ValidateNameValueCollection(string name, QueryParamCollection coll)
+        {
+            if (coll == null)
+                return;
+
+            foreach (var pair in coll)
+            {
+                var key = pair.Name;
+                var val = pair.Value;
+                if (val != null && val.Length > 0 && IsInvalidString(val))
+                    ThrowValidationException(name, key, val);
+            }
+        }
+
+        internal static bool IsInvalidString(string val)
+        {
+            int validationFailureIndex;
+
+            return IsInvalidString(val, out validationFailureIndex);
+        }
+
+        internal static bool IsInvalidString(string val, out int validationFailureIndex)
+        {
+            validationFailureIndex = 0;
+
+            int len = val.Length;
+            if (len < 2)
+                return false;
+
+            char current = val[0];
+            for (int idx = 1; idx < len; idx++)
+            {
+                char next = val[idx];
+                // See http://secunia.com/advisories/14325
+                if (current == '<' || current == '\xff1c')
+                {
+                    if (next == '!' || next < ' '
+                        || (next >= 'a' && next <= 'z')
+                        || (next >= 'A' && next <= 'Z'))
+                    {
+                        validationFailureIndex = idx - 1;
+                        return true;
+                    }
+                }
+                else if (current == '&' && next == '#')
+                {
+                    validationFailureIndex = idx - 1;
+                    return true;
+                }
+
+                current = next;
+            }
+
+            return false;
+        }
+
+        public void ValidateInput()
+        {
+            validate_cookies = true;
+            validate_query_string = true;
+            validate_form = true;
+        }
+
+        bool IsContentType(string ct, bool starts_with)
+        {
+            if (ct == null || ContentType == null) return false;
+
+            if (starts_with)
+                return StrUtils.StartsWith(ContentType, ct, true);
+
+            return string.Equals(ContentType, ct, StringComparison.OrdinalIgnoreCase);
+        }
+
+        async Task LoadWwwForm()
+        {
+            using (Stream input = GetSubStream(InputStream, _memoryStreamProvider))
+            {
+                using (var ms = _memoryStreamProvider.CreateNew())
+                {
+                    await input.CopyToAsync(ms).ConfigureAwait(false);
+                    ms.Position = 0;
+
+                    using (StreamReader s = new StreamReader(ms, ContentEncoding))
+                    {
+                        StringBuilder key = new StringBuilder();
+                        StringBuilder value = new StringBuilder();
+                        int c;
+
+                        while ((c = s.Read()) != -1)
+                        {
+                            if (c == '=')
+                            {
+                                value.Length = 0;
+                                while ((c = s.Read()) != -1)
+                                {
+                                    if (c == '&')
+                                    {
+                                        AddRawKeyValue(key, value);
+                                        break;
+                                    }
+                                    else
+                                        value.Append((char)c);
+                                }
+                                if (c == -1)
+                                {
+                                    AddRawKeyValue(key, value);
+                                    return;
+                                }
+                            }
+                            else if (c == '&')
+                                AddRawKeyValue(key, value);
+                            else
+                                key.Append((char)c);
+                        }
+                        if (c == -1)
+                            AddRawKeyValue(key, value);
+                    }
+                }
+            }
+        }
+
+        void AddRawKeyValue(StringBuilder key, StringBuilder value)
+        {
+            string decodedKey = WebUtility.UrlDecode(key.ToString());
+            form.Add(decodedKey,
+                  WebUtility.UrlDecode(value.ToString()));
+
+            key.Length = 0;
+            value.Length = 0;
+        }
+
+        WebROCollection form;
+
+        Dictionary<string, HttpPostedFile> files;
+
+        class WebROCollection : QueryParamCollection
+        {
+            bool got_id;
+            int id;
+
+            public bool GotID
+            {
+                get { return got_id; }
+            }
+
+            public int ID
+            {
+                get { return id; }
+                set
+                {
+                    got_id = true;
+                    id = value;
+                }
+            }
+            public void Protect()
+            {
+                //IsReadOnly = true;
+            }
+
+            public void Unprotect()
+            {
+                //IsReadOnly = false;
+            }
+
+            public override string ToString()
+            {
+                StringBuilder result = new StringBuilder();
+                foreach (var pair in this)
+                {
+                    if (result.Length > 0)
+                        result.Append('&');
+
+                    var key = pair.Name;
+                    if (key != null && key.Length > 0)
+                    {
+                        result.Append(key);
+                        result.Append('=');
+                    }
+                    result.Append(pair.Value);
+                }
+
+                return result.ToString();
+            }
+        }
+
+        public sealed class HttpPostedFile
+        {
+            string name;
+            string content_type;
+            Stream stream;
+
+            class ReadSubStream : Stream
+            {
+                Stream s;
+                long offset;
+                long end;
+                long position;
+
+                public ReadSubStream(Stream s, long offset, long length)
+                {
+                    this.s = s;
+                    this.offset = offset;
+                    this.end = offset + length;
+                    position = offset;
+                }
+
+                public override void Flush()
+                {
+                }
+
+                public override int Read(byte[] buffer, int dest_offset, int count)
+                {
+                    if (buffer == null)
+                        throw new ArgumentNullException("buffer");
+
+                    if (dest_offset < 0)
+                        throw new ArgumentOutOfRangeException("dest_offset", "< 0");
+
+                    if (count < 0)
+                        throw new ArgumentOutOfRangeException("count", "< 0");
+
+                    int len = buffer.Length;
+                    if (dest_offset > len)
+                        throw new ArgumentException("destination offset is beyond array size");
+                    // reordered to avoid possible integer overflow
+                    if (dest_offset > len - count)
+                        throw new ArgumentException("Reading would overrun buffer");
+
+                    if (count > end - position)
+                        count = (int)(end - position);
+
+                    if (count <= 0)
+                        return 0;
+
+                    s.Position = position;
+                    int result = s.Read(buffer, dest_offset, count);
+                    if (result > 0)
+                        position += result;
+                    else
+                        position = end;
+
+                    return result;
+                }
+
+                public override int ReadByte()
+                {
+                    if (position >= end)
+                        return -1;
+
+                    s.Position = position;
+                    int result = s.ReadByte();
+                    if (result < 0)
+                        position = end;
+                    else
+                        position++;
+
+                    return result;
+                }
+
+                public override long Seek(long d, SeekOrigin origin)
+                {
+                    long real;
+                    switch (origin)
+                    {
+                        case SeekOrigin.Begin:
+                            real = offset + d;
+                            break;
+                        case SeekOrigin.End:
+                            real = end + d;
+                            break;
+                        case SeekOrigin.Current:
+                            real = position + d;
+                            break;
+                        default:
+                            throw new ArgumentException();
+                    }
+
+                    long virt = real - offset;
+                    if (virt < 0 || virt > Length)
+                        throw new ArgumentException();
+
+                    position = s.Seek(real, SeekOrigin.Begin);
+                    return position;
+                }
+
+                public override void SetLength(long value)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public override void Write(byte[] buffer, int offset, int count)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public override bool CanRead
+                {
+                    get { return true; }
+                }
+                public override bool CanSeek
+                {
+                    get { return true; }
+                }
+                public override bool CanWrite
+                {
+                    get { return false; }
+                }
+
+                public override long Length
+                {
+                    get { return end - offset; }
+                }
+
+                public override long Position
+                {
+                    get
+                    {
+                        return position - offset;
+                    }
+                    set
+                    {
+                        if (value > Length)
+                            throw new ArgumentOutOfRangeException();
+
+                        position = Seek(value, SeekOrigin.Begin);
+                    }
+                }
+            }
+
+            internal HttpPostedFile(string name, string content_type, Stream base_stream, long offset, long length)
+            {
+                this.name = name;
+                this.content_type = content_type;
+                this.stream = new ReadSubStream(base_stream, offset, length);
+            }
+
+            public string ContentType
+            {
+                get
+                {
+                    return content_type;
+                }
+            }
+
+            public int ContentLength
+            {
+                get
+                {
+                    return (int)stream.Length;
+                }
+            }
+
+            public string FileName
+            {
+                get
+                {
+                    return name;
+                }
+            }
+
+            public Stream InputStream
+            {
+                get
+                {
+                    return stream;
+                }
+            }
+        }
+
+        class Helpers
+        {
+            public static readonly CultureInfo InvariantCulture = CultureInfo.InvariantCulture;
+        }
+
+        internal sealed class StrUtils
+        {
+            public static bool StartsWith(string str1, string str2, bool ignore_case)
+            {
+                if (string.IsNullOrWhiteSpace(str1))
+                {
+                    return false;
+                }
+
+                var comparison = ignore_case ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+                return str1.IndexOf(str2, comparison) == 0;
+            }
+
+            public static bool EndsWith(string str1, string str2, bool ignore_case)
+            {
+                int l2 = str2.Length;
+                if (l2 == 0)
+                    return true;
+
+                int l1 = str1.Length;
+                if (l2 > l1)
+                    return false;
+
+                var comparison = ignore_case ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+                return str1.IndexOf(str2, comparison) == str1.Length - str2.Length - 1;
+            }
+        }
+
+        class HttpMultipart
+        {
+
+            public class Element
+            {
+                public string ContentType;
+                public string Name;
+                public string Filename;
+                public Encoding Encoding;
+                public long Start;
+                public long Length;
+
+                public override string ToString()
+                {
+                    return "ContentType " + ContentType + ", Name " + Name + ", Filename " + Filename + ", Start " +
+                        Start.ToString() + ", Length " + Length.ToString();
+                }
+            }
+
+            Stream data;
+            string boundary;
+            byte[] boundary_bytes;
+            byte[] buffer;
+            bool at_eof;
+            Encoding encoding;
+            StringBuilder sb;
+
+            const byte HYPHEN = (byte)'-', LF = (byte)'\n', CR = (byte)'\r';
+
+            // See RFC 2046 
+            // In the case of multipart entities, in which one or more different
+            // sets of data are combined in a single body, a "multipart" media type
+            // field must appear in the entity's header.  The body must then contain
+            // one or more body parts, each preceded by a boundary delimiter line,
+            // and the last one followed by a closing boundary delimiter line.
+            // After its boundary delimiter line, each body part then consists of a
+            // header area, a blank line, and a body area.  Thus a body part is
+            // similar to an RFC 822 message in syntax, but different in meaning.
+
+            public HttpMultipart(Stream data, string b, Encoding encoding)
+            {
+                this.data = data;
+                //DB: 30/01/11: cannot set or read the Position in HttpListener in Win.NET
+                //var ms = new MemoryStream(32 * 1024);
+                //data.CopyTo(ms);
+                //this.data = ms;
+
+                boundary = b;
+                boundary_bytes = encoding.GetBytes(b);
+                buffer = new byte[boundary_bytes.Length + 2]; // CRLF or '--'
+                this.encoding = encoding;
+                sb = new StringBuilder();
+            }
+
+            string ReadLine()
+            {
+                // CRLF or LF are ok as line endings.
+                bool got_cr = false;
+                int b = 0;
+                sb.Length = 0;
+                while (true)
+                {
+                    b = data.ReadByte();
+                    if (b == -1)
+                    {
+                        return null;
+                    }
+
+                    if (b == LF)
+                    {
+                        break;
+                    }
+                    got_cr = b == CR;
+                    sb.Append((char)b);
+                }
+
+                if (got_cr)
+                    sb.Length--;
+
+                return sb.ToString();
+
+            }
+
+            static string GetContentDispositionAttribute(string l, string name)
+            {
+                int idx = l.IndexOf(name + "=\"");
+                if (idx < 0)
+                    return null;
+                int begin = idx + name.Length + "=\"".Length;
+                int end = l.IndexOf('"', begin);
+                if (end < 0)
+                    return null;
+                if (begin == end)
+                    return "";
+                return l.Substring(begin, end - begin);
+            }
+
+            string GetContentDispositionAttributeWithEncoding(string l, string name)
+            {
+                int idx = l.IndexOf(name + "=\"");
+                if (idx < 0)
+                    return null;
+                int begin = idx + name.Length + "=\"".Length;
+                int end = l.IndexOf('"', begin);
+                if (end < 0)
+                    return null;
+                if (begin == end)
+                    return "";
+
+                string temp = l.Substring(begin, end - begin);
+                byte[] source = new byte[temp.Length];
+                for (int i = temp.Length - 1; i >= 0; i--)
+                    source[i] = (byte)temp[i];
+
+                return encoding.GetString(source, 0, source.Length);
+            }
+
+            bool ReadBoundary()
+            {
+                try
+                {
+                    string line = ReadLine();
+                    while (line == "")
+                        line = ReadLine();
+                    if (line[0] != '-' || line[1] != '-')
+                        return false;
+
+                    if (!StrUtils.EndsWith(line, boundary, false))
+                        return true;
+                }
+                catch
+                {
+                }
+
+                return false;
+            }
+
+            string ReadHeaders()
+            {
+                string s = ReadLine();
+                if (s == "")
+                    return null;
+
+                return s;
+            }
+
+            bool CompareBytes(byte[] orig, byte[] other)
+            {
+                for (int i = orig.Length - 1; i >= 0; i--)
+                    if (orig[i] != other[i])
+                        return false;
+
+                return true;
+            }
+
+            long MoveToNextBoundary()
+            {
+                long retval = 0;
+                bool got_cr = false;
+
+                int state = 0;
+                int c = data.ReadByte();
+                while (true)
+                {
+                    if (c == -1)
+                        return -1;
+
+                    if (state == 0 && c == LF)
+                    {
+                        retval = data.Position - 1;
+                        if (got_cr)
+                            retval--;
+                        state = 1;
+                        c = data.ReadByte();
+                    }
+                    else if (state == 0)
+                    {
+                        got_cr = c == CR;
+                        c = data.ReadByte();
+                    }
+                    else if (state == 1 && c == '-')
+                    {
+                        c = data.ReadByte();
+                        if (c == -1)
+                            return -1;
+
+                        if (c != '-')
+                        {
+                            state = 0;
+                            got_cr = false;
+                            continue; // no ReadByte() here
+                        }
+
+                        int nread = data.Read(buffer, 0, buffer.Length);
+                        int bl = buffer.Length;
+                        if (nread != bl)
+                            return -1;
+
+                        if (!CompareBytes(boundary_bytes, buffer))
+                        {
+                            state = 0;
+                            data.Position = retval + 2;
+                            if (got_cr)
+                            {
+                                data.Position++;
+                                got_cr = false;
+                            }
+                            c = data.ReadByte();
+                            continue;
+                        }
+
+                        if (buffer[bl - 2] == '-' && buffer[bl - 1] == '-')
+                        {
+                            at_eof = true;
+                        }
+                        else if (buffer[bl - 2] != CR || buffer[bl - 1] != LF)
+                        {
+                            state = 0;
+                            data.Position = retval + 2;
+                            if (got_cr)
+                            {
+                                data.Position++;
+                                got_cr = false;
+                            }
+                            c = data.ReadByte();
+                            continue;
+                        }
+                        data.Position = retval + 2;
+                        if (got_cr)
+                            data.Position++;
+                        break;
+                    }
+                    else
+                    {
+                        // state == 1
+                        state = 0; // no ReadByte() here
+                    }
+                }
+
+                return retval;
+            }
+
+            public Element ReadNextElement()
+            {
+                if (at_eof || ReadBoundary())
+                    return null;
+
+                Element elem = new Element();
+                string header;
+                while ((header = ReadHeaders()) != null)
+                {
+                    if (StrUtils.StartsWith(header, "Content-Disposition:", true))
+                    {
+                        elem.Name = GetContentDispositionAttribute(header, "name");
+                        elem.Filename = StripPath(GetContentDispositionAttributeWithEncoding(header, "filename"));
+                    }
+                    else if (StrUtils.StartsWith(header, "Content-Type:", true))
+                    {
+                        elem.ContentType = header.Substring("Content-Type:".Length).Trim();
+                        elem.Encoding = GetEncoding(elem.ContentType);
+                    }
+                }
+
+                long start = 0;
+                start = data.Position;
+                elem.Start = start;
+                long pos = MoveToNextBoundary();
+                if (pos == -1)
+                    return null;
+
+                elem.Length = pos - start;
+                return elem;
+            }
+
+            static string StripPath(string path)
+            {
+                if (path == null || path.Length == 0)
+                    return path;
+
+                if (path.IndexOf(":\\") != 1 && !path.StartsWith("\\\\"))
+                    return path;
+                return path.Substring(path.LastIndexOf('\\') + 1);
+            }
+        }
+
+    }
+}
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
new file mode 100644
index 000000000..b3fcde745
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
@@ -0,0 +1,620 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using Emby.Server.Implementations.HttpServer;
+using Emby.Server.Implementations.HttpServer.SocketSharp;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Services;
+using SocketHttpListener.Net;
+using IHttpFile = MediaBrowser.Model.Services.IHttpFile;
+using IHttpRequest = MediaBrowser.Model.Services.IHttpRequest;
+using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse;
+using IResponse = MediaBrowser.Model.Services.IResponse;
+
+namespace Emby.Server.Implementations.HttpServer.SocketSharp
+{
+    public partial class WebSocketSharpRequest : IHttpRequest
+    {
+        private readonly HttpListenerRequest request;
+        private readonly IHttpResponse response;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
+
+        public WebSocketSharpRequest(HttpListenerContext httpContext, string operationName, ILogger logger, IMemoryStreamFactory memoryStreamProvider)
+        {
+            this.OperationName = operationName;
+            _memoryStreamProvider = memoryStreamProvider;
+            this.request = httpContext.Request;
+            this.response = new WebSocketSharpResponse(logger, httpContext.Response, this);
+        }
+
+        public HttpListenerRequest HttpRequest
+        {
+            get { return request; }
+        }
+
+        public object OriginalRequest
+        {
+            get { return request; }
+        }
+
+        public IResponse Response
+        {
+            get { return response; }
+        }
+
+        public IHttpResponse HttpResponse
+        {
+            get { return response; }
+        }
+
+        public string OperationName { get; set; }
+
+        public object Dto { get; set; }
+
+        public string RawUrl
+        {
+            get { return request.RawUrl; }
+        }
+
+        public string AbsoluteUri
+        {
+            get { return request.Url.AbsoluteUri.TrimEnd('/'); }
+        }
+
+        public string UserHostAddress
+        {
+            get { return request.UserHostAddress; }
+        }
+
+        public string XForwardedFor
+        {
+            get
+            {
+                return String.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
+            }
+        }
+
+        public int? XForwardedPort
+        {
+            get
+            {
+                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Port"]) ? (int?)null : int.Parse(request.Headers["X-Forwarded-Port"]);
+            }
+        }
+
+        public string XForwardedProtocol
+        {
+            get
+            {
+                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Proto"]) ? null : request.Headers["X-Forwarded-Proto"];
+            }
+        }
+
+        public string XRealIp
+        {
+            get
+            {
+                return String.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
+            }
+        }
+
+        private string remoteIp;
+        public string RemoteIp
+        {
+            get
+            {
+                return remoteIp ??
+                    (remoteIp = (CheckBadChars(XForwardedFor)) ??
+                                (NormalizeIp(CheckBadChars(XRealIp)) ??
+                                (request.RemoteEndPoint != null ? NormalizeIp(request.RemoteEndPoint.IpAddress.ToString()) : null)));
+            }
+        }
+
+        private static readonly char[] HttpTrimCharacters = new char[] { (char)0x09, (char)0xA, (char)0xB, (char)0xC, (char)0xD, (char)0x20 };
+
+        //
+        // CheckBadChars - throws on invalid chars to be not found in header name/value
+        //
+        internal static string CheckBadChars(string name)
+        {
+            if (name == null || name.Length == 0)
+            {
+                return name;
+            }
+
+            // VALUE check
+            //Trim spaces from both ends
+            name = name.Trim(HttpTrimCharacters);
+
+            //First, check for correctly formed multi-line value
+            //Second, check for absenece of CTL characters
+            int crlf = 0;
+            for (int i = 0; i < name.Length; ++i)
+            {
+                char c = (char)(0x000000ff & (uint)name[i]);
+                switch (crlf)
+                {
+                    case 0:
+                        if (c == '\r')
+                        {
+                            crlf = 1;
+                        }
+                        else if (c == '\n')
+                        {
+                            // Technically this is bad HTTP.  But it would be a breaking change to throw here.
+                            // Is there an exploit?
+                            crlf = 2;
+                        }
+                        else if (c == 127 || (c < ' ' && c != '\t'))
+                        {
+                            throw new ArgumentException("net_WebHeaderInvalidControlChars");
+                        }
+                        break;
+
+                    case 1:
+                        if (c == '\n')
+                        {
+                            crlf = 2;
+                            break;
+                        }
+                        throw new ArgumentException("net_WebHeaderInvalidCRLFChars");
+
+                    case 2:
+                        if (c == ' ' || c == '\t')
+                        {
+                            crlf = 0;
+                            break;
+                        }
+                        throw new ArgumentException("net_WebHeaderInvalidCRLFChars");
+                }
+            }
+            if (crlf != 0)
+            {
+                throw new ArgumentException("net_WebHeaderInvalidCRLFChars");
+            }
+            return name;
+        }
+
+        internal static bool ContainsNonAsciiChars(string token)
+        {
+            for (int i = 0; i < token.Length; ++i)
+            {
+                if ((token[i] < 0x20) || (token[i] > 0x7e))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private string NormalizeIp(string ip)
+        {
+            if (!string.IsNullOrWhiteSpace(ip))
+            {
+                // Handle ipv4 mapped to ipv6
+                const string srch = "::ffff:";
+                var index = ip.IndexOf(srch, StringComparison.OrdinalIgnoreCase);
+                if (index == 0)
+                {
+                    ip = ip.Substring(srch.Length);
+                }
+            }
+
+            return ip;
+        }
+
+        public bool IsSecureConnection
+        {
+            get { return request.IsSecureConnection || XForwardedProtocol == "https"; }
+        }
+
+        public string[] AcceptTypes
+        {
+            get { return request.AcceptTypes; }
+        }
+
+        private Dictionary<string, object> items;
+        public Dictionary<string, object> Items
+        {
+            get { return items ?? (items = new Dictionary<string, object>()); }
+        }
+
+        private string responseContentType;
+        public string ResponseContentType
+        {
+            get
+            {
+                return responseContentType
+                    ?? (responseContentType = GetResponseContentType(this));
+            }
+            set
+            {
+                this.responseContentType = value;
+                HasExplicitResponseContentType = true;
+            }
+        }
+
+        public const string FormUrlEncoded = "application/x-www-form-urlencoded";
+        public const string MultiPartFormData = "multipart/form-data";
+        private static string GetResponseContentType(IRequest httpReq)
+        {
+            var specifiedContentType = GetQueryStringContentType(httpReq);
+            if (!string.IsNullOrEmpty(specifiedContentType)) return specifiedContentType;
+
+            var serverDefaultContentType = "application/json";
+
+            var acceptContentTypes = httpReq.AcceptTypes;
+            var defaultContentType = httpReq.ContentType;
+            if (HasAnyOfContentTypes(httpReq, FormUrlEncoded, MultiPartFormData))
+            {
+                defaultContentType = serverDefaultContentType;
+            }
+
+            var preferredContentTypes = new string[] {};
+
+            var acceptsAnything = false;
+            var hasDefaultContentType = !string.IsNullOrEmpty(defaultContentType);
+            if (acceptContentTypes != null)
+            {
+                var hasPreferredContentTypes = new bool[preferredContentTypes.Length];
+                foreach (var acceptsType in acceptContentTypes)
+                {
+                    var contentType = HttpResultFactory.GetRealContentType(acceptsType);
+                    acceptsAnything = acceptsAnything || contentType == "*/*";
+
+                    for (var i = 0; i < preferredContentTypes.Length; i++)
+                    {
+                        if (hasPreferredContentTypes[i]) continue;
+                        var preferredContentType = preferredContentTypes[i];
+                        hasPreferredContentTypes[i] = contentType.StartsWith(preferredContentType);
+
+                        //Prefer Request.ContentType if it is also a preferredContentType
+                        if (hasPreferredContentTypes[i] && preferredContentType == defaultContentType)
+                            return preferredContentType;
+                    }
+                }
+
+                for (var i = 0; i < preferredContentTypes.Length; i++)
+                {
+                    if (hasPreferredContentTypes[i]) return preferredContentTypes[i];
+                }
+
+                if (acceptsAnything)
+                {
+                    if (hasDefaultContentType)
+                        return defaultContentType;
+                    if (serverDefaultContentType != null)
+                        return serverDefaultContentType;
+                }
+            }
+
+            if (acceptContentTypes == null && httpReq.ContentType == Soap11)
+            {
+                return Soap11;
+            }
+
+            //We could also send a '406 Not Acceptable', but this is allowed also
+            return serverDefaultContentType;
+        }
+
+        public const string Soap11 = "text/xml; charset=utf-8";
+
+        public static bool HasAnyOfContentTypes(IRequest request, params string[] contentTypes)
+        {
+            if (contentTypes == null || request.ContentType == null) return false;
+            foreach (var contentType in contentTypes)
+            {
+                if (IsContentType(request, contentType)) return true;
+            }
+            return false;
+        }
+
+        public static bool IsContentType(IRequest request, string contentType)
+        {
+            return request.ContentType.StartsWith(contentType, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public const string Xml = "application/xml";
+        private static string GetQueryStringContentType(IRequest httpReq)
+        {
+            var format = httpReq.QueryString["format"];
+            if (format == null)
+            {
+                const int formatMaxLength = 4;
+                var pi = httpReq.PathInfo;
+                if (pi == null || pi.Length <= formatMaxLength) return null;
+                if (pi[0] == '/') pi = pi.Substring(1);
+                format = LeftPart(pi, '/');
+                if (format.Length > formatMaxLength) return null;
+            }
+
+            format = LeftPart(format, '.').ToLower();
+            if (format.Contains("json")) return "application/json";
+            if (format.Contains("xml")) return Xml;
+
+            return null;
+        }
+
+        public static string LeftPart(string strVal, char needle)
+        {
+            if (strVal == null) return null;
+            var pos = strVal.IndexOf(needle);
+            return pos == -1
+                ? strVal
+                : strVal.Substring(0, pos);
+        }
+
+        public bool HasExplicitResponseContentType { get; private set; }
+
+        public static string HandlerFactoryPath;
+
+        private string pathInfo;
+        public string PathInfo
+        {
+            get
+            {
+                if (this.pathInfo == null)
+                {
+                    var mode = HandlerFactoryPath;
+
+                    var pos = request.RawUrl.IndexOf("?");
+                    if (pos != -1)
+                    {
+                        var path = request.RawUrl.Substring(0, pos);
+                        this.pathInfo = GetPathInfo(
+                            path,
+                            mode,
+                            mode ?? "");
+                    }
+                    else
+                    {
+                        this.pathInfo = request.RawUrl;
+                    }
+
+                    this.pathInfo = WebUtility.UrlDecode(pathInfo);
+                    this.pathInfo = NormalizePathInfo(pathInfo, mode);
+                }
+                return this.pathInfo;
+            }
+        }
+
+        private static string GetPathInfo(string fullPath, string mode, string appPath)
+        {
+            var pathInfo = ResolvePathInfoFromMappedPath(fullPath, mode);
+            if (!string.IsNullOrEmpty(pathInfo)) return pathInfo;
+
+            //Wildcard mode relies on this to work out the handlerPath
+            pathInfo = ResolvePathInfoFromMappedPath(fullPath, appPath);
+            if (!string.IsNullOrEmpty(pathInfo)) return pathInfo;
+
+            return fullPath;
+        }
+
+
+
+        private static string ResolvePathInfoFromMappedPath(string fullPath, string mappedPathRoot)
+        {
+            if (mappedPathRoot == null) return null;
+
+            var sbPathInfo = new StringBuilder();
+            var fullPathParts = fullPath.Split('/');
+            var mappedPathRootParts = mappedPathRoot.Split('/');
+            var fullPathIndexOffset = mappedPathRootParts.Length - 1;
+            var pathRootFound = false;
+
+            for (var fullPathIndex = 0; fullPathIndex < fullPathParts.Length; fullPathIndex++)
+            {
+                if (pathRootFound)
+                {
+                    sbPathInfo.Append("/" + fullPathParts[fullPathIndex]);
+                }
+                else if (fullPathIndex - fullPathIndexOffset >= 0)
+                {
+                    pathRootFound = true;
+                    for (var mappedPathRootIndex = 0; mappedPathRootIndex < mappedPathRootParts.Length; mappedPathRootIndex++)
+                    {
+                        if (!string.Equals(fullPathParts[fullPathIndex - fullPathIndexOffset + mappedPathRootIndex], mappedPathRootParts[mappedPathRootIndex], StringComparison.OrdinalIgnoreCase))
+                        {
+                            pathRootFound = false;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (!pathRootFound) return null;
+
+            var path = sbPathInfo.ToString();
+            return path.Length > 1 ? path.TrimEnd('/') : "/";
+        }
+
+        private Dictionary<string, System.Net.Cookie> cookies;
+        public IDictionary<string, System.Net.Cookie> Cookies
+        {
+            get
+            {
+                if (cookies == null)
+                {
+                    cookies = new Dictionary<string, System.Net.Cookie>();
+                    foreach (var cookie in this.request.Cookies)
+                    {
+                        var httpCookie = (Cookie) cookie;
+                        cookies[httpCookie.Name] = new System.Net.Cookie(httpCookie.Name, httpCookie.Value, httpCookie.Path, httpCookie.Domain);
+                    }
+                }
+
+                return cookies;
+            }
+        }
+
+        public string UserAgent
+        {
+            get { return request.UserAgent; }
+        }
+
+        public QueryParamCollection Headers
+        {
+            get { return request.Headers; }
+        }
+
+        private QueryParamCollection queryString;
+        public QueryParamCollection QueryString
+        {
+            get { return queryString ?? (queryString = MyHttpUtility.ParseQueryString(request.Url.Query)); }
+        }
+
+        private QueryParamCollection formData;
+        public QueryParamCollection FormData
+        {
+            get { return formData ?? (formData = this.Form); }
+        }
+
+        public bool IsLocal
+        {
+            get { return request.IsLocal; }
+        }
+
+        private string httpMethod;
+        public string HttpMethod
+        {
+            get
+            {
+                return httpMethod
+                    ?? (httpMethod = request.HttpMethod);
+            }
+        }
+
+        public string Verb
+        {
+            get { return HttpMethod; }
+        }
+
+        public string Param(string name)
+        {
+            return Headers[name]
+                ?? QueryString[name]
+                ?? FormData[name];
+        }
+
+        public string ContentType
+        {
+            get { return request.ContentType; }
+        }
+
+        public Encoding contentEncoding;
+        public Encoding ContentEncoding
+        {
+            get { return contentEncoding ?? request.ContentEncoding; }
+            set { contentEncoding = value; }
+        }
+
+        public Uri UrlReferrer
+        {
+            get { return request.UrlReferrer; }
+        }
+
+        public static Encoding GetEncoding(string contentTypeHeader)
+        {
+            var param = GetParameter(contentTypeHeader, "charset=");
+            if (param == null) return null;
+            try
+            {
+                return Encoding.GetEncoding(param);
+            }
+            catch (ArgumentException)
+            {
+                return null;
+            }
+        }
+
+        public Stream InputStream
+        {
+            get { return request.InputStream; }
+        }
+
+        public long ContentLength
+        {
+            get { return request.ContentLength64; }
+        }
+
+        private IHttpFile[] httpFiles;
+        public IHttpFile[] Files
+        {
+            get
+            {
+                if (httpFiles == null)
+                {
+                    if (files == null)
+                        return httpFiles = new IHttpFile[0];
+
+                    httpFiles = new IHttpFile[files.Count];
+                    var i = 0;
+                    foreach (var pair in files)
+                    {
+                        var reqFile = pair.Value;
+                        httpFiles[i] = new HttpFile
+                        {
+                            ContentType = reqFile.ContentType,
+                            ContentLength = reqFile.ContentLength,
+                            FileName = reqFile.FileName,
+                            InputStream = reqFile.InputStream,
+                        };
+                        i++;
+                    }
+                }
+                return httpFiles;
+            }
+        }
+
+        static Stream GetSubStream(Stream stream, IMemoryStreamFactory streamProvider)
+        {
+            if (stream is MemoryStream)
+            {
+                var other = (MemoryStream)stream;
+
+                byte[] buffer;
+                if (streamProvider.TryGetBuffer(other, out buffer))
+                {
+                    return streamProvider.CreateNew(buffer);
+                }
+                return streamProvider.CreateNew(other.ToArray());
+            }
+
+            return stream;
+        }
+
+        public static string GetHandlerPathIfAny(string listenerUrl)
+        {
+            if (listenerUrl == null) return null;
+            var pos = listenerUrl.IndexOf("://", StringComparison.OrdinalIgnoreCase);
+            if (pos == -1) return null;
+            var startHostUrl = listenerUrl.Substring(pos + "://".Length);
+            var endPos = startHostUrl.IndexOf('/');
+            if (endPos == -1) return null;
+            var endHostUrl = startHostUrl.Substring(endPos + 1);
+            return String.IsNullOrEmpty(endHostUrl) ? null : endHostUrl.TrimEnd('/');
+        }
+
+        public static string NormalizePathInfo(string pathInfo, string handlerPath)
+        {
+            if (handlerPath != null && pathInfo.TrimStart('/').StartsWith(
+                handlerPath, StringComparison.OrdinalIgnoreCase))
+            {
+                return pathInfo.TrimStart('/').Substring(handlerPath.Length);
+            }
+
+            return pathInfo;
+        }
+    }
+
+    public class HttpFile : IHttpFile
+    {
+        public string Name { get; set; }
+        public string FileName { get; set; }
+        public long ContentLength { get; set; }
+        public string ContentType { get; set; }
+        public Stream InputStream { get; set; }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 4218370ac..f0a9c5ca3 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -2,10 +2,8 @@
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Implementations.HttpServer.SocketSharp;
 using ServiceStack;
 using ServiceStack.Host;
-using ServiceStack.Web;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -158,14 +156,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return this;
         }
 
-        public static string HandlerFactoryPath;
-
         /// <summary>
         /// Starts the Web Service
         /// </summary>
         private void StartListener()
         {
-            HandlerFactoryPath = GetHandlerPathIfAny(UrlPrefixes.First());
+            WebSocketSharpRequest.HandlerFactoryPath = GetHandlerPathIfAny(UrlPrefixes.First());
 
             _listener = GetListener();
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
deleted file mode 100644
index 543eb4afe..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
+++ /dev/null
@@ -1,917 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
-{
-    public partial class WebSocketSharpRequest : IHttpRequest
-    {
-        static internal string GetParameter(string header, string attr)
-        {
-            int ap = header.IndexOf(attr);
-            if (ap == -1)
-                return null;
-
-            ap += attr.Length;
-            if (ap >= header.Length)
-                return null;
-
-            char ending = header[ap];
-            if (ending != '"')
-                ending = ' ';
-
-            int end = header.IndexOf(ending, ap + 1);
-            if (end == -1)
-                return ending == '"' ? null : header.Substring(ap);
-
-            return header.Substring(ap + 1, end - ap - 1);
-        }
-
-        async Task LoadMultiPart()
-        {
-            string boundary = GetParameter(ContentType, "; boundary=");
-            if (boundary == null)
-                return;
-
-            using (var requestStream = GetSubStream(InputStream, _memoryStreamProvider))
-            {
-                //DB: 30/01/11 - Hack to get around non-seekable stream and received HTTP request
-                //Not ending with \r\n?
-                var ms = _memoryStreamProvider.CreateNew(32 * 1024);
-                await requestStream.CopyToAsync(ms).ConfigureAwait(false);
-
-                var input = ms;
-                ms.WriteByte((byte)'\r');
-                ms.WriteByte((byte)'\n');
-
-                input.Position = 0;
-
-                //Uncomment to debug
-                //var content = new StreamReader(ms).ReadToEnd();
-                //Console.WriteLine(boundary + "::" + content);
-                //input.Position = 0;
-
-                var multi_part = new HttpMultipart(input, boundary, ContentEncoding);
-
-                HttpMultipart.Element e;
-                while ((e = multi_part.ReadNextElement()) != null)
-                {
-                    if (e.Filename == null)
-                    {
-                        byte[] copy = new byte[e.Length];
-
-                        input.Position = e.Start;
-                        input.Read(copy, 0, (int)e.Length);
-
-                        form.Add(e.Name, (e.Encoding ?? ContentEncoding).GetString(copy));
-                    }
-                    else
-                    {
-                        //
-                        // We use a substream, as in 2.x we will support large uploads streamed to disk,
-                        //
-                        HttpPostedFile sub = new HttpPostedFile(e.Filename, e.ContentType, input, e.Start, e.Length);
-                        files.AddFile(e.Name, sub);
-                    }
-                }
-            }
-        }
-
-        public QueryParamCollection Form
-        {
-            get
-            {
-                if (form == null)
-                {
-                    form = new WebROCollection();
-                    files = new HttpFileCollection();
-
-                    if (IsContentType("multipart/form-data", true))
-                    {
-                        var task = LoadMultiPart();
-                        Task.WaitAll(task);
-                    }
-                    else if (IsContentType("application/x-www-form-urlencoded", true))
-                    {
-                        var task = LoadWwwForm();
-                        Task.WaitAll(task);
-                    }
-
-                    form.Protect();
-                }
-
-#if NET_4_0
-				if (validateRequestNewMode && !checked_form) {
-					// Setting this before calling the validator prevents
-					// possible endless recursion
-					checked_form = true;
-					ValidateNameValueCollection ("Form", query_string_nvc, RequestValidationSource.Form);
-				} else
-#endif
-                if (validate_form && !checked_form)
-                {
-                    checked_form = true;
-                    ValidateNameValueCollection("Form", form);
-                }
-
-                return form;
-            }
-        }
-
-        public string Accept
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["Accept"]) ? null : request.Headers["Accept"];
-            }
-        }
-
-        public string Authorization
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["Authorization"]) ? null : request.Headers["Authorization"];
-            }
-        }
-
-        protected bool validate_cookies, validate_query_string, validate_form;
-        protected bool checked_cookies, checked_query_string, checked_form;
-
-        static void ThrowValidationException(string name, string key, string value)
-        {
-            string v = "\"" + value + "\"";
-            if (v.Length > 20)
-                v = v.Substring(0, 16) + "...\"";
-
-            string msg = String.Format("A potentially dangerous Request.{0} value was " +
-                            "detected from the client ({1}={2}).", name, key, v);
-
-            throw new Exception(msg);
-        }
-
-        static void ValidateNameValueCollection(string name, QueryParamCollection coll)
-        {
-            if (coll == null)
-                return;
-
-            foreach (var pair in coll)
-            {
-                var key = pair.Name;
-                var val = pair.Value;
-                if (val != null && val.Length > 0 && IsInvalidString(val))
-                    ThrowValidationException(name, key, val);
-            }
-        }
-
-        internal static bool IsInvalidString(string val)
-        {
-            int validationFailureIndex;
-
-            return IsInvalidString(val, out validationFailureIndex);
-        }
-
-        internal static bool IsInvalidString(string val, out int validationFailureIndex)
-        {
-            validationFailureIndex = 0;
-
-            int len = val.Length;
-            if (len < 2)
-                return false;
-
-            char current = val[0];
-            for (int idx = 1; idx < len; idx++)
-            {
-                char next = val[idx];
-                // See http://secunia.com/advisories/14325
-                if (current == '<' || current == '\xff1c')
-                {
-                    if (next == '!' || next < ' '
-                        || (next >= 'a' && next <= 'z')
-                        || (next >= 'A' && next <= 'Z'))
-                    {
-                        validationFailureIndex = idx - 1;
-                        return true;
-                    }
-                }
-                else if (current == '&' && next == '#')
-                {
-                    validationFailureIndex = idx - 1;
-                    return true;
-                }
-
-                current = next;
-            }
-
-            return false;
-        }
-
-        public void ValidateInput()
-        {
-            validate_cookies = true;
-            validate_query_string = true;
-            validate_form = true;
-        }
-
-        bool IsContentType(string ct, bool starts_with)
-        {
-            if (ct == null || ContentType == null) return false;
-
-            if (starts_with)
-                return StrUtils.StartsWith(ContentType, ct, true);
-
-            return String.Compare(ContentType, ct, true, Helpers.InvariantCulture) == 0;
-        }
-
-        async Task LoadWwwForm()
-        {
-            using (Stream input = GetSubStream(InputStream, _memoryStreamProvider))
-            {
-                using (var ms = _memoryStreamProvider.CreateNew())
-                {
-                    await input.CopyToAsync(ms).ConfigureAwait(false);
-                    ms.Position = 0;
-
-                    using (StreamReader s = new StreamReader(ms, ContentEncoding))
-                    {
-                        StringBuilder key = new StringBuilder();
-                        StringBuilder value = new StringBuilder();
-                        int c;
-
-                        while ((c = s.Read()) != -1)
-                        {
-                            if (c == '=')
-                            {
-                                value.Length = 0;
-                                while ((c = s.Read()) != -1)
-                                {
-                                    if (c == '&')
-                                    {
-                                        AddRawKeyValue(key, value);
-                                        break;
-                                    }
-                                    else
-                                        value.Append((char)c);
-                                }
-                                if (c == -1)
-                                {
-                                    AddRawKeyValue(key, value);
-                                    return;
-                                }
-                            }
-                            else if (c == '&')
-                                AddRawKeyValue(key, value);
-                            else
-                                key.Append((char)c);
-                        }
-                        if (c == -1)
-                            AddRawKeyValue(key, value);
-                    }
-                }
-            }
-        }
-
-        void AddRawKeyValue(StringBuilder key, StringBuilder value)
-        {
-            string decodedKey = WebUtility.UrlDecode(key.ToString());
-            form.Add(decodedKey,
-                  WebUtility.UrlDecode(value.ToString()));
-
-            key.Length = 0;
-            value.Length = 0;
-        }
-
-        WebROCollection form;
-
-        HttpFileCollection files;
-
-        public sealed class HttpFileCollection : NameObjectCollectionBase
-        {
-            internal HttpFileCollection()
-            {
-            }
-
-            internal void AddFile(string name, HttpPostedFile file)
-            {
-                BaseAdd(name, file);
-            }
-
-            public void CopyTo(Array dest, int index)
-            {
-                /* XXX this is kind of gross and inefficient
-                 * since it makes a copy of the superclass's
-                 * list */
-                object[] values = BaseGetAllValues();
-                values.CopyTo(dest, index);
-            }
-
-            public string GetKey(int index)
-            {
-                return BaseGetKey(index);
-            }
-
-            public HttpPostedFile Get(int index)
-            {
-                return (HttpPostedFile)BaseGet(index);
-            }
-
-            public HttpPostedFile Get(string key)
-            {
-                return (HttpPostedFile)BaseGet(key);
-            }
-
-            public HttpPostedFile this[string key]
-            {
-                get
-                {
-                    return Get(key);
-                }
-            }
-
-            public HttpPostedFile this[int index]
-            {
-                get
-                {
-                    return Get(index);
-                }
-            }
-
-            public string[] AllKeys
-            {
-                get
-                {
-                    return BaseGetAllKeys();
-                }
-            }
-        }
-        class WebROCollection : QueryParamCollection
-        {
-            bool got_id;
-            int id;
-
-            public bool GotID
-            {
-                get { return got_id; }
-            }
-
-            public int ID
-            {
-                get { return id; }
-                set
-                {
-                    got_id = true;
-                    id = value;
-                }
-            }
-            public void Protect()
-            {
-                //IsReadOnly = true;
-            }
-
-            public void Unprotect()
-            {
-                //IsReadOnly = false;
-            }
-
-            public override string ToString()
-            {
-                StringBuilder result = new StringBuilder();
-                foreach (var pair in this)
-                {
-                    if (result.Length > 0)
-                        result.Append('&');
-
-                    var key = pair.Name;
-                    if (key != null && key.Length > 0)
-                    {
-                        result.Append(key);
-                        result.Append('=');
-                    }
-                    result.Append(pair.Value);
-                }
-
-                return result.ToString();
-            }
-        }
-
-        public sealed class HttpPostedFile
-        {
-            string name;
-            string content_type;
-            Stream stream;
-
-            class ReadSubStream : Stream
-            {
-                Stream s;
-                long offset;
-                long end;
-                long position;
-
-                public ReadSubStream(Stream s, long offset, long length)
-                {
-                    this.s = s;
-                    this.offset = offset;
-                    this.end = offset + length;
-                    position = offset;
-                }
-
-                public override void Flush()
-                {
-                }
-
-                public override int Read(byte[] buffer, int dest_offset, int count)
-                {
-                    if (buffer == null)
-                        throw new ArgumentNullException("buffer");
-
-                    if (dest_offset < 0)
-                        throw new ArgumentOutOfRangeException("dest_offset", "< 0");
-
-                    if (count < 0)
-                        throw new ArgumentOutOfRangeException("count", "< 0");
-
-                    int len = buffer.Length;
-                    if (dest_offset > len)
-                        throw new ArgumentException("destination offset is beyond array size");
-                    // reordered to avoid possible integer overflow
-                    if (dest_offset > len - count)
-                        throw new ArgumentException("Reading would overrun buffer");
-
-                    if (count > end - position)
-                        count = (int)(end - position);
-
-                    if (count <= 0)
-                        return 0;
-
-                    s.Position = position;
-                    int result = s.Read(buffer, dest_offset, count);
-                    if (result > 0)
-                        position += result;
-                    else
-                        position = end;
-
-                    return result;
-                }
-
-                public override int ReadByte()
-                {
-                    if (position >= end)
-                        return -1;
-
-                    s.Position = position;
-                    int result = s.ReadByte();
-                    if (result < 0)
-                        position = end;
-                    else
-                        position++;
-
-                    return result;
-                }
-
-                public override long Seek(long d, SeekOrigin origin)
-                {
-                    long real;
-                    switch (origin)
-                    {
-                        case SeekOrigin.Begin:
-                            real = offset + d;
-                            break;
-                        case SeekOrigin.End:
-                            real = end + d;
-                            break;
-                        case SeekOrigin.Current:
-                            real = position + d;
-                            break;
-                        default:
-                            throw new ArgumentException();
-                    }
-
-                    long virt = real - offset;
-                    if (virt < 0 || virt > Length)
-                        throw new ArgumentException();
-
-                    position = s.Seek(real, SeekOrigin.Begin);
-                    return position;
-                }
-
-                public override void SetLength(long value)
-                {
-                    throw new NotSupportedException();
-                }
-
-                public override void Write(byte[] buffer, int offset, int count)
-                {
-                    throw new NotSupportedException();
-                }
-
-                public override bool CanRead
-                {
-                    get { return true; }
-                }
-                public override bool CanSeek
-                {
-                    get { return true; }
-                }
-                public override bool CanWrite
-                {
-                    get { return false; }
-                }
-
-                public override long Length
-                {
-                    get { return end - offset; }
-                }
-
-                public override long Position
-                {
-                    get
-                    {
-                        return position - offset;
-                    }
-                    set
-                    {
-                        if (value > Length)
-                            throw new ArgumentOutOfRangeException();
-
-                        position = Seek(value, SeekOrigin.Begin);
-                    }
-                }
-            }
-
-            internal HttpPostedFile(string name, string content_type, Stream base_stream, long offset, long length)
-            {
-                this.name = name;
-                this.content_type = content_type;
-                this.stream = new ReadSubStream(base_stream, offset, length);
-            }
-
-            public string ContentType
-            {
-                get
-                {
-                    return content_type;
-                }
-            }
-
-            public int ContentLength
-            {
-                get
-                {
-                    return (int)stream.Length;
-                }
-            }
-
-            public string FileName
-            {
-                get
-                {
-                    return name;
-                }
-            }
-
-            public Stream InputStream
-            {
-                get
-                {
-                    return stream;
-                }
-            }
-        }
-
-        class Helpers
-        {
-            public static readonly CultureInfo InvariantCulture = CultureInfo.InvariantCulture;
-        }
-
-        internal sealed class StrUtils
-        {
-            StrUtils() { }
-
-            public static bool StartsWith(string str1, string str2)
-            {
-                return StartsWith(str1, str2, false);
-            }
-
-            public static bool StartsWith(string str1, string str2, bool ignore_case)
-            {
-                int l2 = str2.Length;
-                if (l2 == 0)
-                    return true;
-
-                int l1 = str1.Length;
-                if (l2 > l1)
-                    return false;
-
-                return 0 == String.Compare(str1, 0, str2, 0, l2, ignore_case, Helpers.InvariantCulture);
-            }
-
-            public static bool EndsWith(string str1, string str2)
-            {
-                return EndsWith(str1, str2, false);
-            }
-
-            public static bool EndsWith(string str1, string str2, bool ignore_case)
-            {
-                int l2 = str2.Length;
-                if (l2 == 0)
-                    return true;
-
-                int l1 = str1.Length;
-                if (l2 > l1)
-                    return false;
-
-                return 0 == String.Compare(str1, l1 - l2, str2, 0, l2, ignore_case, Helpers.InvariantCulture);
-            }
-        }
-
-        class HttpMultipart
-        {
-
-            public class Element
-            {
-                public string ContentType;
-                public string Name;
-                public string Filename;
-                public Encoding Encoding;
-                public long Start;
-                public long Length;
-
-                public override string ToString()
-                {
-                    return "ContentType " + ContentType + ", Name " + Name + ", Filename " + Filename + ", Start " +
-                        Start.ToString() + ", Length " + Length.ToString();
-                }
-            }
-
-            Stream data;
-            string boundary;
-            byte[] boundary_bytes;
-            byte[] buffer;
-            bool at_eof;
-            Encoding encoding;
-            StringBuilder sb;
-
-            const byte HYPHEN = (byte)'-', LF = (byte)'\n', CR = (byte)'\r';
-
-            // See RFC 2046 
-            // In the case of multipart entities, in which one or more different
-            // sets of data are combined in a single body, a "multipart" media type
-            // field must appear in the entity's header.  The body must then contain
-            // one or more body parts, each preceded by a boundary delimiter line,
-            // and the last one followed by a closing boundary delimiter line.
-            // After its boundary delimiter line, each body part then consists of a
-            // header area, a blank line, and a body area.  Thus a body part is
-            // similar to an RFC 822 message in syntax, but different in meaning.
-
-            public HttpMultipart(Stream data, string b, Encoding encoding)
-            {
-                this.data = data;
-                //DB: 30/01/11: cannot set or read the Position in HttpListener in Win.NET
-                //var ms = new MemoryStream(32 * 1024);
-                //data.CopyTo(ms);
-                //this.data = ms;
-
-                boundary = b;
-                boundary_bytes = encoding.GetBytes(b);
-                buffer = new byte[boundary_bytes.Length + 2]; // CRLF or '--'
-                this.encoding = encoding;
-                sb = new StringBuilder();
-            }
-
-            string ReadLine()
-            {
-                // CRLF or LF are ok as line endings.
-                bool got_cr = false;
-                int b = 0;
-                sb.Length = 0;
-                while (true)
-                {
-                    b = data.ReadByte();
-                    if (b == -1)
-                    {
-                        return null;
-                    }
-
-                    if (b == LF)
-                    {
-                        break;
-                    }
-                    got_cr = b == CR;
-                    sb.Append((char)b);
-                }
-
-                if (got_cr)
-                    sb.Length--;
-
-                return sb.ToString();
-
-            }
-
-            static string GetContentDispositionAttribute(string l, string name)
-            {
-                int idx = l.IndexOf(name + "=\"");
-                if (idx < 0)
-                    return null;
-                int begin = idx + name.Length + "=\"".Length;
-                int end = l.IndexOf('"', begin);
-                if (end < 0)
-                    return null;
-                if (begin == end)
-                    return "";
-                return l.Substring(begin, end - begin);
-            }
-
-            string GetContentDispositionAttributeWithEncoding(string l, string name)
-            {
-                int idx = l.IndexOf(name + "=\"");
-                if (idx < 0)
-                    return null;
-                int begin = idx + name.Length + "=\"".Length;
-                int end = l.IndexOf('"', begin);
-                if (end < 0)
-                    return null;
-                if (begin == end)
-                    return "";
-
-                string temp = l.Substring(begin, end - begin);
-                byte[] source = new byte[temp.Length];
-                for (int i = temp.Length - 1; i >= 0; i--)
-                    source[i] = (byte)temp[i];
-
-                return encoding.GetString(source);
-            }
-
-            bool ReadBoundary()
-            {
-                try
-                {
-                    string line = ReadLine();
-                    while (line == "")
-                        line = ReadLine();
-                    if (line[0] != '-' || line[1] != '-')
-                        return false;
-
-                    if (!StrUtils.EndsWith(line, boundary, false))
-                        return true;
-                }
-                catch
-                {
-                }
-
-                return false;
-            }
-
-            string ReadHeaders()
-            {
-                string s = ReadLine();
-                if (s == "")
-                    return null;
-
-                return s;
-            }
-
-            bool CompareBytes(byte[] orig, byte[] other)
-            {
-                for (int i = orig.Length - 1; i >= 0; i--)
-                    if (orig[i] != other[i])
-                        return false;
-
-                return true;
-            }
-
-            long MoveToNextBoundary()
-            {
-                long retval = 0;
-                bool got_cr = false;
-
-                int state = 0;
-                int c = data.ReadByte();
-                while (true)
-                {
-                    if (c == -1)
-                        return -1;
-
-                    if (state == 0 && c == LF)
-                    {
-                        retval = data.Position - 1;
-                        if (got_cr)
-                            retval--;
-                        state = 1;
-                        c = data.ReadByte();
-                    }
-                    else if (state == 0)
-                    {
-                        got_cr = c == CR;
-                        c = data.ReadByte();
-                    }
-                    else if (state == 1 && c == '-')
-                    {
-                        c = data.ReadByte();
-                        if (c == -1)
-                            return -1;
-
-                        if (c != '-')
-                        {
-                            state = 0;
-                            got_cr = false;
-                            continue; // no ReadByte() here
-                        }
-
-                        int nread = data.Read(buffer, 0, buffer.Length);
-                        int bl = buffer.Length;
-                        if (nread != bl)
-                            return -1;
-
-                        if (!CompareBytes(boundary_bytes, buffer))
-                        {
-                            state = 0;
-                            data.Position = retval + 2;
-                            if (got_cr)
-                            {
-                                data.Position++;
-                                got_cr = false;
-                            }
-                            c = data.ReadByte();
-                            continue;
-                        }
-
-                        if (buffer[bl - 2] == '-' && buffer[bl - 1] == '-')
-                        {
-                            at_eof = true;
-                        }
-                        else if (buffer[bl - 2] != CR || buffer[bl - 1] != LF)
-                        {
-                            state = 0;
-                            data.Position = retval + 2;
-                            if (got_cr)
-                            {
-                                data.Position++;
-                                got_cr = false;
-                            }
-                            c = data.ReadByte();
-                            continue;
-                        }
-                        data.Position = retval + 2;
-                        if (got_cr)
-                            data.Position++;
-                        break;
-                    }
-                    else
-                    {
-                        // state == 1
-                        state = 0; // no ReadByte() here
-                    }
-                }
-
-                return retval;
-            }
-
-            public Element ReadNextElement()
-            {
-                if (at_eof || ReadBoundary())
-                    return null;
-
-                Element elem = new Element();
-                string header;
-                while ((header = ReadHeaders()) != null)
-                {
-                    if (StrUtils.StartsWith(header, "Content-Disposition:", true))
-                    {
-                        elem.Name = GetContentDispositionAttribute(header, "name");
-                        elem.Filename = StripPath(GetContentDispositionAttributeWithEncoding(header, "filename"));
-                    }
-                    else if (StrUtils.StartsWith(header, "Content-Type:", true))
-                    {
-                        elem.ContentType = header.Substring("Content-Type:".Length).Trim();
-                        elem.Encoding = GetEncoding(elem.ContentType);
-                    }
-                }
-
-                long start = 0;
-                start = data.Position;
-                elem.Start = start;
-                long pos = MoveToNextBoundary();
-                if (pos == -1)
-                    return null;
-
-                elem.Length = pos - start;
-                return elem;
-            }
-
-            static string StripPath(string path)
-            {
-                if (path == null || path.Length == 0)
-                    return path;
-
-                if (path.IndexOf(":\\") != 1 && !path.StartsWith("\\\\"))
-                    return path;
-                return path.Substring(path.LastIndexOf('\\') + 1);
-            }
-        }
-
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
deleted file mode 100644
index 628e5cc7e..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
+++ /dev/null
@@ -1,609 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using Emby.Server.Implementations.HttpServer;
-using Emby.Server.Implementations.HttpServer.SocketSharp;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Services;
-using ServiceStack;
-using SocketHttpListener.Net;
-using IHttpFile = MediaBrowser.Model.Services.IHttpFile;
-using IHttpRequest = MediaBrowser.Model.Services.IHttpRequest;
-using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse;
-using IResponse = MediaBrowser.Model.Services.IResponse;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
-{
-    public partial class WebSocketSharpRequest : IHttpRequest
-    {
-        private readonly HttpListenerRequest request;
-        private readonly IHttpResponse response;
-        private readonly IMemoryStreamFactory _memoryStreamProvider;
-
-        public WebSocketSharpRequest(HttpListenerContext httpContext, string operationName, ILogger logger, IMemoryStreamFactory memoryStreamProvider)
-        {
-            this.OperationName = operationName;
-            _memoryStreamProvider = memoryStreamProvider;
-            this.request = httpContext.Request;
-            this.response = new WebSocketSharpResponse(logger, httpContext.Response, this);
-        }
-
-        public HttpListenerRequest HttpRequest
-        {
-            get { return request; }
-        }
-
-        public object OriginalRequest
-        {
-            get { return request; }
-        }
-
-        public IResponse Response
-        {
-            get { return response; }
-        }
-
-        public IHttpResponse HttpResponse
-        {
-            get { return response; }
-        }
-
-        public string OperationName { get; set; }
-
-        public object Dto { get; set; }
-
-        public string RawUrl
-        {
-            get { return request.RawUrl; }
-        }
-
-        public string AbsoluteUri
-        {
-            get { return request.Url.AbsoluteUri.TrimEnd('/'); }
-        }
-
-        public string UserHostAddress
-        {
-            get { return request.UserHostAddress; }
-        }
-
-        public string XForwardedFor
-        {
-            get
-            {
-                return String.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
-            }
-        }
-
-        public int? XForwardedPort
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Port"]) ? (int?)null : int.Parse(request.Headers["X-Forwarded-Port"]);
-            }
-        }
-
-        public string XForwardedProtocol
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Proto"]) ? null : request.Headers["X-Forwarded-Proto"];
-            }
-        }
-
-        public string XRealIp
-        {
-            get
-            {
-                return String.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
-            }
-        }
-
-        private string remoteIp;
-        public string RemoteIp
-        {
-            get
-            {
-                return remoteIp ??
-                    (remoteIp = (CheckBadChars(XForwardedFor)) ??
-                                (NormalizeIp(CheckBadChars(XRealIp)) ??
-                                (request.RemoteEndPoint != null ? NormalizeIp(request.RemoteEndPoint.IpAddress.ToString()) : null)));
-            }
-        }
-
-        private static readonly char[] HttpTrimCharacters = new char[] { (char)0x09, (char)0xA, (char)0xB, (char)0xC, (char)0xD, (char)0x20 };
-
-        //
-        // CheckBadChars - throws on invalid chars to be not found in header name/value
-        //
-        internal static string CheckBadChars(string name)
-        {
-            if (name == null || name.Length == 0)
-            {
-                return name;
-            }
-
-            // VALUE check
-            //Trim spaces from both ends
-            name = name.Trim(HttpTrimCharacters);
-
-            //First, check for correctly formed multi-line value
-            //Second, check for absenece of CTL characters
-            int crlf = 0;
-            for (int i = 0; i < name.Length; ++i)
-            {
-                char c = (char)(0x000000ff & (uint)name[i]);
-                switch (crlf)
-                {
-                    case 0:
-                        if (c == '\r')
-                        {
-                            crlf = 1;
-                        }
-                        else if (c == '\n')
-                        {
-                            // Technically this is bad HTTP.  But it would be a breaking change to throw here.
-                            // Is there an exploit?
-                            crlf = 2;
-                        }
-                        else if (c == 127 || (c < ' ' && c != '\t'))
-                        {
-                            throw new ArgumentException("net_WebHeaderInvalidControlChars");
-                        }
-                        break;
-
-                    case 1:
-                        if (c == '\n')
-                        {
-                            crlf = 2;
-                            break;
-                        }
-                        throw new ArgumentException("net_WebHeaderInvalidCRLFChars");
-
-                    case 2:
-                        if (c == ' ' || c == '\t')
-                        {
-                            crlf = 0;
-                            break;
-                        }
-                        throw new ArgumentException("net_WebHeaderInvalidCRLFChars");
-                }
-            }
-            if (crlf != 0)
-            {
-                throw new ArgumentException("net_WebHeaderInvalidCRLFChars");
-            }
-            return name;
-        }
-
-        internal static bool ContainsNonAsciiChars(string token)
-        {
-            for (int i = 0; i < token.Length; ++i)
-            {
-                if ((token[i] < 0x20) || (token[i] > 0x7e))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private string NormalizeIp(string ip)
-        {
-            if (!string.IsNullOrWhiteSpace(ip))
-            {
-                // Handle ipv4 mapped to ipv6
-                const string srch = "::ffff:";
-                var index = ip.IndexOf(srch, StringComparison.OrdinalIgnoreCase);
-                if (index == 0)
-                {
-                    ip = ip.Substring(srch.Length);
-                }
-            }
-
-            return ip;
-        }
-
-        public bool IsSecureConnection
-        {
-            get { return request.IsSecureConnection || XForwardedProtocol == "https"; }
-        }
-
-        public string[] AcceptTypes
-        {
-            get { return request.AcceptTypes; }
-        }
-
-        private Dictionary<string, object> items;
-        public Dictionary<string, object> Items
-        {
-            get { return items ?? (items = new Dictionary<string, object>()); }
-        }
-
-        private string responseContentType;
-        public string ResponseContentType
-        {
-            get
-            {
-                return responseContentType
-                    ?? (responseContentType = GetResponseContentType(this));
-            }
-            set
-            {
-                this.responseContentType = value;
-                HasExplicitResponseContentType = true;
-            }
-        }
-
-        public const string FormUrlEncoded = "application/x-www-form-urlencoded";
-        public const string MultiPartFormData = "multipart/form-data";
-        private static string GetResponseContentType(IRequest httpReq)
-        {
-            var specifiedContentType = GetQueryStringContentType(httpReq);
-            if (!string.IsNullOrEmpty(specifiedContentType)) return specifiedContentType;
-
-            var serverDefaultContentType = "application/json";
-
-            var acceptContentTypes = httpReq.AcceptTypes;
-            var defaultContentType = httpReq.ContentType;
-            if (HasAnyOfContentTypes(httpReq, FormUrlEncoded, MultiPartFormData))
-            {
-                defaultContentType = serverDefaultContentType;
-            }
-
-            var preferredContentTypes = new string[] {};
-
-            var acceptsAnything = false;
-            var hasDefaultContentType = !string.IsNullOrEmpty(defaultContentType);
-            if (acceptContentTypes != null)
-            {
-                var hasPreferredContentTypes = new bool[preferredContentTypes.Length];
-                foreach (var acceptsType in acceptContentTypes)
-                {
-                    var contentType = HttpResultFactory.GetRealContentType(acceptsType);
-                    acceptsAnything = acceptsAnything || contentType == "*/*";
-
-                    for (var i = 0; i < preferredContentTypes.Length; i++)
-                    {
-                        if (hasPreferredContentTypes[i]) continue;
-                        var preferredContentType = preferredContentTypes[i];
-                        hasPreferredContentTypes[i] = contentType.StartsWith(preferredContentType);
-
-                        //Prefer Request.ContentType if it is also a preferredContentType
-                        if (hasPreferredContentTypes[i] && preferredContentType == defaultContentType)
-                            return preferredContentType;
-                    }
-                }
-
-                for (var i = 0; i < preferredContentTypes.Length; i++)
-                {
-                    if (hasPreferredContentTypes[i]) return preferredContentTypes[i];
-                }
-
-                if (acceptsAnything)
-                {
-                    if (hasDefaultContentType)
-                        return defaultContentType;
-                    if (serverDefaultContentType != null)
-                        return serverDefaultContentType;
-                }
-            }
-
-            if (acceptContentTypes == null && httpReq.ContentType == Soap11)
-            {
-                return Soap11;
-            }
-
-            //We could also send a '406 Not Acceptable', but this is allowed also
-            return serverDefaultContentType;
-        }
-
-        public const string Soap11 = "text/xml; charset=utf-8";
-
-        public static bool HasAnyOfContentTypes(IRequest request, params string[] contentTypes)
-        {
-            if (contentTypes == null || request.ContentType == null) return false;
-            foreach (var contentType in contentTypes)
-            {
-                if (IsContentType(request, contentType)) return true;
-            }
-            return false;
-        }
-
-        public static bool IsContentType(IRequest request, string contentType)
-        {
-            return request.ContentType.StartsWith(contentType, StringComparison.OrdinalIgnoreCase);
-        }
-
-        public const string Xml = "application/xml";
-        private static string GetQueryStringContentType(IRequest httpReq)
-        {
-            var format = httpReq.QueryString["format"];
-            if (format == null)
-            {
-                const int formatMaxLength = 4;
-                var pi = httpReq.PathInfo;
-                if (pi == null || pi.Length <= formatMaxLength) return null;
-                if (pi[0] == '/') pi = pi.Substring(1);
-                format = pi.LeftPart('/');
-                if (format.Length > formatMaxLength) return null;
-            }
-
-            format = format.LeftPart('.').ToLower();
-            if (format.Contains("json")) return "application/json";
-            if (format.Contains("xml")) return Xml;
-
-            return null;
-        }
-
-        public bool HasExplicitResponseContentType { get; private set; }
-
-        private string pathInfo;
-        public string PathInfo
-        {
-            get
-            {
-                if (this.pathInfo == null)
-                {
-                    var mode = HttpListenerHost.HandlerFactoryPath;
-
-                    var pos = request.RawUrl.IndexOf("?");
-                    if (pos != -1)
-                    {
-                        var path = request.RawUrl.Substring(0, pos);
-                        this.pathInfo = GetPathInfo(
-                            path,
-                            mode,
-                            mode ?? "");
-                    }
-                    else
-                    {
-                        this.pathInfo = request.RawUrl;
-                    }
-
-                    this.pathInfo = this.pathInfo.UrlDecode();
-                    this.pathInfo = NormalizePathInfo(pathInfo, mode);
-                }
-                return this.pathInfo;
-            }
-        }
-
-        private static string GetPathInfo(string fullPath, string mode, string appPath)
-        {
-            var pathInfo = ResolvePathInfoFromMappedPath(fullPath, mode);
-            if (!string.IsNullOrEmpty(pathInfo)) return pathInfo;
-
-            //Wildcard mode relies on this to work out the handlerPath
-            pathInfo = ResolvePathInfoFromMappedPath(fullPath, appPath);
-            if (!string.IsNullOrEmpty(pathInfo)) return pathInfo;
-
-            return fullPath;
-        }
-
-
-
-        private static string ResolvePathInfoFromMappedPath(string fullPath, string mappedPathRoot)
-        {
-            if (mappedPathRoot == null) return null;
-
-            var sbPathInfo = new StringBuilder();
-            var fullPathParts = fullPath.Split('/');
-            var mappedPathRootParts = mappedPathRoot.Split('/');
-            var fullPathIndexOffset = mappedPathRootParts.Length - 1;
-            var pathRootFound = false;
-
-            for (var fullPathIndex = 0; fullPathIndex < fullPathParts.Length; fullPathIndex++)
-            {
-                if (pathRootFound)
-                {
-                    sbPathInfo.Append("/" + fullPathParts[fullPathIndex]);
-                }
-                else if (fullPathIndex - fullPathIndexOffset >= 0)
-                {
-                    pathRootFound = true;
-                    for (var mappedPathRootIndex = 0; mappedPathRootIndex < mappedPathRootParts.Length; mappedPathRootIndex++)
-                    {
-                        if (!string.Equals(fullPathParts[fullPathIndex - fullPathIndexOffset + mappedPathRootIndex], mappedPathRootParts[mappedPathRootIndex], StringComparison.OrdinalIgnoreCase))
-                        {
-                            pathRootFound = false;
-                            break;
-                        }
-                    }
-                }
-            }
-            if (!pathRootFound) return null;
-
-            var path = sbPathInfo.ToString();
-            return path.Length > 1 ? path.TrimEnd('/') : "/";
-        }
-
-        private Dictionary<string, System.Net.Cookie> cookies;
-        public IDictionary<string, System.Net.Cookie> Cookies
-        {
-            get
-            {
-                if (cookies == null)
-                {
-                    cookies = new Dictionary<string, System.Net.Cookie>();
-                    for (var i = 0; i < this.request.Cookies.Count; i++)
-                    {
-                        var httpCookie = this.request.Cookies[i];
-                        cookies[httpCookie.Name] = new System.Net.Cookie(httpCookie.Name, httpCookie.Value, httpCookie.Path, httpCookie.Domain);
-                    }
-                }
-
-                return cookies;
-            }
-        }
-
-        public string UserAgent
-        {
-            get { return request.UserAgent; }
-        }
-
-        public QueryParamCollection Headers
-        {
-            get { return request.Headers; }
-        }
-
-        private QueryParamCollection queryString;
-        public QueryParamCollection QueryString
-        {
-            get { return queryString ?? (queryString = MyHttpUtility.ParseQueryString(request.Url.Query)); }
-        }
-
-        private QueryParamCollection formData;
-        public QueryParamCollection FormData
-        {
-            get { return formData ?? (formData = this.Form); }
-        }
-
-        public bool IsLocal
-        {
-            get { return request.IsLocal; }
-        }
-
-        private string httpMethod;
-        public string HttpMethod
-        {
-            get
-            {
-                return httpMethod
-                    ?? (httpMethod = request.HttpMethod);
-            }
-        }
-
-        public string Verb
-        {
-            get { return HttpMethod; }
-        }
-
-        public string Param(string name)
-        {
-            return Headers[name]
-                ?? QueryString[name]
-                ?? FormData[name];
-        }
-
-        public string ContentType
-        {
-            get { return request.ContentType; }
-        }
-
-        public Encoding contentEncoding;
-        public Encoding ContentEncoding
-        {
-            get { return contentEncoding ?? request.ContentEncoding; }
-            set { contentEncoding = value; }
-        }
-
-        public Uri UrlReferrer
-        {
-            get { return request.UrlReferrer; }
-        }
-
-        public static Encoding GetEncoding(string contentTypeHeader)
-        {
-            var param = GetParameter(contentTypeHeader, "charset=");
-            if (param == null) return null;
-            try
-            {
-                return Encoding.GetEncoding(param);
-            }
-            catch (ArgumentException)
-            {
-                return null;
-            }
-        }
-
-        public Stream InputStream
-        {
-            get { return request.InputStream; }
-        }
-
-        public long ContentLength
-        {
-            get { return request.ContentLength64; }
-        }
-
-        private IHttpFile[] httpFiles;
-        public IHttpFile[] Files
-        {
-            get
-            {
-                if (httpFiles == null)
-                {
-                    if (files == null)
-                        return httpFiles = new IHttpFile[0];
-
-                    httpFiles = new IHttpFile[files.Count];
-                    for (var i = 0; i < files.Count; i++)
-                    {
-                        var reqFile = files[i];
-
-                        httpFiles[i] = new HttpFile
-                        {
-                            ContentType = reqFile.ContentType,
-                            ContentLength = reqFile.ContentLength,
-                            FileName = reqFile.FileName,
-                            InputStream = reqFile.InputStream,
-                        };
-                    }
-                }
-                return httpFiles;
-            }
-        }
-
-        static Stream GetSubStream(Stream stream, IMemoryStreamFactory streamProvider)
-        {
-            if (stream is MemoryStream)
-            {
-                var other = (MemoryStream)stream;
-                try
-                {
-                    return new MemoryStream(other.GetBuffer(), 0, (int)other.Length, false, true);
-                }
-                catch (UnauthorizedAccessException)
-                {
-                    return new MemoryStream(other.ToArray(), 0, (int)other.Length, false, true);
-                }
-            }
-
-            return stream;
-        }
-
-        public static string GetHandlerPathIfAny(string listenerUrl)
-        {
-            if (listenerUrl == null) return null;
-            var pos = listenerUrl.IndexOf("://", StringComparison.InvariantCultureIgnoreCase);
-            if (pos == -1) return null;
-            var startHostUrl = listenerUrl.Substring(pos + "://".Length);
-            var endPos = startHostUrl.IndexOf('/');
-            if (endPos == -1) return null;
-            var endHostUrl = startHostUrl.Substring(endPos + 1);
-            return String.IsNullOrEmpty(endHostUrl) ? null : endHostUrl.TrimEnd('/');
-        }
-
-        public static string NormalizePathInfo(string pathInfo, string handlerPath)
-        {
-            if (handlerPath != null && pathInfo.TrimStart('/').StartsWith(
-                handlerPath, StringComparison.InvariantCultureIgnoreCase))
-            {
-                return pathInfo.TrimStart('/').Substring(handlerPath.Length);
-            }
-
-            return pathInfo;
-        }
-    }
-
-    public class HttpFile : IHttpFile
-    {
-        public string Name { get; set; }
-        public string FileName { get; set; }
-        public long ContentLength { get; set; }
-        public string ContentType { get; set; }
-        public Stream InputStream { get; set; }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index a253753c5..6fb4f9e36 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -111,8 +111,6 @@
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
     <Compile Include="HttpServer\HttpListenerHost.cs" />
     <Compile Include="HttpServer\ServerFactory.cs" />
-    <Compile Include="HttpServer\SocketSharp\RequestMono.cs" />
-    <Compile Include="HttpServer\SocketSharp\WebSocketSharpRequest.cs" />
     <Compile Include="IO\LibraryMonitor.cs" />
     <Compile Include="IO\MemoryStreamProvider.cs" />
     <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" />
-- 
cgit v1.2.3


From 8492225deef59b4548976e162f6fa147abf923be Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 10 Nov 2016 22:29:51 -0500
Subject: update portable projects

---
 .../Emby.Server.Implementations.csproj             |   2 +
 .../HttpServer/HttpListenerHost.cs                 | 710 +++++++++++++++++++
 .../Playlists/ManualPlaylistsFolder.cs             |  74 ++
 .../ServerManager/ServerManager.cs                 |   8 +-
 MediaBrowser.Controller/Net/IHttpServer.cs         |  10 +-
 MediaBrowser.Controller/Net/IServerManager.cs      |   4 +-
 .../Configuration/ServerConfigurationManager.cs    | 259 -------
 .../Devices/CameraUploadsFolder.cs                 |   1 +
 .../HttpServer/HttpListenerHost.cs                 | 764 ---------------------
 .../HttpServer/ServerFactory.cs                    |  39 --
 .../MediaBrowser.Server.Implementations.csproj     |  44 +-
 .../Persistence/SqliteItemRepository.cs            |   2 +-
 .../Playlists/ManualPlaylistsFolder.cs             |  76 --
 .../ServerApplicationPaths.cs                      | 233 -------
 .../packages.config                                |   5 -
 .../ApplicationHost.cs                             |  43 +-
 .../Configuration/ServerConfigurationManager.cs    | 257 +++++++
 .../HttpServerFactory.cs                           | 107 +++
 .../MediaBrowser.Server.Startup.Common.csproj      |  15 +-
 .../ServerApplicationPaths.cs                      | 233 +++++++
 MediaBrowser.Server.Startup.Common/packages.config |   1 +
 21 files changed, 1442 insertions(+), 1445 deletions(-)
 create mode 100644 Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
 create mode 100644 Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
 delete mode 100644 MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
 delete mode 100644 MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
 delete mode 100644 MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
 delete mode 100644 MediaBrowser.Server.Implementations/ServerApplicationPaths.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/HttpServerFactory.cs
 create mode 100644 MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 07f3bd020..ccdecbf7b 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -69,6 +69,7 @@
     <Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
     <Compile Include="FileOrganization\TvFolderOrganizer.cs" />
     <Compile Include="HttpServer\GetSwaggerResource.cs" />
+    <Compile Include="HttpServer\HttpListenerHost.cs" />
     <Compile Include="HttpServer\HttpResultFactory.cs" />
     <Compile Include="HttpServer\LoggerUtils.cs" />
     <Compile Include="HttpServer\RangeRequestWriter.cs" />
@@ -172,6 +173,7 @@
     <Compile Include="Notifications\WebSocketNotifier.cs" />
     <Compile Include="Persistence\CleanDatabaseScheduledTask.cs" />
     <Compile Include="Photos\PhotoAlbumImageProvider.cs" />
+    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
     <Compile Include="Playlists\PlaylistImageProvider.cs" />
     <Compile Include="Playlists\PlaylistManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
new file mode 100644
index 000000000..d7897f165
--- /dev/null
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -0,0 +1,710 @@
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Logging;
+using ServiceStack;
+using ServiceStack.Host;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Emby.Server.Implementations.HttpServer;
+using Emby.Server.Implementations.HttpServer.SocketSharp;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Security;
+using MediaBrowser.Controller;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Services;
+using MediaBrowser.Model.System;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Net;
+using SocketHttpListener.Primitives;
+
+namespace Emby.Server.Implementations.HttpServer
+{
+    public class HttpListenerHost : ServiceStackHost, IHttpServer
+    {
+        private string DefaultRedirectPath { get; set; }
+
+        private readonly ILogger _logger;
+        public IEnumerable<string> UrlPrefixes { get; private set; }
+
+        private readonly List<IService> _restServices = new List<IService>();
+
+        private IHttpListener _listener;
+
+        public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
+        public event EventHandler<WebSocketConnectingEventArgs> WebSocketConnecting;
+
+        private readonly IServerConfigurationManager _config;
+        private readonly INetworkManager _networkManager;
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
+
+        private readonly IServerApplicationHost _appHost;
+
+        private readonly ITextEncoding _textEncoding;
+        private readonly ISocketFactory _socketFactory;
+        private readonly ICryptoProvider _cryptoProvider;
+
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly IXmlSerializer _xmlSerializer;
+        private readonly ICertificate _certificate;
+        private readonly IEnvironmentInfo _environment;
+        private readonly IStreamFactory _streamFactory;
+        private readonly Func<Type, Func<string, object>> _funcParseFn;
+
+        public HttpListenerHost(IServerApplicationHost applicationHost,
+            ILogger logger,
+            IServerConfigurationManager config,
+            string serviceName,
+            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func<Type, Func<string, object>> funcParseFn)
+            : base(serviceName, new Assembly[] { })
+        {
+            _appHost = applicationHost;
+            DefaultRedirectPath = defaultRedirectPath;
+            _networkManager = networkManager;
+            _memoryStreamProvider = memoryStreamProvider;
+            _textEncoding = textEncoding;
+            _socketFactory = socketFactory;
+            _cryptoProvider = cryptoProvider;
+            _jsonSerializer = jsonSerializer;
+            _xmlSerializer = xmlSerializer;
+            _environment = environment;
+            _certificate = certificate;
+            _streamFactory = streamFactory;
+            _funcParseFn = funcParseFn;
+            _config = config;
+
+            _logger = logger;
+        }
+
+        public string GlobalResponse { get; set; }
+
+        public override void Configure()
+        {
+            var mapExceptionToStatusCode = new Dictionary<Type, int>
+            {
+                {typeof (InvalidOperationException), 500},
+                {typeof (NotImplementedException), 500},
+                {typeof (ResourceNotFoundException), 404},
+                {typeof (FileNotFoundException), 404},
+                //{typeof (DirectoryNotFoundException), 404},
+                {typeof (SecurityException), 401},
+                {typeof (PaymentRequiredException), 402},
+                {typeof (UnauthorizedAccessException), 500},
+                {typeof (PlatformNotSupportedException), 500},
+                {typeof (NotSupportedException), 500}
+            };
+
+            var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
+            foreach (var filter in requestFilters)
+            {
+                GlobalRequestFilters.Add(filter.Filter);
+            }
+
+            GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
+        }
+
+        protected override ILogger Logger
+        {
+            get
+            {
+                return _logger;
+            }
+        }
+
+        public override T Resolve<T>()
+        {
+            return _appHost.Resolve<T>();
+        }
+
+        public override T TryResolve<T>()
+        {
+            return _appHost.TryResolve<T>();
+        }
+
+        public override object CreateInstance(Type type)
+        {
+            return _appHost.CreateInstance(type);
+        }
+
+        protected override ServiceController CreateServiceController(params Assembly[] assembliesWithServices)
+        {
+            var types = _restServices.Select(r => r.GetType()).ToArray();
+
+            return new ServiceController(this, () => types);
+        }
+
+        public override ServiceStackHost Start(string listeningAtUrlBase)
+        {
+            StartListener();
+            return this;
+        }
+
+        /// <summary>
+        /// Starts the Web Service
+        /// </summary>
+        private void StartListener()
+        {
+            WebSocketSharpRequest.HandlerFactoryPath = GetHandlerPathIfAny(UrlPrefixes.First());
+
+            _listener = GetListener();
+
+            _listener.WebSocketConnected = OnWebSocketConnected;
+            _listener.WebSocketConnecting = OnWebSocketConnecting;
+            _listener.ErrorHandler = ErrorHandler;
+            _listener.RequestHandler = RequestHandler;
+
+            _listener.Start(UrlPrefixes);
+        }
+
+        public static string GetHandlerPathIfAny(string listenerUrl)
+        {
+            if (listenerUrl == null) return null;
+            var pos = listenerUrl.IndexOf("://", StringComparison.OrdinalIgnoreCase);
+            if (pos == -1) return null;
+            var startHostUrl = listenerUrl.Substring(pos + "://".Length);
+            var endPos = startHostUrl.IndexOf('/');
+            if (endPos == -1) return null;
+            var endHostUrl = startHostUrl.Substring(endPos + 1);
+            return string.IsNullOrEmpty(endHostUrl) ? null : endHostUrl.TrimEnd('/');
+        }
+
+        private IHttpListener GetListener()
+        {
+            var enableDualMode = _environment.OperatingSystem == OperatingSystem.Windows;
+
+            return new WebSocketSharpListener(_logger,
+                _certificate,
+                _memoryStreamProvider,
+                _textEncoding,
+                _networkManager,
+                _socketFactory,
+                _cryptoProvider,
+                _streamFactory,
+                enableDualMode,
+                GetRequest);
+        }
+
+        private IHttpRequest GetRequest(HttpListenerContext httpContext)
+        {
+            var operationName = httpContext.Request.GetOperationName();
+
+            var req = new WebSocketSharpRequest(httpContext, operationName, _logger, _memoryStreamProvider);
+
+            return req;
+        }
+
+        private void OnWebSocketConnecting(WebSocketConnectingEventArgs args)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (WebSocketConnecting != null)
+            {
+                WebSocketConnecting(this, args);
+            }
+        }
+
+        private void OnWebSocketConnected(WebSocketConnectEventArgs args)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (WebSocketConnected != null)
+            {
+                WebSocketConnected(this, args);
+            }
+        }
+
+        private void ErrorHandler(Exception ex, IRequest httpReq)
+        {
+            try
+            {
+                _logger.ErrorException("Error processing request", ex);
+
+                var httpRes = httpReq.Response;
+
+                if (httpRes.IsClosed)
+                {
+                    return;
+                }
+
+                httpRes.StatusCode = 500;
+
+                httpRes.ContentType = "text/html";
+                httpRes.Write(ex.Message);
+
+                httpRes.Close();
+            }
+            catch
+            {
+                //_logger.ErrorException("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
+            }
+        }
+
+        /// <summary>
+        /// Shut down the Web Service
+        /// </summary>
+        public void Stop()
+        {
+            if (_listener != null)
+            {
+                _listener.Stop();
+            }
+        }
+
+        private readonly Dictionary<string, int> _skipLogExtensions = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase)
+        {
+            {".js", 0},
+            {".css", 0},
+            {".woff", 0},
+            {".woff2", 0},
+            {".ttf", 0},
+            {".html", 0}
+        };
+
+        private bool EnableLogging(string url, string localPath)
+        {
+            var extension = GetExtension(url);
+
+            if (string.IsNullOrWhiteSpace(extension) || !_skipLogExtensions.ContainsKey(extension))
+            {
+                if (string.IsNullOrWhiteSpace(localPath) || localPath.IndexOf("system/ping", StringComparison.OrdinalIgnoreCase) == -1)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private string GetExtension(string url)
+        {
+            var parts = url.Split(new[] { '?' }, 2);
+
+            return Path.GetExtension(parts[0]);
+        }
+
+        public static string RemoveQueryStringByKey(string url, string key)
+        {
+            var uri = new Uri(url);
+
+            // this gets all the query string key value pairs as a collection
+            var newQueryString = MyHttpUtility.ParseQueryString(uri.Query);
+
+            var originalCount = newQueryString.Count;
+
+            if (originalCount == 0)
+            {
+                return url;
+            }
+
+            // this removes the key if exists
+            newQueryString.Remove(key);
+
+            if (originalCount == newQueryString.Count)
+            {
+                return url;
+            }
+
+            // this gets the page path from root without QueryString
+            string pagePathWithoutQueryString = url.Split(new[] { '?' }, StringSplitOptions.RemoveEmptyEntries)[0];
+
+            return newQueryString.Count > 0
+                ? String.Format("{0}?{1}", pagePathWithoutQueryString, newQueryString)
+                : pagePathWithoutQueryString;
+        }
+
+        private string GetUrlToLog(string url)
+        {
+            url = RemoveQueryStringByKey(url, "api_key");
+
+            return url;
+        }
+
+        private string NormalizeConfiguredLocalAddress(string address)
+        {
+            var index = address.Trim('/').IndexOf('/');
+
+            if (index != -1)
+            {
+                address = address.Substring(index + 1);
+            }
+
+            return address.Trim('/');
+        }
+
+        private bool ValidateHost(Uri url)
+        {
+            var hosts = _config
+                .Configuration
+                .LocalNetworkAddresses
+                .Select(NormalizeConfiguredLocalAddress)
+                .ToList();
+
+            if (hosts.Count == 0)
+            {
+                return true;
+            }
+
+            var host = url.Host ?? string.Empty;
+
+            _logger.Debug("Validating host {0}", host);
+
+            if (_networkManager.IsInPrivateAddressSpace(host))
+            {
+                hosts.Add("localhost");
+                hosts.Add("127.0.0.1");
+
+                return hosts.Any(i => host.IndexOf(i, StringComparison.OrdinalIgnoreCase) != -1);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Overridable method that can be used to implement a custom hnandler
+        /// </summary>
+        /// <param name="httpReq">The HTTP req.</param>
+        /// <param name="url">The URL.</param>
+        /// <returns>Task.</returns>
+        protected async Task RequestHandler(IHttpRequest httpReq, Uri url)
+        {
+            var date = DateTime.Now;
+            var httpRes = httpReq.Response;
+            bool enableLog = false;
+            string urlToLog = null;
+            string remoteIp = null;
+
+            try
+            {
+                if (_disposed)
+                {
+                    httpRes.StatusCode = 503;
+                    return;
+                }
+
+                if (!ValidateHost(url))
+                {
+                    httpRes.StatusCode = 400;
+                    httpRes.ContentType = "text/plain";
+                    httpRes.Write("Invalid host");
+                    return;
+                }
+
+                if (string.Equals(httpReq.Verb, "OPTIONS", StringComparison.OrdinalIgnoreCase))
+                {
+                    httpRes.StatusCode = 200;
+                    httpRes.AddHeader("Access-Control-Allow-Origin", "*");
+                    httpRes.AddHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
+                    httpRes.AddHeader("Access-Control-Allow-Headers",
+                        "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
+                    httpRes.ContentType = "text/html";
+                    return;
+                }
+
+                var operationName = httpReq.OperationName;
+                var localPath = url.LocalPath;
+
+                var urlString = url.OriginalString;
+                enableLog = EnableLogging(urlString, localPath);
+                urlToLog = urlString;
+
+                if (enableLog)
+                {
+                    urlToLog = GetUrlToLog(urlString);
+                    remoteIp = httpReq.RemoteIp;
+
+                    LoggerUtils.LogRequest(_logger, urlToLog, httpReq.HttpMethod, httpReq.UserAgent);
+                }
+
+                if (string.Equals(localPath, "/emby/", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, DefaultRedirectPath);
+                    return;
+                }
+                if (string.Equals(localPath, "/emby", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, "emby/" + DefaultRedirectPath);
+                    return;
+                }
+
+                if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase) ||
+                    localPath.IndexOf("mediabrowser/web", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    httpRes.StatusCode = 200;
+                    httpRes.ContentType = "text/html";
+                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
+                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
+
+                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
+                    {
+                        httpRes.Write(
+                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
+                            newUrl + "\">" + newUrl + "</a></body></html>");
+                        return;
+                    }
+                }
+
+                if (localPath.IndexOf("dashboard/", StringComparison.OrdinalIgnoreCase) != -1 &&
+                    localPath.IndexOf("web/dashboard", StringComparison.OrdinalIgnoreCase) == -1)
+                {
+                    httpRes.StatusCode = 200;
+                    httpRes.ContentType = "text/html";
+                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
+                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
+
+                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
+                    {
+                        httpRes.Write(
+                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
+                            newUrl + "\">" + newUrl + "</a></body></html>");
+                        return;
+                    }
+                }
+
+                if (string.Equals(localPath, "/web", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, DefaultRedirectPath);
+                    return;
+                }
+                if (string.Equals(localPath, "/web/", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, "../" + DefaultRedirectPath);
+                    return;
+                }
+                if (string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, DefaultRedirectPath);
+                    return;
+                }
+                if (string.IsNullOrEmpty(localPath))
+                {
+                    RedirectToUrl(httpRes, "/" + DefaultRedirectPath);
+                    return;
+                }
+
+                if (string.Equals(localPath, "/emby/pin", StringComparison.OrdinalIgnoreCase))
+                {
+                    RedirectToUrl(httpRes, "web/pin.html");
+                    return;
+                }
+
+                if (!string.IsNullOrWhiteSpace(GlobalResponse))
+                {
+                    httpRes.StatusCode = 503;
+                    httpRes.ContentType = "text/html";
+                    httpRes.Write(GlobalResponse);
+                    return;
+                }
+
+                var handler = HttpHandlerFactory.GetHandler(httpReq);
+
+                if (handler != null)
+                {
+                    await handler.ProcessRequestAsync(httpReq, httpRes, operationName).ConfigureAwait(false);
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorHandler(ex, httpReq);
+            }
+            finally
+            {
+                httpRes.Close();
+
+                if (enableLog)
+                {
+                    var statusCode = httpRes.StatusCode;
+
+                    var duration = DateTime.Now - date;
+
+                    LoggerUtils.LogResponse(_logger, statusCode, urlToLog, remoteIp, duration);
+                }
+            }
+        }
+
+        public static void RedirectToUrl(IResponse httpRes, string url)
+        {
+            httpRes.StatusCode = 302;
+            httpRes.AddHeader("Location", url);
+        }
+
+
+        /// <summary>
+        /// Adds the rest handlers.
+        /// </summary>
+        /// <param name="services">The services.</param>
+        public void Init(IEnumerable<IService> services)
+        {
+            _restServices.AddRange(services);
+
+            ServiceController = CreateServiceController();
+
+            _logger.Info("Calling ServiceStack AppHost.Init");
+
+            base.Init();
+        }
+
+        public override RouteAttribute[] GetRouteAttributes(Type requestType)
+        {
+            var routes = base.GetRouteAttributes(requestType).ToList();
+            var clone = routes.ToList();
+
+            foreach (var route in clone)
+            {
+                routes.Add(new RouteAttribute(NormalizeEmbyRoutePath(route.Path), route.Verbs)
+                {
+                    Notes = route.Notes,
+                    Priority = route.Priority,
+                    Summary = route.Summary
+                });
+
+                routes.Add(new RouteAttribute(NormalizeRoutePath(route.Path), route.Verbs)
+                {
+                    Notes = route.Notes,
+                    Priority = route.Priority,
+                    Summary = route.Summary
+                });
+
+                routes.Add(new RouteAttribute(DoubleNormalizeEmbyRoutePath(route.Path), route.Verbs)
+                {
+                    Notes = route.Notes,
+                    Priority = route.Priority,
+                    Summary = route.Summary
+                });
+            }
+
+            return routes.ToArray();
+        }
+
+        public override object GetTaskResult(Task task, string requestName)
+        {
+            try
+            {
+                var taskObject = task as Task<object>;
+                if (taskObject != null)
+                {
+                    return taskObject.Result;
+                }
+
+                task.Wait();
+
+                var type = task.GetType().GetTypeInfo();
+                if (!type.IsGenericType)
+                {
+                    return null;
+                }
+
+                Logger.Warn("Getting task result from " + requestName + " using reflection. For better performance have your api return Task<object>");
+                return type.GetDeclaredProperty("Result").GetValue(task);
+            }
+            catch (TypeAccessException)
+            {
+                return null; //return null for void Task's
+            }
+        }
+
+        public override Func<string, object> GetParseFn(Type propertyType)
+        {
+            return _funcParseFn(propertyType);
+        }
+
+        public override void SerializeToJson(object o, Stream stream)
+        {
+            _jsonSerializer.SerializeToStream(o, stream);
+        }
+
+        public override void SerializeToXml(object o, Stream stream)
+        {
+            _xmlSerializer.SerializeToStream(o, stream);
+        }
+
+        public override object DeserializeXml(Type type, Stream stream)
+        {
+            return _xmlSerializer.DeserializeFromStream(type, stream);
+        }
+
+        public override object DeserializeJson(Type type, Stream stream)
+        {
+            return _jsonSerializer.DeserializeFromStream(stream, type);
+        }
+
+        private string NormalizeEmbyRoutePath(string path)
+        {
+            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
+            {
+                return "/emby" + path;
+            }
+
+            return "emby/" + path;
+        }
+
+        private string DoubleNormalizeEmbyRoutePath(string path)
+        {
+            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
+            {
+                return "/emby/emby" + path;
+            }
+
+            return "emby/emby/" + path;
+        }
+
+        private string NormalizeRoutePath(string path)
+        {
+            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
+            {
+                return "/mediabrowser" + path;
+            }
+
+            return "mediabrowser/" + path;
+        }
+
+        private bool _disposed;
+        private readonly object _disposeLock = new object();
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed) return;
+            base.Dispose();
+
+            lock (_disposeLock)
+            {
+                if (_disposed) return;
+
+                if (disposing)
+                {
+                    Stop();
+                }
+
+                //release unmanaged resources here...
+                _disposed = true;
+            }
+        }
+
+        public override void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public void StartServer(IEnumerable<string> urlPrefixes)
+        {
+            UrlPrefixes = urlPrefixes.ToList();
+            Start(UrlPrefixes.First());
+        }
+    }
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
new file mode 100644
index 000000000..8e65ccaf7
--- /dev/null
+++ b/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -0,0 +1,74 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Querying;
+
+namespace Emby.Server.Implementations.Playlists
+{
+    public class PlaylistsFolder : BasePluginFolder
+    {
+        public PlaylistsFolder()
+        {
+            Name = "Playlists";
+        }
+
+        public override bool IsVisible(User user)
+        {
+            return base.IsVisible(user) && GetChildren(user, true).Any();
+        }
+
+        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
+        {
+            return base.GetEligibleChildrenForRecursiveChildren(user).OfType<Playlist>();
+        }
+
+        public override bool IsHidden
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public override string CollectionType
+        {
+            get { return MediaBrowser.Model.Entities.CollectionType.Playlists; }
+        }
+
+        protected override Task<QueryResult<BaseItem>> GetItemsInternal(InternalItemsQuery query)
+        {
+            query.Recursive = false;
+            return base.GetItemsInternal(query);
+        }
+    }
+
+    public class PlaylistsDynamicFolder : IVirtualFolderCreator
+    {
+        private readonly IApplicationPaths _appPaths;
+        private readonly IFileSystem _fileSystem;
+
+        public PlaylistsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
+        {
+            _appPaths = appPaths;
+            _fileSystem = fileSystem;
+        }
+
+        public BasePluginFolder GetFolder()
+        {
+            var path = Path.Combine(_appPaths.DataPath, "playlists");
+
+			_fileSystem.CreateDirectory(path);
+
+            return new PlaylistsFolder
+            {
+                Path = path
+            };
+        }
+    }
+}
+
diff --git a/Emby.Server.Implementations/ServerManager/ServerManager.cs b/Emby.Server.Implementations/ServerManager/ServerManager.cs
index f660d01ec..f7e4c0ce2 100644
--- a/Emby.Server.Implementations/ServerManager/ServerManager.cs
+++ b/Emby.Server.Implementations/ServerManager/ServerManager.cs
@@ -112,22 +112,22 @@ namespace Emby.Server.Implementations.ServerManager
         /// <summary>
         /// Starts this instance.
         /// </summary>
-        public void Start(IEnumerable<string> urlPrefixes, string certificatePath)
+        public void Start(IEnumerable<string> urlPrefixes)
         {
-            ReloadHttpServer(urlPrefixes, certificatePath);
+            ReloadHttpServer(urlPrefixes);
         }
 
         /// <summary>
         /// Restarts the Http Server, or starts it if not currently running
         /// </summary>
-        private void ReloadHttpServer(IEnumerable<string> urlPrefixes, string certificatePath)
+        private void ReloadHttpServer(IEnumerable<string> urlPrefixes)
         {
             _logger.Info("Loading Http Server");
 
             try
             {
                 HttpServer = _applicationHost.Resolve<IHttpServer>();
-                HttpServer.StartServer(urlPrefixes, certificatePath);
+                HttpServer.StartServer(urlPrefixes);
             }
             catch (Exception ex)
             {
diff --git a/MediaBrowser.Controller/Net/IHttpServer.cs b/MediaBrowser.Controller/Net/IHttpServer.cs
index 8c503c199..f319244da 100644
--- a/MediaBrowser.Controller/Net/IHttpServer.cs
+++ b/MediaBrowser.Controller/Net/IHttpServer.cs
@@ -15,19 +15,11 @@ namespace MediaBrowser.Controller.Net
         /// <value>The URL prefix.</value>
         IEnumerable<string> UrlPrefixes { get; }
 
-        /// <summary>
-        /// Gets the certificate path.
-        /// </summary>
-        /// <value>The certificate path.</value>
-        string CertificatePath { get; }
-
         /// <summary>
         /// Starts the specified server name.
         /// </summary>
         /// <param name="urlPrefixes">The URL prefixes.</param>
-        /// <param name="certificatePath">If an https prefix is specified, 
-        /// the ssl certificate localtion on the file system.</param>
-        void StartServer(IEnumerable<string> urlPrefixes, string certificatePath);
+        void StartServer(IEnumerable<string> urlPrefixes);
 
         /// <summary>
         /// Stops this instance.
diff --git a/MediaBrowser.Controller/Net/IServerManager.cs b/MediaBrowser.Controller/Net/IServerManager.cs
index 5191a62e3..202df2982 100644
--- a/MediaBrowser.Controller/Net/IServerManager.cs
+++ b/MediaBrowser.Controller/Net/IServerManager.cs
@@ -15,9 +15,7 @@ namespace MediaBrowser.Controller.Net
         /// Starts this instance.
         /// </summary>
         /// <param name="urlPrefixes">The URL prefixes.</param>
-        /// <param name="certificatePath">If an https prefix is specified, 
-        /// the ssl certificate localtion on the file system.</param>
-        void Start(IEnumerable<string> urlPrefixes, string certificatePath);
+        void Start(IEnumerable<string> urlPrefixes);
 
         /// <summary>
         /// Sends a message to all clients currently connected via a web socket
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
deleted file mode 100644
index 4b6195192..000000000
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Events;
-using Emby.Common.Implementations.Configuration;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.IO;
-using System.Linq;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
-
-namespace MediaBrowser.Server.Implementations.Configuration
-{
-    /// <summary>
-    /// Class ServerConfigurationManager
-    /// </summary>
-    public class ServerConfigurationManager : BaseConfigurationManager, IServerConfigurationManager
-    {
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServerConfigurationManager" /> class.
-        /// </summary>
-        /// <param name="applicationPaths">The application paths.</param>
-        /// <param name="logManager">The log manager.</param>
-        /// <param name="xmlSerializer">The XML serializer.</param>
-        /// <param name="fileSystem">The file system.</param>
-        public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
-            : base(applicationPaths, logManager, xmlSerializer, fileSystem)
-        {
-            UpdateMetadataPath();
-        }
-
-        public event EventHandler<GenericEventArgs<ServerConfiguration>> ConfigurationUpdating;
-
-        /// <summary>
-        /// Gets the type of the configuration.
-        /// </summary>
-        /// <value>The type of the configuration.</value>
-        protected override Type ConfigurationType
-        {
-            get { return typeof(ServerConfiguration); }
-        }
-
-        /// <summary>
-        /// Gets the application paths.
-        /// </summary>
-        /// <value>The application paths.</value>
-        public IServerApplicationPaths ApplicationPaths
-        {
-            get { return (IServerApplicationPaths)CommonApplicationPaths; }
-        }
-
-        /// <summary>
-        /// Gets the configuration.
-        /// </summary>
-        /// <value>The configuration.</value>
-        public ServerConfiguration Configuration
-        {
-            get { return (ServerConfiguration)CommonConfiguration; }
-        }
-
-        /// <summary>
-        /// Called when [configuration updated].
-        /// </summary>
-        protected override void OnConfigurationUpdated()
-        {
-            UpdateMetadataPath();
-
-            base.OnConfigurationUpdated();
-        }
-
-        public override void AddParts(IEnumerable<IConfigurationFactory> factories)
-        {
-            base.AddParts(factories);
-
-            UpdateTranscodingTempPath();
-        }
-
-        /// <summary>
-        /// Updates the metadata path.
-        /// </summary>
-        private void UpdateMetadataPath()
-        {
-            string metadataPath;
-
-            if (string.IsNullOrWhiteSpace(Configuration.MetadataPath))
-            {
-                metadataPath = GetInternalMetadataPath();
-            }
-            else
-            {
-                metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
-            }
-
-            ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;
-
-            ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath;
-        }
-
-        private string GetInternalMetadataPath()
-        {
-            return Path.Combine(ApplicationPaths.ProgramDataPath, "metadata");
-        }
-
-        /// <summary>
-        /// Updates the transcoding temporary path.
-        /// </summary>
-        private void UpdateTranscodingTempPath()
-        {
-            var encodingConfig = this.GetConfiguration<EncodingOptions>("encoding");
-
-            ((ServerApplicationPaths)ApplicationPaths).TranscodingTempPath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ?
-                null :
-                Path.Combine(encodingConfig.TranscodingTempPath, "transcoding-temp");
-        }
-
-        protected override void OnNamedConfigurationUpdated(string key, object configuration)
-        {
-            base.OnNamedConfigurationUpdated(key, configuration);
-
-            if (string.Equals(key, "encoding", StringComparison.OrdinalIgnoreCase))
-            {
-                UpdateTranscodingTempPath();
-            }
-        }
-
-        /// <summary>
-        /// Replaces the configuration.
-        /// </summary>
-        /// <param name="newConfiguration">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
-        public override void ReplaceConfiguration(BaseApplicationConfiguration newConfiguration)
-        {
-            var newConfig = (ServerConfiguration)newConfiguration;
-
-            ValidatePathSubstitutions(newConfig);
-            ValidateMetadataPath(newConfig);
-            ValidateSslCertificate(newConfig);
-
-            EventHelper.FireEventIfNotNull(ConfigurationUpdating, this, new GenericEventArgs<ServerConfiguration> { Argument = newConfig }, Logger);
-
-            base.ReplaceConfiguration(newConfiguration);
-        }
-
-
-        /// <summary>
-        /// Validates the SSL certificate.
-        /// </summary>
-        /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
-        private void ValidateSslCertificate(BaseApplicationConfiguration newConfig)
-        {
-            var serverConfig = (ServerConfiguration)newConfig;
-
-            var newPath = serverConfig.CertificatePath;
-
-            if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(Configuration.CertificatePath ?? string.Empty, newPath))
-            {
-                // Validate
-                if (!FileSystem.FileExists(newPath))
-                {
-                    throw new FileNotFoundException(string.Format("Certificate file '{0}' does not exist.", newPath));
-                }
-            }
-        }
-
-        private void ValidatePathSubstitutions(ServerConfiguration newConfig)
-        {
-            foreach (var map in newConfig.PathSubstitutions)
-            {
-                if (string.IsNullOrWhiteSpace(map.From) || string.IsNullOrWhiteSpace(map.To))
-                {
-                    throw new ArgumentException("Invalid path substitution");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Validates the metadata path.
-        /// </summary>
-        /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
-        private void ValidateMetadataPath(ServerConfiguration newConfig)
-        {
-            var newPath = newConfig.MetadataPath;
-
-            if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(Configuration.MetadataPath ?? string.Empty, newPath))
-            {
-                // Validate
-                if (!FileSystem.DirectoryExists(newPath))
-                {
-                    throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newPath));
-                }
-
-                EnsureWriteAccess(newPath);
-            }
-        }
-
-        public void DisableMetadataService(string service)
-        {
-            DisableMetadataService(typeof(Movie), Configuration, service);
-            DisableMetadataService(typeof(Episode), Configuration, service);
-            DisableMetadataService(typeof(Series), Configuration, service);
-            DisableMetadataService(typeof(Season), Configuration, service);
-            DisableMetadataService(typeof(MusicArtist), Configuration, service);
-            DisableMetadataService(typeof(MusicAlbum), Configuration, service);
-            DisableMetadataService(typeof(MusicVideo), Configuration, service);
-            DisableMetadataService(typeof(Video), Configuration, service);
-        }
-
-        private void DisableMetadataService(Type type, ServerConfiguration config, string service)
-        {
-            var options = GetMetadataOptions(type, config);
-
-            if (!options.DisabledMetadataSavers.Contains(service, StringComparer.OrdinalIgnoreCase))
-            {
-                var list = options.DisabledMetadataSavers.ToList();
-
-                list.Add(service);
-
-                options.DisabledMetadataSavers = list.ToArray();
-            }
-        }
-
-        private MetadataOptions GetMetadataOptions(Type type, ServerConfiguration config)
-        {
-            var options = config.MetadataOptions
-                .FirstOrDefault(i => string.Equals(i.ItemType, type.Name, StringComparison.OrdinalIgnoreCase));
-
-            if (options == null)
-            {
-                var list = config.MetadataOptions.ToList();
-
-                options = new MetadataOptions
-                {
-                    ItemType = type.Name
-                };
-
-                list.Add(options);
-
-                config.MetadataOptions = list.ToArray();
-            }
-
-            return options;
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
index 19a0593e3..882701885 100644
--- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Server.Implementations.Devices
 {
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
deleted file mode 100644
index f0a9c5ca3..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ /dev/null
@@ -1,764 +0,0 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Logging;
-using ServiceStack;
-using ServiceStack.Host;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using Emby.Common.Implementations.Net;
-using Emby.Server.Implementations.HttpServer;
-using Emby.Server.Implementations.HttpServer.SocketSharp;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Security;
-using MediaBrowser.Controller;
-using MediaBrowser.Model.Cryptography;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Text;
-using ServiceStack.Text.Jsv;
-using SocketHttpListener.Net;
-using SocketHttpListener.Primitives;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    public class HttpListenerHost : ServiceStackHost, IHttpServer
-    {
-        private string DefaultRedirectPath { get; set; }
-
-        private readonly ILogger _logger;
-        public IEnumerable<string> UrlPrefixes { get; private set; }
-
-        private readonly List<IService> _restServices = new List<IService>();
-
-        private IHttpListener _listener;
-
-        public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
-        public event EventHandler<WebSocketConnectingEventArgs> WebSocketConnecting;
-
-        public string CertificatePath { get; private set; }
-
-        private readonly IServerConfigurationManager _config;
-        private readonly INetworkManager _networkManager;
-        private readonly IMemoryStreamFactory _memoryStreamProvider;
-
-        private readonly IServerApplicationHost _appHost;
-
-        private readonly ITextEncoding _textEncoding;
-        private readonly ISocketFactory _socketFactory;
-        private readonly ICryptoProvider _cryptoProvider;
-
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IXmlSerializer _xmlSerializer;
-
-        public HttpListenerHost(IServerApplicationHost applicationHost,
-            ILogManager logManager,
-            IServerConfigurationManager config,
-            string serviceName,
-            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer)
-            : base(serviceName, new Assembly[] { })
-        {
-            _appHost = applicationHost;
-            DefaultRedirectPath = defaultRedirectPath;
-            _networkManager = networkManager;
-            _memoryStreamProvider = memoryStreamProvider;
-            _textEncoding = textEncoding;
-            _socketFactory = socketFactory;
-            _cryptoProvider = cryptoProvider;
-            _jsonSerializer = jsonSerializer;
-            _xmlSerializer = xmlSerializer;
-            _config = config;
-
-            _logger = logManager.GetLogger("HttpServer");
-        }
-
-        public string GlobalResponse { get; set; }
-
-        public override void Configure()
-        {
-            var mapExceptionToStatusCode = new Dictionary<Type, int>
-            {
-                {typeof (InvalidOperationException), 500},
-                {typeof (NotImplementedException), 500},
-                {typeof (ResourceNotFoundException), 404},
-                {typeof (FileNotFoundException), 404},
-                {typeof (DirectoryNotFoundException), 404},
-                {typeof (SecurityException), 401},
-                {typeof (PaymentRequiredException), 402},
-                {typeof (UnauthorizedAccessException), 500},
-                {typeof (ApplicationException), 500},
-                {typeof (PlatformNotSupportedException), 500},
-                {typeof (NotSupportedException), 500}
-            };
-
-            var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
-            foreach (var filter in requestFilters)
-            {
-                GlobalRequestFilters.Add(filter.Filter);
-            }
-
-            GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
-        }
-
-        protected override ILogger Logger
-        {
-            get
-            {
-                return _logger;
-            }
-        }
-
-        public override T Resolve<T>()
-        {
-            return _appHost.Resolve<T>();
-        }
-
-        public override Type[] GetGenericArguments(Type type)
-        {
-            return type.GetGenericArguments();
-        }
-
-        public override bool IsAssignableFrom(Type type1, Type type2)
-        {
-            return type1.IsAssignableFrom(type2);
-        }
-
-        public override T TryResolve<T>()
-        {
-            return _appHost.TryResolve<T>();
-        }
-
-        public override object CreateInstance(Type type)
-        {
-            return _appHost.CreateInstance(type);
-        }
-
-        protected override ServiceController CreateServiceController(params Assembly[] assembliesWithServices)
-        {
-            var types = _restServices.Select(r => r.GetType()).ToArray();
-
-            return new ServiceController(this, () => types);
-        }
-
-        public override ServiceStackHost Start(string listeningAtUrlBase)
-        {
-            StartListener();
-            return this;
-        }
-
-        /// <summary>
-        /// Starts the Web Service
-        /// </summary>
-        private void StartListener()
-        {
-            WebSocketSharpRequest.HandlerFactoryPath = GetHandlerPathIfAny(UrlPrefixes.First());
-
-            _listener = GetListener();
-
-            _listener.WebSocketConnected = OnWebSocketConnected;
-            _listener.WebSocketConnecting = OnWebSocketConnecting;
-            _listener.ErrorHandler = ErrorHandler;
-            _listener.RequestHandler = RequestHandler;
-
-            _listener.Start(UrlPrefixes);
-        }
-
-        public static string GetHandlerPathIfAny(string listenerUrl)
-        {
-            if (listenerUrl == null) return null;
-            var pos = listenerUrl.IndexOf("://", StringComparison.OrdinalIgnoreCase);
-            if (pos == -1) return null;
-            var startHostUrl = listenerUrl.Substring(pos + "://".Length);
-            var endPos = startHostUrl.IndexOf('/');
-            if (endPos == -1) return null;
-            var endHostUrl = startHostUrl.Substring(endPos + 1);
-            return string.IsNullOrEmpty(endHostUrl) ? null : endHostUrl.TrimEnd('/');
-        }
-
-        private IHttpListener GetListener()
-        {
-            var cert = !string.IsNullOrWhiteSpace(CertificatePath) && File.Exists(CertificatePath)
-                ? GetCert(CertificatePath) :
-                null;
-
-            var enableDualMode = Environment.OSVersion.Platform == PlatformID.Win32NT;
-
-            return new WebSocketSharpListener(_logger, cert, _memoryStreamProvider, _textEncoding, _networkManager, _socketFactory, _cryptoProvider, new StreamFactory(), enableDualMode, GetRequest);
-        }
-
-        public ICertificate GetCert(string certificateLocation)
-        {
-            try
-            {
-                X509Certificate2 localCert = new X509Certificate2(certificateLocation);
-                //localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
-                if (localCert.PrivateKey == null)
-                {
-                    //throw new FileNotFoundException("Secure requested, no private key included", certificateLocation);
-                    return null;
-                }
-
-                return new Certificate(localCert);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error loading cert from {0}", ex, certificateLocation);
-                return null;
-            }
-        }
-
-        private IHttpRequest GetRequest(HttpListenerContext httpContext)
-        {
-            var operationName = httpContext.Request.GetOperationName();
-
-            var req = new WebSocketSharpRequest(httpContext, operationName, _logger, _memoryStreamProvider);
-
-            return req;
-        }
-
-        private void OnWebSocketConnecting(WebSocketConnectingEventArgs args)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (WebSocketConnecting != null)
-            {
-                WebSocketConnecting(this, args);
-            }
-        }
-
-        private void OnWebSocketConnected(WebSocketConnectEventArgs args)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (WebSocketConnected != null)
-            {
-                WebSocketConnected(this, args);
-            }
-        }
-
-        private void ErrorHandler(Exception ex, IRequest httpReq)
-        {
-            try
-            {
-                _logger.ErrorException("Error processing request", ex);
-
-                var httpRes = httpReq.Response;
-
-                if (httpRes.IsClosed)
-                {
-                    return;
-                }
-
-                httpRes.StatusCode = 500;
-
-                httpRes.ContentType = "text/html";
-                httpRes.Write(ex.Message);
-
-                httpRes.Close();
-            }
-            catch
-            {
-                //_logger.ErrorException("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
-            }
-        }
-
-        /// <summary>
-        /// Shut down the Web Service
-        /// </summary>
-        public void Stop()
-        {
-            if (_listener != null)
-            {
-                _listener.Stop();
-            }
-        }
-
-        private readonly Dictionary<string, int> _skipLogExtensions = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase)
-        {
-            {".js", 0},
-            {".css", 0},
-            {".woff", 0},
-            {".woff2", 0},
-            {".ttf", 0},
-            {".html", 0}
-        };
-
-        private bool EnableLogging(string url, string localPath)
-        {
-            var extension = GetExtension(url);
-
-            if (string.IsNullOrWhiteSpace(extension) || !_skipLogExtensions.ContainsKey(extension))
-            {
-                if (string.IsNullOrWhiteSpace(localPath) || localPath.IndexOf("system/ping", StringComparison.OrdinalIgnoreCase) == -1)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        private string GetExtension(string url)
-        {
-            var parts = url.Split(new[] { '?' }, 2);
-
-            return Path.GetExtension(parts[0]);
-        }
-
-        public static string RemoveQueryStringByKey(string url, string key)
-        {
-            var uri = new Uri(url);
-
-            // this gets all the query string key value pairs as a collection
-            var newQueryString = MyHttpUtility.ParseQueryString(uri.Query);
-
-            if (newQueryString.Count == 0)
-            {
-                return url;
-            }
-
-            // this removes the key if exists
-            newQueryString.Remove(key);
-
-            // this gets the page path from root without QueryString
-            string pagePathWithoutQueryString = uri.GetLeftPart(UriPartial.Path);
-
-            return newQueryString.Count > 0
-                ? String.Format("{0}?{1}", pagePathWithoutQueryString, newQueryString)
-                : pagePathWithoutQueryString;
-        }
-
-        private string GetUrlToLog(string url)
-        {
-            url = RemoveQueryStringByKey(url, "api_key");
-
-            return url;
-        }
-
-        private string NormalizeConfiguredLocalAddress(string address)
-        {
-            var index = address.Trim('/').IndexOf('/');
-
-            if (index != -1)
-            {
-                address = address.Substring(index + 1);
-            }
-
-            return address.Trim('/');
-        }
-
-        private bool ValidateHost(Uri url)
-        {
-            var hosts = _config
-                .Configuration
-                .LocalNetworkAddresses
-                .Select(NormalizeConfiguredLocalAddress)
-                .ToList();
-
-            if (hosts.Count == 0)
-            {
-                return true;
-            }
-
-            var host = url.Host ?? string.Empty;
-
-            _logger.Debug("Validating host {0}", host);
-
-            if (_networkManager.IsInPrivateAddressSpace(host))
-            {
-                hosts.Add("localhost");
-                hosts.Add("127.0.0.1");
-
-                return hosts.Any(i => host.IndexOf(i, StringComparison.OrdinalIgnoreCase) != -1);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Overridable method that can be used to implement a custom hnandler
-        /// </summary>
-        /// <param name="httpReq">The HTTP req.</param>
-        /// <param name="url">The URL.</param>
-        /// <returns>Task.</returns>
-        protected async Task RequestHandler(IHttpRequest httpReq, Uri url)
-        {
-            var date = DateTime.Now;
-            var httpRes = httpReq.Response;
-            bool enableLog = false;
-            string urlToLog = null;
-            string remoteIp = null;
-
-            try
-            {
-                if (_disposed)
-                {
-                    httpRes.StatusCode = 503;
-                    return;
-                }
-
-                if (!ValidateHost(url))
-                {
-                    httpRes.StatusCode = 400;
-                    httpRes.ContentType = "text/plain";
-                    httpRes.Write("Invalid host");
-                    return;
-                }
-
-                if (string.Equals(httpReq.Verb, "OPTIONS", StringComparison.OrdinalIgnoreCase))
-                {
-                    httpRes.StatusCode = 200;
-                    httpRes.AddHeader("Access-Control-Allow-Origin", "*");
-                    httpRes.AddHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
-                    httpRes.AddHeader("Access-Control-Allow-Headers",
-                        "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
-                    httpRes.ContentType = "text/html";
-                    return;
-                }
-
-                var operationName = httpReq.OperationName;
-                var localPath = url.LocalPath;
-
-                var urlString = url.OriginalString;
-                enableLog = EnableLogging(urlString, localPath);
-                urlToLog = urlString;
-
-                if (enableLog)
-                {
-                    urlToLog = GetUrlToLog(urlString);
-                    remoteIp = httpReq.RemoteIp;
-
-                    LoggerUtils.LogRequest(_logger, urlToLog, httpReq.HttpMethod, httpReq.UserAgent);
-                }
-
-                if (string.Equals(localPath, "/emby/", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, DefaultRedirectPath);
-                    return;
-                }
-                if (string.Equals(localPath, "/emby", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, "emby/" + DefaultRedirectPath);
-                    return;
-                }
-
-                if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase) ||
-                    localPath.IndexOf("mediabrowser/web", StringComparison.OrdinalIgnoreCase) != -1)
-                {
-                    httpRes.StatusCode = 200;
-                    httpRes.ContentType = "text/html";
-                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
-                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
-
-                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
-                    {
-                        httpRes.Write(
-                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
-                            newUrl + "\">" + newUrl + "</a></body></html>");
-                        return;
-                    }
-                }
-
-                if (localPath.IndexOf("dashboard/", StringComparison.OrdinalIgnoreCase) != -1 &&
-                    localPath.IndexOf("web/dashboard", StringComparison.OrdinalIgnoreCase) == -1)
-                {
-                    httpRes.StatusCode = 200;
-                    httpRes.ContentType = "text/html";
-                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
-                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
-
-                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
-                    {
-                        httpRes.Write(
-                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
-                            newUrl + "\">" + newUrl + "</a></body></html>");
-                        return;
-                    }
-                }
-
-                if (string.Equals(localPath, "/web", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, DefaultRedirectPath);
-                    return;
-                }
-                if (string.Equals(localPath, "/web/", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, "../" + DefaultRedirectPath);
-                    return;
-                }
-                if (string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, DefaultRedirectPath);
-                    return;
-                }
-                if (string.IsNullOrEmpty(localPath))
-                {
-                    RedirectToUrl(httpRes, "/" + DefaultRedirectPath);
-                    return;
-                }
-
-                if (string.Equals(localPath, "/emby/pin", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, "web/pin.html");
-                    return;
-                }
-
-                if (!string.IsNullOrWhiteSpace(GlobalResponse))
-                {
-                    httpRes.StatusCode = 503;
-                    httpRes.ContentType = "text/html";
-                    httpRes.Write(GlobalResponse);
-                    return;
-                }
-
-                var handler = HttpHandlerFactory.GetHandler(httpReq);
-
-                if (handler != null)
-                {
-                    await handler.ProcessRequestAsync(httpReq, httpRes, operationName).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                ErrorHandler(ex, httpReq);
-            }
-            finally
-            {
-                httpRes.Close();
-
-                if (enableLog)
-                {
-                    var statusCode = httpRes.StatusCode;
-
-                    var duration = DateTime.Now - date;
-
-                    LoggerUtils.LogResponse(_logger, statusCode, urlToLog, remoteIp, duration);
-                }
-            }
-        }
-
-        public static void RedirectToUrl(IResponse httpRes, string url)
-        {
-            httpRes.StatusCode = 302;
-            httpRes.AddHeader("Location", url);
-        }
-
-
-        /// <summary>
-        /// Adds the rest handlers.
-        /// </summary>
-        /// <param name="services">The services.</param>
-        public void Init(IEnumerable<IService> services)
-        {
-            _restServices.AddRange(services);
-
-            ServiceController = CreateServiceController();
-
-            _logger.Info("Calling ServiceStack AppHost.Init");
-
-            base.Init();
-        }
-
-        public override Model.Services.RouteAttribute[] GetRouteAttributes(Type requestType)
-        {
-            var routes = base.GetRouteAttributes(requestType).ToList();
-            var clone = routes.ToList();
-
-            foreach (var route in clone)
-            {
-                routes.Add(new Model.Services.RouteAttribute(NormalizeEmbyRoutePath(route.Path), route.Verbs)
-                {
-                    Notes = route.Notes,
-                    Priority = route.Priority,
-                    Summary = route.Summary
-                });
-
-                routes.Add(new Model.Services.RouteAttribute(NormalizeRoutePath(route.Path), route.Verbs)
-                {
-                    Notes = route.Notes,
-                    Priority = route.Priority,
-                    Summary = route.Summary
-                });
-
-                routes.Add(new Model.Services.RouteAttribute(DoubleNormalizeEmbyRoutePath(route.Path), route.Verbs)
-                {
-                    Notes = route.Notes,
-                    Priority = route.Priority,
-                    Summary = route.Summary
-                });
-            }
-
-            return routes.ToArray();
-        }
-
-        public override object GetTaskResult(Task task, string requestName)
-        {
-            try
-            {
-                var taskObject = task as Task<object>;
-                if (taskObject != null)
-                {
-                    return taskObject.Result;
-                }
-
-                task.Wait();
-
-                var type = task.GetType();
-                if (!type.IsGenericType)
-                {
-                    return null;
-                }
-
-                Logger.Warn("Getting task result from " + requestName + " using reflection. For better performance have your api return Task<object>");
-                return type.GetProperty("Result").GetValue(task);
-            }
-            catch (TypeAccessException)
-            {
-                return null; //return null for void Task's
-            }
-        }
-
-        public override Func<string, object> GetParseFn(Type propertyType)
-        {
-            var fn = JsvReader.GetParseFn(propertyType);
-
-            return s => fn(s);
-        }
-
-        public override void SerializeToJson(object o, Stream stream)
-        {
-            _jsonSerializer.SerializeToStream(o, stream);
-        }
-
-        public override void SerializeToXml(object o, Stream stream)
-        {
-            _xmlSerializer.SerializeToStream(o, stream);
-        }
-
-        public override object DeserializeXml(Type type, Stream stream)
-        {
-            return _xmlSerializer.DeserializeFromStream(type, stream);
-        }
-
-        public override object DeserializeJson(Type type, Stream stream)
-        {
-            return _jsonSerializer.DeserializeFromStream(stream, type);
-        }
-
-        private string NormalizeEmbyRoutePath(string path)
-        {
-            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-            {
-                return "/emby" + path;
-            }
-
-            return "emby/" + path;
-        }
-
-        private string DoubleNormalizeEmbyRoutePath(string path)
-        {
-            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-            {
-                return "/emby/emby" + path;
-            }
-
-            return "emby/emby/" + path;
-        }
-
-        private string NormalizeRoutePath(string path)
-        {
-            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-            {
-                return "/mediabrowser" + path;
-            }
-
-            return "mediabrowser/" + path;
-        }
-
-        private bool _disposed;
-        private readonly object _disposeLock = new object();
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed) return;
-            base.Dispose();
-
-            lock (_disposeLock)
-            {
-                if (_disposed) return;
-
-                if (disposing)
-                {
-                    Stop();
-                }
-
-                //release unmanaged resources here...
-                _disposed = true;
-            }
-        }
-
-        public override void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void StartServer(IEnumerable<string> urlPrefixes, string certificatePath)
-        {
-            CertificatePath = certificatePath;
-            UrlPrefixes = urlPrefixes.ToList();
-            Start(UrlPrefixes.First());
-        }
-    }
-
-    public class StreamFactory : IStreamFactory
-    {
-        public Stream CreateNetworkStream(ISocket socket, bool ownsSocket)
-        {
-            var netSocket = (NetSocket)socket;
-
-            return new NetworkStream(netSocket.Socket, ownsSocket);
-        }
-
-        public Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate)
-        {
-            var sslStream = (SslStream)stream;
-            var cert = (Certificate)certificate;
-
-            return sslStream.AuthenticateAsServerAsync(cert.X509Certificate);
-        }
-
-        public Stream CreateSslStream(Stream innerStream, bool leaveInnerStreamOpen)
-        {
-            return new SslStream(innerStream, leaveInnerStreamOpen);
-        }
-    }
-
-    public class Certificate : ICertificate
-    {
-        public Certificate(X509Certificate x509Certificate)
-        {
-            X509Certificate = x509Certificate;
-        }
-
-        public X509Certificate X509Certificate { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
deleted file mode 100644
index abcf84abd..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Cryptography;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Text;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    /// <summary>
-    /// Class ServerFactory
-    /// </summary>
-    public static class ServerFactory
-    {
-        /// <summary>
-        /// Creates the server.
-        /// </summary>
-        /// <returns>IHttpServer.</returns>
-        public static IHttpServer CreateServer(IServerApplicationHost applicationHost,
-            ILogManager logManager,
-            IServerConfigurationManager config, 
-            INetworkManager networkmanager,
-            IMemoryStreamFactory streamProvider,
-            string serverName, 
-            string defaultRedirectpath,
-            ITextEncoding textEncoding,
-            ISocketFactory socketFactory,
-            ICryptoProvider cryptoProvider,
-            IJsonSerializer json,
-            IXmlSerializer xml)
-        {
-            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider, textEncoding, socketFactory, cryptoProvider, json, xml);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 6fb4f9e36..8d5697c49 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -42,21 +42,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Emby.Common.Implementations">
-      <HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath>
-    </Reference>
-    <Reference Include="Emby.XmlTv, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Emby.XmlTv.1.0.0.63\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="INIFileParser, Version=2.3.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
       <HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MediaBrowser.Naming, Version=1.0.6151.30291, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.59\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.1.0.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
       <Private>True</Private>
@@ -65,38 +54,18 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\emby\Mono.Nat.dll</HintPath>
     </Reference>
-    <Reference Include="Patterns.Logging, Version=1.0.6151.30227, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ServiceStack.Text, Version=4.5.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="SharpCompress, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath>
     </Reference>
-    <Reference Include="SocketHttpListener.Portable">
-      <HintPath>..\ThirdParty\emby\SocketHttpListener.Portable.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
     <Reference Include="System.Xml" />
-    <Reference Include="ServiceStack">
-      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UniversalDetector.1.0.1\lib\portable-net45+sl4+wp71+win8+wpa81\UniversalDetector.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
@@ -105,12 +74,9 @@
     <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="Archiving\ZipClient.cs" />
     <Compile Include="Collections\CollectionsDynamicFolder.cs" />
-    <Compile Include="Configuration\ServerConfigurationManager.cs" />
     <Compile Include="Devices\DeviceRepository.cs" />
     <Compile Include="Devices\CameraUploadsFolder.cs" />
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
-    <Compile Include="HttpServer\HttpListenerHost.cs" />
-    <Compile Include="HttpServer\ServerFactory.cs" />
     <Compile Include="IO\LibraryMonitor.cs" />
     <Compile Include="IO\MemoryStreamProvider.cs" />
     <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" />
@@ -143,10 +109,8 @@
     <Compile Include="Persistence\SqliteFileOrganizationRepository.cs" />
     <Compile Include="Notifications\SqliteNotificationsRepository.cs" />
     <Compile Include="Persistence\TypeMapper.cs" />
-    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Security\AuthenticationRepository.cs" />
-    <Compile Include="ServerApplicationPaths.cs" />
     <Compile Include="Persistence\SqliteDisplayPreferencesRepository.cs" />
     <Compile Include="Persistence\SqliteItemRepository.cs" />
     <Compile Include="Persistence\SqliteUserDataRepository.cs" />
@@ -170,10 +134,6 @@
       <Project>{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}</Project>
       <Name>MediaBrowser.Model</Name>
     </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
-      <Project>{442b5058-dcaf-4263-bb6a-f21e31120a1b}</Project>
-      <Name>MediaBrowser.Providers</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -348,9 +308,7 @@
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Serialization\" />
-  </ItemGroup>
+  <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/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 3577d1883..3dcd83da0 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -18,6 +18,7 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Server.Implementations.Playlists;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Channels;
@@ -30,7 +31,6 @@ using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Server.Implementations.Devices;
-using MediaBrowser.Server.Implementations.Playlists;
 
 namespace MediaBrowser.Server.Implementations.Persistence
 {
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
deleted file mode 100644
index eff77574d..000000000
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Playlists;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Querying;
-using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-
-namespace MediaBrowser.Server.Implementations.Playlists
-{
-    public class PlaylistsFolder : BasePluginFolder
-    {
-        public PlaylistsFolder()
-        {
-            Name = "Playlists";
-        }
-
-        public override bool IsVisible(User user)
-        {
-            return base.IsVisible(user) && GetChildren(user, true).Any();
-        }
-
-        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
-        {
-            return base.GetEligibleChildrenForRecursiveChildren(user).OfType<Playlist>();
-        }
-
-        public override bool IsHidden
-        {
-            get
-            {
-                return true;
-            }
-        }
-
-        public override string CollectionType
-        {
-            get { return Model.Entities.CollectionType.Playlists; }
-        }
-
-        protected override Task<QueryResult<BaseItem>> GetItemsInternal(InternalItemsQuery query)
-        {
-            query.Recursive = false;
-            return base.GetItemsInternal(query);
-        }
-    }
-
-    public class PlaylistsDynamicFolder : IVirtualFolderCreator
-    {
-        private readonly IApplicationPaths _appPaths;
-        private readonly IFileSystem _fileSystem;
-
-        public PlaylistsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
-        {
-            _appPaths = appPaths;
-            _fileSystem = fileSystem;
-        }
-
-        public BasePluginFolder GetFolder()
-        {
-            var path = Path.Combine(_appPaths.DataPath, "playlists");
-
-			_fileSystem.CreateDirectory(path);
-
-            return new PlaylistsFolder
-            {
-                Path = path
-            };
-        }
-    }
-}
-
diff --git a/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs b/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs
deleted file mode 100644
index c8dea9005..000000000
--- a/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using Emby.Common.Implementations;
-using MediaBrowser.Controller;
-using System.IO;
-
-namespace MediaBrowser.Server.Implementations
-{
-    /// <summary>
-    /// Extends BaseApplicationPaths to add paths that are only applicable on the server
-    /// </summary>
-    public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseApplicationPaths" /> class.
-        /// </summary>
-        public ServerApplicationPaths(string programDataPath, string applicationPath, string applicationResourcesPath)
-            : base(programDataPath, applicationPath)
-        {
-            ApplicationResourcesPath = applicationResourcesPath;
-        }
-
-        public string ApplicationResourcesPath { get; private set; }
-
-        /// <summary>
-        /// Gets the path to the base root media directory
-        /// </summary>
-        /// <value>The root folder path.</value>
-        public string RootFolderPath
-        {
-            get
-            {
-                return Path.Combine(ProgramDataPath, "root");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the default user view directory.  Used if no specific user view is defined.
-        /// </summary>
-        /// <value>The default user views path.</value>
-        public string DefaultUserViewsPath
-        {
-            get
-            {
-                return Path.Combine(RootFolderPath, "default");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to localization data.
-        /// </summary>
-        /// <value>The localization path.</value>
-        public string LocalizationPath
-        {
-            get
-            {
-                return Path.Combine(ProgramDataPath, "localization");
-            }
-        }
-
-        /// <summary>
-        /// The _ibn path
-        /// </summary>
-        private string _ibnPath;
-        /// <summary>
-        /// Gets the path to the Images By Name directory
-        /// </summary>
-        /// <value>The images by name path.</value>
-        public string ItemsByNamePath
-        {
-            get
-            {
-                return _ibnPath ?? (_ibnPath = Path.Combine(ProgramDataPath, "ImagesByName"));
-            }
-            set
-            {
-                _ibnPath = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the People directory
-        /// </summary>
-        /// <value>The people path.</value>
-        public string PeoplePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "People");
-            }
-        }
-
-        public string ArtistsPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "artists");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Genre directory
-        /// </summary>
-        /// <value>The genre path.</value>
-        public string GenrePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "Genre");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Genre directory
-        /// </summary>
-        /// <value>The genre path.</value>
-        public string MusicGenrePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "MusicGenre");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Studio directory
-        /// </summary>
-        /// <value>The studio path.</value>
-        public string StudioPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "Studio");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Year directory
-        /// </summary>
-        /// <value>The year path.</value>
-        public string YearPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "Year");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the General IBN directory
-        /// </summary>
-        /// <value>The general path.</value>
-        public string GeneralPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "general");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Ratings IBN directory
-        /// </summary>
-        /// <value>The ratings path.</value>
-        public string RatingsPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "ratings");
-            }
-        }
-
-        /// <summary>
-        /// Gets the media info images path.
-        /// </summary>
-        /// <value>The media info images path.</value>
-        public string MediaInfoImagesPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "mediainfo");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the user configuration directory
-        /// </summary>
-        /// <value>The user configuration directory path.</value>
-        public string UserConfigurationDirectoryPath
-        {
-            get
-            {
-                return Path.Combine(ConfigurationDirectoryPath, "users");
-            }
-        }
-
-        private string _transcodingTempPath;
-        public string TranscodingTempPath
-        {
-            get
-            {
-                return _transcodingTempPath ?? (_transcodingTempPath = Path.Combine(ProgramDataPath, "transcoding-temp"));
-            }
-            set
-            {
-                _transcodingTempPath = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the game genre path.
-        /// </summary>
-        /// <value>The game genre path.</value>
-        public string GameGenrePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "GameGenre");
-            }
-        }
-
-        private string _internalMetadataPath;
-        public string InternalMetadataPath
-        {
-            get
-            {
-                return _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata"));
-            }
-            set
-            {
-                _internalMetadataPath = value;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 16ac6faf3..c224c3d38 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Emby.XmlTv" version="1.0.0.63" targetFramework="net46" />
   <package id="ini-parser" version="2.3.0" targetFramework="net45" />
-  <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
-  <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />
-  <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
-  <package id="UniversalDetector" version="1.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index e5a17f8fc..b14378eb8 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -50,9 +50,7 @@ using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Subtitles;
 using MediaBrowser.Server.Implementations;
 using MediaBrowser.Server.Implementations.Activity;
-using MediaBrowser.Server.Implementations.Configuration;
 using MediaBrowser.Server.Implementations.Devices;
-using MediaBrowser.Server.Implementations.HttpServer;
 using MediaBrowser.Server.Implementations.IO;
 using MediaBrowser.Server.Implementations.Notifications;
 using MediaBrowser.Server.Implementations.Persistence;
@@ -72,6 +70,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Common.Implementations;
@@ -133,8 +132,10 @@ using MediaBrowser.Model.Social;
 using MediaBrowser.Model.Text;
 using MediaBrowser.Model.Xml;
 using MediaBrowser.Server.Implementations.Archiving;
+using MediaBrowser.Server.Startup.Common.Configuration;
 using OpenSubtitlesHandler;
 using ServiceStack;
+using SocketHttpListener.Primitives;
 using StringExtensions = MediaBrowser.Controller.Extensions.StringExtensions;
 
 namespace MediaBrowser.Server.Startup.Common
@@ -271,7 +272,7 @@ namespace MediaBrowser.Server.Startup.Common
             ILogManager logManager,
             StartupOptions options,
             IFileSystem fileSystem,
-            INativeApp nativeApp, 
+            INativeApp nativeApp,
             IPowerManagement powerManagement,
             string releaseAssetFilename)
             : base(applicationPaths, logManager, fileSystem)
@@ -613,7 +614,7 @@ namespace MediaBrowser.Server.Startup.Common
 
             RegisterSingleInstance<ISearchEngine>(() => new SearchEngine(LogManager, LibraryManager, UserManager));
 
-            HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamProvider, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer);
+            HttpServer = HttpServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamProvider, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer, EnvironmentInfo, Certificate);
             HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading");
             RegisterSingleInstance(HttpServer, false);
             progress.Report(10);
@@ -736,6 +737,32 @@ namespace MediaBrowser.Server.Startup.Common
             await ((UserManager)UserManager).Initialize().ConfigureAwait(false);
         }
 
+        private ICertificate GetCertificate(string certificateLocation)
+        {
+            if (string.IsNullOrWhiteSpace(certificateLocation))
+            {
+                return null;
+            }
+
+            try
+            {
+                X509Certificate2 localCert = new X509Certificate2(certificateLocation);
+                //localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
+                if (localCert.PrivateKey == null)
+                {
+                    //throw new FileNotFoundException("Secure requested, no private key included", certificateLocation);
+                    return null;
+                }
+
+                return new Certificate(localCert);
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error loading cert from {0}", ex, certificateLocation);
+                return null;
+            }
+        }
+
         private IImageProcessor GetImageProcessor()
         {
             var maxConcurrentImageProcesses = Math.Max(Environment.ProcessorCount, 4);
@@ -969,6 +996,7 @@ namespace MediaBrowser.Server.Startup.Common
         }
 
         private string CertificatePath { get; set; }
+        private ICertificate Certificate { get; set; }
 
         private IEnumerable<string> GetUrlPrefixes()
         {
@@ -998,10 +1026,11 @@ namespace MediaBrowser.Server.Startup.Common
         private void StartServer()
         {
             CertificatePath = GetCertificatePath(true);
+            Certificate = GetCertificate(CertificatePath);
 
             try
             {
-                ServerManager.Start(GetUrlPrefixes(), CertificatePath);
+                ServerManager.Start(GetUrlPrefixes());
                 return;
             }
             catch (Exception ex)
@@ -1018,7 +1047,7 @@ namespace MediaBrowser.Server.Startup.Common
 
             try
             {
-                ServerManager.Start(GetUrlPrefixes(), CertificatePath);
+                ServerManager.Start(GetUrlPrefixes());
             }
             catch (Exception ex)
             {
@@ -1298,7 +1327,7 @@ namespace MediaBrowser.Server.Startup.Common
 
         public bool SupportsHttps
         {
-            get { return !string.IsNullOrWhiteSpace(HttpServer.CertificatePath); }
+            get { return Certificate != null; }
         }
 
         public async Task<string> GetLocalApiUrl()
diff --git a/MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs
new file mode 100644
index 000000000..756a8d0bf
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs
@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Emby.Common.Implementations.Configuration;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Events;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Server.Startup.Common.Configuration
+{
+    /// <summary>
+    /// Class ServerConfigurationManager
+    /// </summary>
+    public class ServerConfigurationManager : BaseConfigurationManager, IServerConfigurationManager
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServerConfigurationManager" /> class.
+        /// </summary>
+        /// <param name="applicationPaths">The application paths.</param>
+        /// <param name="logManager">The log manager.</param>
+        /// <param name="xmlSerializer">The XML serializer.</param>
+        /// <param name="fileSystem">The file system.</param>
+        public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
+            : base(applicationPaths, logManager, xmlSerializer, fileSystem)
+        {
+            UpdateMetadataPath();
+        }
+
+        public event EventHandler<GenericEventArgs<ServerConfiguration>> ConfigurationUpdating;
+
+        /// <summary>
+        /// Gets the type of the configuration.
+        /// </summary>
+        /// <value>The type of the configuration.</value>
+        protected override Type ConfigurationType
+        {
+            get { return typeof(ServerConfiguration); }
+        }
+
+        /// <summary>
+        /// Gets the application paths.
+        /// </summary>
+        /// <value>The application paths.</value>
+        public IServerApplicationPaths ApplicationPaths
+        {
+            get { return (IServerApplicationPaths)CommonApplicationPaths; }
+        }
+
+        /// <summary>
+        /// Gets the configuration.
+        /// </summary>
+        /// <value>The configuration.</value>
+        public ServerConfiguration Configuration
+        {
+            get { return (ServerConfiguration)CommonConfiguration; }
+        }
+
+        /// <summary>
+        /// Called when [configuration updated].
+        /// </summary>
+        protected override void OnConfigurationUpdated()
+        {
+            UpdateMetadataPath();
+
+            base.OnConfigurationUpdated();
+        }
+
+        public override void AddParts(IEnumerable<IConfigurationFactory> factories)
+        {
+            base.AddParts(factories);
+
+            UpdateTranscodingTempPath();
+        }
+
+        /// <summary>
+        /// Updates the metadata path.
+        /// </summary>
+        private void UpdateMetadataPath()
+        {
+            string metadataPath;
+
+            if (string.IsNullOrWhiteSpace(Configuration.MetadataPath))
+            {
+                metadataPath = GetInternalMetadataPath();
+            }
+            else
+            {
+                metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
+            }
+
+            ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;
+
+            ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath;
+        }
+
+        private string GetInternalMetadataPath()
+        {
+            return Path.Combine(ApplicationPaths.ProgramDataPath, "metadata");
+        }
+
+        /// <summary>
+        /// Updates the transcoding temporary path.
+        /// </summary>
+        private void UpdateTranscodingTempPath()
+        {
+            var encodingConfig = this.GetConfiguration<EncodingOptions>("encoding");
+
+            ((ServerApplicationPaths)ApplicationPaths).TranscodingTempPath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ?
+                null :
+                Path.Combine(encodingConfig.TranscodingTempPath, "transcoding-temp");
+        }
+
+        protected override void OnNamedConfigurationUpdated(string key, object configuration)
+        {
+            base.OnNamedConfigurationUpdated(key, configuration);
+
+            if (string.Equals(key, "encoding", StringComparison.OrdinalIgnoreCase))
+            {
+                UpdateTranscodingTempPath();
+            }
+        }
+
+        /// <summary>
+        /// Replaces the configuration.
+        /// </summary>
+        /// <param name="newConfiguration">The new configuration.</param>
+        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        public override void ReplaceConfiguration(BaseApplicationConfiguration newConfiguration)
+        {
+            var newConfig = (ServerConfiguration)newConfiguration;
+
+            ValidatePathSubstitutions(newConfig);
+            ValidateMetadataPath(newConfig);
+            ValidateSslCertificate(newConfig);
+
+            EventHelper.FireEventIfNotNull(ConfigurationUpdating, this, new GenericEventArgs<ServerConfiguration> { Argument = newConfig }, Logger);
+
+            base.ReplaceConfiguration(newConfiguration);
+        }
+
+
+        /// <summary>
+        /// Validates the SSL certificate.
+        /// </summary>
+        /// <param name="newConfig">The new configuration.</param>
+        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        private void ValidateSslCertificate(BaseApplicationConfiguration newConfig)
+        {
+            var serverConfig = (ServerConfiguration)newConfig;
+
+            var newPath = serverConfig.CertificatePath;
+
+            if (!string.IsNullOrWhiteSpace(newPath)
+                && !string.Equals(Configuration.CertificatePath ?? string.Empty, newPath))
+            {
+                // Validate
+                if (!FileSystem.FileExists(newPath))
+                {
+                    throw new FileNotFoundException(string.Format("Certificate file '{0}' does not exist.", newPath));
+                }
+            }
+        }
+
+        private void ValidatePathSubstitutions(ServerConfiguration newConfig)
+        {
+            foreach (var map in newConfig.PathSubstitutions)
+            {
+                if (string.IsNullOrWhiteSpace(map.From) || string.IsNullOrWhiteSpace(map.To))
+                {
+                    throw new ArgumentException("Invalid path substitution");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Validates the metadata path.
+        /// </summary>
+        /// <param name="newConfig">The new configuration.</param>
+        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        private void ValidateMetadataPath(ServerConfiguration newConfig)
+        {
+            var newPath = newConfig.MetadataPath;
+
+            if (!string.IsNullOrWhiteSpace(newPath)
+                && !string.Equals(Configuration.MetadataPath ?? string.Empty, newPath))
+            {
+                // Validate
+                if (!FileSystem.DirectoryExists(newPath))
+                {
+                    throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newPath));
+                }
+
+                EnsureWriteAccess(newPath);
+            }
+        }
+
+        public void DisableMetadataService(string service)
+        {
+            DisableMetadataService(typeof(Movie), Configuration, service);
+            DisableMetadataService(typeof(Episode), Configuration, service);
+            DisableMetadataService(typeof(Series), Configuration, service);
+            DisableMetadataService(typeof(Season), Configuration, service);
+            DisableMetadataService(typeof(MusicArtist), Configuration, service);
+            DisableMetadataService(typeof(MusicAlbum), Configuration, service);
+            DisableMetadataService(typeof(MusicVideo), Configuration, service);
+            DisableMetadataService(typeof(Video), Configuration, service);
+        }
+
+        private void DisableMetadataService(Type type, ServerConfiguration config, string service)
+        {
+            var options = GetMetadataOptions(type, config);
+
+            if (!options.DisabledMetadataSavers.Contains(service, StringComparer.OrdinalIgnoreCase))
+            {
+                var list = options.DisabledMetadataSavers.ToList();
+
+                list.Add(service);
+
+                options.DisabledMetadataSavers = list.ToArray();
+            }
+        }
+
+        private MetadataOptions GetMetadataOptions(Type type, ServerConfiguration config)
+        {
+            var options = config.MetadataOptions
+                .FirstOrDefault(i => string.Equals(i.ItemType, type.Name, StringComparison.OrdinalIgnoreCase));
+
+            if (options == null)
+            {
+                var list = config.MetadataOptions.ToList();
+
+                options = new MetadataOptions
+                {
+                    ItemType = type.Name
+                };
+
+                list.Add(options);
+
+                config.MetadataOptions = list.ToArray();
+            }
+
+            return options;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Startup.Common/HttpServerFactory.cs b/MediaBrowser.Server.Startup.Common/HttpServerFactory.cs
new file mode 100644
index 000000000..c0c376996
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/HttpServerFactory.cs
@@ -0,0 +1,107 @@
+using System;
+using System.IO;
+using System.Net.Security;
+using System.Net.Sockets;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+using Emby.Common.Implementations.Net;
+using Emby.Server.Implementations.HttpServer;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.System;
+using MediaBrowser.Model.Text;
+using ServiceStack.Text.Jsv;
+using SocketHttpListener.Primitives;
+
+namespace MediaBrowser.Server.Startup.Common
+{
+    /// <summary>
+    /// Class ServerFactory
+    /// </summary>
+    public static class HttpServerFactory
+    {
+        /// <summary>
+        /// Creates the server.
+        /// </summary>
+        /// <returns>IHttpServer.</returns>
+        public static IHttpServer CreateServer(IServerApplicationHost applicationHost,
+            ILogManager logManager,
+            IServerConfigurationManager config, 
+            INetworkManager networkmanager,
+            IMemoryStreamFactory streamProvider,
+            string serverName, 
+            string defaultRedirectpath,
+            ITextEncoding textEncoding,
+            ISocketFactory socketFactory,
+            ICryptoProvider cryptoProvider,
+            IJsonSerializer json,
+            IXmlSerializer xml,
+            IEnvironmentInfo environment,
+            ICertificate certificate)
+        {
+            var logger = logManager.GetLogger("HttpServer");
+
+            return new HttpListenerHost(applicationHost,
+                logger, 
+                config, 
+                serverName, 
+                defaultRedirectpath, 
+                networkmanager, 
+                streamProvider, 
+                textEncoding, 
+                socketFactory, 
+                cryptoProvider, 
+                json, 
+                xml,
+                environment,
+                certificate,
+                new StreamFactory(),
+                GetParseFn);
+        }
+
+        private static Func<string, object> GetParseFn(Type propertyType)
+        {
+            return s => JsvReader.GetParseFn(propertyType)(s);
+        }
+    }
+
+    public class StreamFactory : IStreamFactory
+    {
+        public Stream CreateNetworkStream(ISocket socket, bool ownsSocket)
+        {
+            var netSocket = (NetSocket)socket;
+
+            return new NetworkStream(netSocket.Socket, ownsSocket);
+        }
+
+        public Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate)
+        {
+            var sslStream = (SslStream)stream;
+            var cert = (Certificate)certificate;
+
+            return sslStream.AuthenticateAsServerAsync(cert.X509Certificate);
+        }
+
+        public Stream CreateSslStream(Stream innerStream, bool leaveInnerStreamOpen)
+        {
+            return new SslStream(innerStream, leaveInnerStreamOpen);
+        }
+    }
+
+    public class Certificate : ICertificate
+    {
+        public Certificate(X509Certificate x509Certificate)
+        {
+            X509Certificate = x509Certificate;
+        }
+
+        public X509Certificate X509Certificate { get; private set; }
+    }
+}
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index 7e01fd36d..7ac020cc4 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -49,14 +49,22 @@
       <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ServiceStack.Text, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
+      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text, Version=4.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="SimpleInjector, Version=3.2.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <HintPath>..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SocketHttpListener.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ThirdParty\emby\SocketHttpListener.Portable.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -73,10 +81,12 @@
     <Compile Include="ApplicationHost.cs" />
     <Compile Include="ApplicationPathHelper.cs" />
     <Compile Include="Browser\BrowserLauncher.cs" />
+    <Compile Include="Configuration\ServerConfigurationManager.cs" />
     <Compile Include="EntryPoints\StartupWizard.cs" />
     <Compile Include="FFMpeg\FFMpegLoader.cs" />
     <Compile Include="FFMpeg\FFMpegInstallInfo.cs" />
     <Compile Include="FFMpeg\FFMpegInfo.cs" />
+    <Compile Include="HttpServerFactory.cs" />
     <Compile Include="INativeApp.cs" />
     <Compile Include="MbLinkShortcutHandler.cs" />
     <Compile Include="Migrations\IVersionMigration.cs" />
@@ -103,6 +113,7 @@
     <Compile Include="Security\X509Extension.cs" />
     <Compile Include="Security\X509Extensions.cs" />
     <Compile Include="Security\X520Attributes.cs" />
+    <Compile Include="ServerApplicationPaths.cs" />
     <Compile Include="StartupOptions.cs" />
     <Compile Include="SystemEvents.cs" />
     <Compile Include="TextLocalizer.cs" />
diff --git a/MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs b/MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs
new file mode 100644
index 000000000..11de1c4ab
--- /dev/null
+++ b/MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs
@@ -0,0 +1,233 @@
+using System.IO;
+using Emby.Common.Implementations;
+using MediaBrowser.Controller;
+
+namespace MediaBrowser.Server.Startup.Common
+{
+    /// <summary>
+    /// Extends BaseApplicationPaths to add paths that are only applicable on the server
+    /// </summary>
+    public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseApplicationPaths" /> class.
+        /// </summary>
+        public ServerApplicationPaths(string programDataPath, string applicationPath, string applicationResourcesPath)
+            : base(programDataPath, applicationPath)
+        {
+            ApplicationResourcesPath = applicationResourcesPath;
+        }
+
+        public string ApplicationResourcesPath { get; private set; }
+
+        /// <summary>
+        /// Gets the path to the base root media directory
+        /// </summary>
+        /// <value>The root folder path.</value>
+        public string RootFolderPath
+        {
+            get
+            {
+                return Path.Combine(ProgramDataPath, "root");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the default user view directory.  Used if no specific user view is defined.
+        /// </summary>
+        /// <value>The default user views path.</value>
+        public string DefaultUserViewsPath
+        {
+            get
+            {
+                return Path.Combine(RootFolderPath, "default");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to localization data.
+        /// </summary>
+        /// <value>The localization path.</value>
+        public string LocalizationPath
+        {
+            get
+            {
+                return Path.Combine(ProgramDataPath, "localization");
+            }
+        }
+
+        /// <summary>
+        /// The _ibn path
+        /// </summary>
+        private string _ibnPath;
+        /// <summary>
+        /// Gets the path to the Images By Name directory
+        /// </summary>
+        /// <value>The images by name path.</value>
+        public string ItemsByNamePath
+        {
+            get
+            {
+                return _ibnPath ?? (_ibnPath = Path.Combine(ProgramDataPath, "ImagesByName"));
+            }
+            set
+            {
+                _ibnPath = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the People directory
+        /// </summary>
+        /// <value>The people path.</value>
+        public string PeoplePath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "People");
+            }
+        }
+
+        public string ArtistsPath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "artists");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the Genre directory
+        /// </summary>
+        /// <value>The genre path.</value>
+        public string GenrePath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "Genre");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the Genre directory
+        /// </summary>
+        /// <value>The genre path.</value>
+        public string MusicGenrePath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "MusicGenre");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the Studio directory
+        /// </summary>
+        /// <value>The studio path.</value>
+        public string StudioPath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "Studio");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the Year directory
+        /// </summary>
+        /// <value>The year path.</value>
+        public string YearPath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "Year");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the General IBN directory
+        /// </summary>
+        /// <value>The general path.</value>
+        public string GeneralPath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "general");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the Ratings IBN directory
+        /// </summary>
+        /// <value>The ratings path.</value>
+        public string RatingsPath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "ratings");
+            }
+        }
+
+        /// <summary>
+        /// Gets the media info images path.
+        /// </summary>
+        /// <value>The media info images path.</value>
+        public string MediaInfoImagesPath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "mediainfo");
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the user configuration directory
+        /// </summary>
+        /// <value>The user configuration directory path.</value>
+        public string UserConfigurationDirectoryPath
+        {
+            get
+            {
+                return Path.Combine(ConfigurationDirectoryPath, "users");
+            }
+        }
+
+        private string _transcodingTempPath;
+        public string TranscodingTempPath
+        {
+            get
+            {
+                return _transcodingTempPath ?? (_transcodingTempPath = Path.Combine(ProgramDataPath, "transcoding-temp"));
+            }
+            set
+            {
+                _transcodingTempPath = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the game genre path.
+        /// </summary>
+        /// <value>The game genre path.</value>
+        public string GameGenrePath
+        {
+            get
+            {
+                return Path.Combine(ItemsByNamePath, "GameGenre");
+            }
+        }
+
+        private string _internalMetadataPath;
+        public string InternalMetadataPath
+        {
+            get
+            {
+                return _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata"));
+            }
+            set
+            {
+                _internalMetadataPath = value;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Startup.Common/packages.config b/MediaBrowser.Server.Startup.Common/packages.config
index ea3d0e7f8..fa1cc928c 100644
--- a/MediaBrowser.Server.Startup.Common/packages.config
+++ b/MediaBrowser.Server.Startup.Common/packages.config
@@ -3,5 +3,6 @@
   <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />
   <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
   <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />
+  <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
   <package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3


From f8b8de13b752c49360bbe10502cc067be89937ae Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 11 Nov 2016 13:58:36 -0500
Subject: update HttpListenerHost

---
 Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index d7897f165..64f498b12 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -64,7 +64,7 @@ namespace Emby.Server.Implementations.HttpServer
             IServerConfigurationManager config,
             string serviceName,
             string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func<Type, Func<string, object>> funcParseFn)
-            : base(serviceName, new Assembly[] { })
+            : base(serviceName)
         {
             _appHost = applicationHost;
             DefaultRedirectPath = defaultRedirectPath;
@@ -134,11 +134,11 @@ namespace Emby.Server.Implementations.HttpServer
             return _appHost.CreateInstance(type);
         }
 
-        protected override ServiceController CreateServiceController(params Assembly[] assembliesWithServices)
+        protected override ServiceController CreateServiceController()
         {
             var types = _restServices.Select(r => r.GetType()).ToArray();
 
-            return new ServiceController(this, () => types);
+            return new ServiceController(() => types);
         }
 
         public override ServiceStackHost Start(string listeningAtUrlBase)
-- 
cgit v1.2.3


From 406e6cb8132c1b8ade2872d44d7183267dd51ca8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 11 Nov 2016 14:55:12 -0500
Subject: update portable projects

---
 Emby.Drawing.ImageMagick/ImageMagickEncoder.cs     |   13 +-
 Emby.Server.Core/Emby.Server.Core.xproj            |    1 +
 Emby.Server.Core/project.json                      |  122 ++-
 .../Emby.Server.Implementations.csproj             |   26 +-
 .../Emby.Server.Implementations.nuget.targets      |    6 -
 .../FileOrganization/EpisodeFileOrganizer.cs       |    3 +-
 .../SocketSharp/WebSocketSharpListener.cs          |    3 +-
 .../Library/LibraryManager.cs                      |   13 +-
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  |    3 +-
 .../Library/Resolvers/BaseVideoResolver.cs         |    6 +-
 .../Library/Resolvers/Movies/MovieResolver.cs      |    6 +-
 .../Library/Resolvers/TV/SeriesResolver.cs         |    3 +-
 .../LiveTv/Listings/XmlTvListingsProvider.cs       |    8 +-
 .../Logging/PatternsLogger.cs                      |   63 --
 Emby.Server.Implementations/packages.config        |    5 +-
 Emby.Server.Implementations/project.json           |   17 -
 .../MediaBrowser.Server.Mono.csproj                |    4 -
 MediaBrowser.Server.Mono/Program.cs                |   27 +-
 MediaBrowser.Server.Mono/packages.config           |    1 -
 .../Cryptography/CertificateGenerator.cs           |    2 +-
 .../ImageEncoderHelper.cs                          |   11 +-
 .../MediaBrowser.Server.Startup.Common.csproj      |   20 +-
 MediaBrowser.Server.Startup.Common/packages.config |    4 +-
 MediaBrowser.ServerApplication/MainStartup.cs      |   24 +-
 .../MediaBrowser.ServerApplication.csproj          |    4 -
 MediaBrowser.ServerApplication/packages.config     |    1 -
 MediaBrowser.WebDashboard/packages.config          |    2 -
 MediaBrowser.sln                                   |  359 +++++++
 ServiceStack/FilterAttributeCache.cs               |   27 +
 ServiceStack/Host/ActionContext.cs                 |   27 +
 ServiceStack/Host/ContentTypes.cs                  |   77 ++
 ServiceStack/Host/HttpResponseStreamWrapper.cs     |   95 ++
 ServiceStack/Host/RestHandler.cs                   |  200 ++++
 ServiceStack/Host/RestPath.cs                      |  443 ++++++++
 ServiceStack/Host/ServiceController.cs             |  220 ++++
 ServiceStack/Host/ServiceExec.cs                   |  156 +++
 ServiceStack/Host/ServiceMetadata.cs               |   27 +
 ServiceStack/HttpHandlerFactory.cs                 |   27 +
 ServiceStack/HttpRequestExtensions.cs              |  127 +++
 ServiceStack/HttpResponseExtensionsInternal.cs     |  237 +++++
 ServiceStack/HttpResult.cs                         |  250 +++++
 ServiceStack/HttpUtils.cs                          |   34 +
 ServiceStack/Properties/AssemblyInfo.cs            |   25 +
 ServiceStack/ReflectionExtensions.cs               |  270 +++++
 ServiceStack/ServiceStack.csproj                   |  131 +++
 ServiceStack/ServiceStack.nuget.targets            |    6 +
 ServiceStack/ServiceStack.xproj                    |   19 +
 ServiceStack/ServiceStackHost.Runtime.cs           |   74 ++
 ServiceStack/ServiceStackHost.cs                   |  104 ++
 ServiceStack/StringMapTypeDeserializer.cs          |  126 +++
 ServiceStack/UrlExtensions.cs                      |   33 +
 ServiceStack/packages.config                       |    3 +
 ServiceStack/project.json                          |   17 +
 SocketHttpListener.Portable/ByteOrder.cs           |   17 +
 SocketHttpListener.Portable/CloseEventArgs.cs      |   90 ++
 SocketHttpListener.Portable/CloseStatusCode.cs     |   94 ++
 SocketHttpListener.Portable/CompressionMethod.cs   |   23 +
 SocketHttpListener.Portable/ErrorEventArgs.cs      |   46 +
 SocketHttpListener.Portable/Ext.cs                 | 1089 ++++++++++++++++++++
 SocketHttpListener.Portable/Fin.cs                 |    8 +
 SocketHttpListener.Portable/HttpBase.cs            |  104 ++
 SocketHttpListener.Portable/HttpResponse.cs        |  161 +++
 SocketHttpListener.Portable/Mask.cs                |    8 +
 SocketHttpListener.Portable/MessageEventArgs.cs    |   96 ++
 .../Net/AuthenticationSchemeSelector.cs            |    6 +
 SocketHttpListener.Portable/Net/ChunkStream.cs     |  371 +++++++
 .../Net/ChunkedInputStream.cs                      |  160 +++
 SocketHttpListener.Portable/Net/CookieHelper.cs    |  144 +++
 .../Net/EndPointListener.cs                        |  368 +++++++
 SocketHttpListener.Portable/Net/EndPointManager.cs |  165 +++
 SocketHttpListener.Portable/Net/HttpConnection.cs  |  550 ++++++++++
 SocketHttpListener.Portable/Net/HttpListener.cs    |  299 ++++++
 .../Net/HttpListenerBasicIdentity.cs               |   70 ++
 .../Net/HttpListenerContext.cs                     |  201 ++++
 .../Net/HttpListenerPrefixCollection.cs            |   97 ++
 .../Net/HttpListenerRequest.cs                     |  654 ++++++++++++
 .../Net/HttpListenerResponse.cs                    |  517 ++++++++++
 SocketHttpListener.Portable/Net/HttpStatusCode.cs  |  321 ++++++
 .../Net/HttpStreamAsyncResult.cs                   |   77 ++
 SocketHttpListener.Portable/Net/HttpVersion.cs     |   16 +
 SocketHttpListener.Portable/Net/ListenerPrefix.cs  |  148 +++
 SocketHttpListener.Portable/Net/RequestStream.cs   |  231 +++++
 SocketHttpListener.Portable/Net/ResponseStream.cs  |  316 ++++++
 .../Net/WebHeaderCollection.cs                     |  391 +++++++
 .../Net/WebSockets/HttpListenerWebSocketContext.cs |  347 +++++++
 .../Net/WebSockets/WebSocketContext.cs             |  183 ++++
 SocketHttpListener.Portable/Opcode.cs              |   43 +
 SocketHttpListener.Portable/PayloadData.cs         |  149 +++
 .../Primitives/HttpListenerException.cs            |   17 +
 .../Primitives/ICertificate.cs                     |   12 +
 .../Primitives/IStreamFactory.cs                   |   18 +
 .../Primitives/ITextEncoding.cs                    |   17 +
 .../Properties/AssemblyInfo.cs                     |   30 +
 SocketHttpListener.Portable/Rsv.cs                 |    8 +
 .../SocketHttpListener.Portable.csproj             |  109 ++
 .../SocketHttpListener.Portable.nuget.targets      |    6 +
 SocketHttpListener.Portable/WebSocket.cs           |  898 ++++++++++++++++
 SocketHttpListener.Portable/WebSocketException.cs  |   60 ++
 SocketHttpListener.Portable/WebSocketFrame.cs      |  578 +++++++++++
 SocketHttpListener.Portable/WebSocketState.cs      |   35 +
 SocketHttpListener.Portable/packages.config        |    5 +
 SocketHttpListener.Portable/project.json           |   17 +
 102 files changed, 12649 insertions(+), 233 deletions(-)
 delete mode 100644 Emby.Server.Implementations/Emby.Server.Implementations.nuget.targets
 delete mode 100644 Emby.Server.Implementations/Logging/PatternsLogger.cs
 delete mode 100644 Emby.Server.Implementations/project.json
 create mode 100644 ServiceStack/FilterAttributeCache.cs
 create mode 100644 ServiceStack/Host/ActionContext.cs
 create mode 100644 ServiceStack/Host/ContentTypes.cs
 create mode 100644 ServiceStack/Host/HttpResponseStreamWrapper.cs
 create mode 100644 ServiceStack/Host/RestHandler.cs
 create mode 100644 ServiceStack/Host/RestPath.cs
 create mode 100644 ServiceStack/Host/ServiceController.cs
 create mode 100644 ServiceStack/Host/ServiceExec.cs
 create mode 100644 ServiceStack/Host/ServiceMetadata.cs
 create mode 100644 ServiceStack/HttpHandlerFactory.cs
 create mode 100644 ServiceStack/HttpRequestExtensions.cs
 create mode 100644 ServiceStack/HttpResponseExtensionsInternal.cs
 create mode 100644 ServiceStack/HttpResult.cs
 create mode 100644 ServiceStack/HttpUtils.cs
 create mode 100644 ServiceStack/Properties/AssemblyInfo.cs
 create mode 100644 ServiceStack/ReflectionExtensions.cs
 create mode 100644 ServiceStack/ServiceStack.csproj
 create mode 100644 ServiceStack/ServiceStack.nuget.targets
 create mode 100644 ServiceStack/ServiceStack.xproj
 create mode 100644 ServiceStack/ServiceStackHost.Runtime.cs
 create mode 100644 ServiceStack/ServiceStackHost.cs
 create mode 100644 ServiceStack/StringMapTypeDeserializer.cs
 create mode 100644 ServiceStack/UrlExtensions.cs
 create mode 100644 ServiceStack/packages.config
 create mode 100644 ServiceStack/project.json
 create mode 100644 SocketHttpListener.Portable/ByteOrder.cs
 create mode 100644 SocketHttpListener.Portable/CloseEventArgs.cs
 create mode 100644 SocketHttpListener.Portable/CloseStatusCode.cs
 create mode 100644 SocketHttpListener.Portable/CompressionMethod.cs
 create mode 100644 SocketHttpListener.Portable/ErrorEventArgs.cs
 create mode 100644 SocketHttpListener.Portable/Ext.cs
 create mode 100644 SocketHttpListener.Portable/Fin.cs
 create mode 100644 SocketHttpListener.Portable/HttpBase.cs
 create mode 100644 SocketHttpListener.Portable/HttpResponse.cs
 create mode 100644 SocketHttpListener.Portable/Mask.cs
 create mode 100644 SocketHttpListener.Portable/MessageEventArgs.cs
 create mode 100644 SocketHttpListener.Portable/Net/AuthenticationSchemeSelector.cs
 create mode 100644 SocketHttpListener.Portable/Net/ChunkStream.cs
 create mode 100644 SocketHttpListener.Portable/Net/ChunkedInputStream.cs
 create mode 100644 SocketHttpListener.Portable/Net/CookieHelper.cs
 create mode 100644 SocketHttpListener.Portable/Net/EndPointListener.cs
 create mode 100644 SocketHttpListener.Portable/Net/EndPointManager.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpConnection.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpListener.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpListenerBasicIdentity.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpListenerContext.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpListenerPrefixCollection.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpListenerRequest.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpListenerResponse.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpStatusCode.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpStreamAsyncResult.cs
 create mode 100644 SocketHttpListener.Portable/Net/HttpVersion.cs
 create mode 100644 SocketHttpListener.Portable/Net/ListenerPrefix.cs
 create mode 100644 SocketHttpListener.Portable/Net/RequestStream.cs
 create mode 100644 SocketHttpListener.Portable/Net/ResponseStream.cs
 create mode 100644 SocketHttpListener.Portable/Net/WebHeaderCollection.cs
 create mode 100644 SocketHttpListener.Portable/Net/WebSockets/HttpListenerWebSocketContext.cs
 create mode 100644 SocketHttpListener.Portable/Net/WebSockets/WebSocketContext.cs
 create mode 100644 SocketHttpListener.Portable/Opcode.cs
 create mode 100644 SocketHttpListener.Portable/PayloadData.cs
 create mode 100644 SocketHttpListener.Portable/Primitives/HttpListenerException.cs
 create mode 100644 SocketHttpListener.Portable/Primitives/ICertificate.cs
 create mode 100644 SocketHttpListener.Portable/Primitives/IStreamFactory.cs
 create mode 100644 SocketHttpListener.Portable/Primitives/ITextEncoding.cs
 create mode 100644 SocketHttpListener.Portable/Properties/AssemblyInfo.cs
 create mode 100644 SocketHttpListener.Portable/Rsv.cs
 create mode 100644 SocketHttpListener.Portable/SocketHttpListener.Portable.csproj
 create mode 100644 SocketHttpListener.Portable/SocketHttpListener.Portable.nuget.targets
 create mode 100644 SocketHttpListener.Portable/WebSocket.cs
 create mode 100644 SocketHttpListener.Portable/WebSocketException.cs
 create mode 100644 SocketHttpListener.Portable/WebSocketFrame.cs
 create mode 100644 SocketHttpListener.Portable/WebSocketState.cs
 create mode 100644 SocketHttpListener.Portable/packages.config
 create mode 100644 SocketHttpListener.Portable/project.json

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs
index 3410ef003..242898e33 100644
--- a/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs
+++ b/Emby.Drawing.ImageMagick/ImageMagickEncoder.cs
@@ -8,9 +8,6 @@ using MediaBrowser.Model.Logging;
 using System;
 using System.IO;
 using System.Linq;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 
 namespace Emby.Drawing.ImageMagick
@@ -19,17 +16,15 @@ namespace Emby.Drawing.ImageMagick
     {
         private readonly ILogger _logger;
         private readonly IApplicationPaths _appPaths;
-        private readonly IHttpClient _httpClient;
+        private readonly Func<IHttpClient> _httpClientFactory;
         private readonly IFileSystem _fileSystem;
-        private readonly IServerConfigurationManager _config;
 
-        public ImageMagickEncoder(ILogger logger, IApplicationPaths appPaths, IHttpClient httpClient, IFileSystem fileSystem, IServerConfigurationManager config)
+        public ImageMagickEncoder(ILogger logger, IApplicationPaths appPaths, Func<IHttpClient> httpClientFactory, IFileSystem fileSystem)
         {
             _logger = logger;
             _appPaths = appPaths;
-            _httpClient = httpClient;
+            _httpClientFactory = httpClientFactory;
             _fileSystem = fileSystem;
-            _config = config;
 
             LogVersion();
         }
@@ -260,7 +255,7 @@ namespace Emby.Drawing.ImageMagick
                 {
                     var currentImageSize = new ImageSize(imageWidth, imageHeight);
 
-                    var task = new PlayedIndicatorDrawer(_appPaths, _httpClient, _fileSystem).DrawPlayedIndicator(wand, currentImageSize);
+                    var task = new PlayedIndicatorDrawer(_appPaths, _httpClientFactory(), _fileSystem).DrawPlayedIndicator(wand, currentImageSize);
                     Task.WaitAll(task);
                 }
                 else if (options.UnplayedCount.HasValue)
diff --git a/Emby.Server.Core/Emby.Server.Core.xproj b/Emby.Server.Core/Emby.Server.Core.xproj
index fefaa6284..00f7664bd 100644
--- a/Emby.Server.Core/Emby.Server.Core.xproj
+++ b/Emby.Server.Core/Emby.Server.Core.xproj
@@ -16,6 +16,7 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\ServiceStack\ServiceStack.csproj" />
     <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
     <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
     <ProjectReference Include="..\MediaBrowser.Api\MediaBrowser.Api.csproj" />
diff --git a/Emby.Server.Core/project.json b/Emby.Server.Core/project.json
index 5d14aac3f..93528bb99 100644
--- a/Emby.Server.Core/project.json
+++ b/Emby.Server.Core/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    
+
   },
 
   "frameworks": {
@@ -56,65 +56,75 @@
         "Emby.Drawing": {
           "target": "project"
         },
-        "SocketHttpListener.Portable": "1.0.50"    
-		}
-    },
-    "netstandard1.6": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "NETStandard.Library": "1.6.0",
-		"System.AppDomain": "2.0.11",
-		"System.Globalization.Extensions": "4.0.1",
-		"System.IO.FileSystem.Watcher": "4.0.0",
-		"System.Net.Security": "4.0.0",
-		"System.Security.Cryptography.X509Certificates": "4.1.0",
-		"System.Runtime.Extensions": "4.1.0",
-        "SocketHttpListener.Portable": "1.0.50",
-		"MediaBrowser.Model": {
-          "target": "project"
-        },
-        "MediaBrowser.Common": {
-          "target": "project"
-        },
-        "MediaBrowser.Controller": {
-          "target": "project"
-        },
-        "Emby.Common.Implementations": {
-          "target": "project"
-        },
-        "Mono.Nat": {
-          "target": "project"
-        },
-        "Emby.Server.Implementations": {
-          "target": "project"
-        },
-        "MediaBrowser.Server.Implementations": {
-          "target": "project"
-        },
-        "Emby.Dlna": {
-          "target": "project"
-        },
-        "Emby.Photos": {
-          "target": "project"
-        },
-        "MediaBrowser.Api": {
-          "target": "project"
-        },
-        "MediaBrowser.MediaEncoding": {
-          "target": "project"
-        },
-        "MediaBrowser.XbmcMetadata": {
-          "target": "project"
-        },
-        "MediaBrowser.LocalMetadata": {
+        "ServiceStack": {
           "target": "project"
         },
-        "MediaBrowser.WebDashboard": {
-          "target": "project"
-        },
-        "Emby.Drawing": {
+        "SocketHttpListener.Portable": {
           "target": "project"
         }
+      },
+      "netstandard1.6": {
+        "imports": "dnxcore50",
+        "dependencies": {
+          "NETStandard.Library": "1.6.0",
+          "System.AppDomain": "2.0.11",
+          "System.Globalization.Extensions": "4.0.1",
+          "System.IO.FileSystem.Watcher": "4.0.0",
+          "System.Net.Security": "4.0.0",
+          "System.Security.Cryptography.X509Certificates": "4.1.0",
+          "System.Runtime.Extensions": "4.1.0",
+          "MediaBrowser.Model": {
+            "target": "project"
+          },
+          "MediaBrowser.Common": {
+            "target": "project"
+          },
+          "MediaBrowser.Controller": {
+            "target": "project"
+          },
+          "Emby.Common.Implementations": {
+            "target": "project"
+          },
+          "Mono.Nat": {
+            "target": "project"
+          },
+          "Emby.Server.Implementations": {
+            "target": "project"
+          },
+          "MediaBrowser.Server.Implementations": {
+            "target": "project"
+          },
+          "Emby.Dlna": {
+            "target": "project"
+          },
+          "Emby.Photos": {
+            "target": "project"
+          },
+          "MediaBrowser.Api": {
+            "target": "project"
+          },
+          "MediaBrowser.MediaEncoding": {
+            "target": "project"
+          },
+          "MediaBrowser.XbmcMetadata": {
+            "target": "project"
+          },
+          "MediaBrowser.LocalMetadata": {
+            "target": "project"
+          },
+          "MediaBrowser.WebDashboard": {
+            "target": "project"
+          },
+          "Emby.Drawing": {
+            "target": "project"
+          },
+          "SocketHttpListener.Portable": {
+            "target": "project"
+          },
+          "ServiceStack": {
+            "target": "project"
+          }
+        }
       }
     }
   }
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 72053daa0..8f92f062c 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -163,7 +163,6 @@
     <Compile Include="LiveTv\TunerHosts\MulticastStream.cs" />
     <Compile Include="LiveTv\TunerHosts\QueueStream.cs" />
     <Compile Include="Localization\LocalizationManager.cs" />
-    <Compile Include="Logging\PatternsLogger.cs" />
     <Compile Include="MediaEncoder\EncodingManager.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
     <Compile Include="News\NewsService.cs" />
@@ -275,23 +274,24 @@
       <Project>{2e781478-814d-4a48-9d80-bff206441a65}</Project>
       <Name>MediaBrowser.Server.Implementations</Name>
     </ProjectReference>
-    <Reference Include="ServiceStack">
-      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
-    </Reference>
-    <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UniversalDetector.1.0.1\lib\portable-net45+sl4+wp71+win8+wpa81\UniversalDetector.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <ProjectReference Include="..\ServiceStack\ServiceStack.csproj">
+      <Project>{680a1709-25eb-4d52-a87f-ee03ffd94baa}</Project>
+      <Name>ServiceStack</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SocketHttpListener.Portable\SocketHttpListener.Portable.csproj">
+      <Project>{4f26d5d8-a7b0-42b3-ba42-7cb7d245934e}</Project>
+      <Name>SocketHttpListener.Portable</Name>
+    </ProjectReference>
     <Reference Include="Emby.XmlTv, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Emby.XmlTv.1.0.0.63\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
+      <HintPath>..\packages\Emby.XmlTv.1.0.1\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MediaBrowser.Naming, Version=1.0.6151.30291, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.59\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
+    <Reference Include="MediaBrowser.Naming, Version=1.0.6159.25070, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MediaBrowser.Naming.1.0.2\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Patterns.Logging, Version=1.0.6151.30227, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
+    <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UniversalDetector.1.0.1\lib\portable-net45+sl4+wp71+win8+wpa81\UniversalDetector.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.nuget.targets b/Emby.Server.Implementations/Emby.Server.Implementations.nuget.targets
deleted file mode 100644
index e69ce0e64..000000000
--- a/Emby.Server.Implementations/Emby.Server.Implementations.nuget.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
-    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index 3f4ede478..cc2dcb6fd 100644
--- a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -15,7 +15,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Library;
-using Emby.Server.Implementations.Logging;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
@@ -71,7 +70,7 @@ namespace Emby.Server.Implementations.FileOrganization
             }
 
             var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
-            var resolver = new EpisodeResolver(namingOptions, new PatternsLogger());
+            var resolver = new EpisodeResolver(namingOptions, new NullLogger());
 
             var episodeInfo = resolver.Resolve(path, false) ??
                 new MediaBrowser.Naming.TV.EpisodeInfo();
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index db7b9bc4b..94cc383a7 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Emby.Server.Implementations.Logging;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.IO;
@@ -55,7 +54,7 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         public void Start(IEnumerable<string> urlPrefixes)
         {
             if (_listener == null)
-                _listener = new HttpListener(new PatternsLogger(_logger), _cryptoProvider, _streamFactory, _socketFactory, _networkManager, _textEncoding, _memoryStreamProvider);
+                _listener = new HttpListener(_logger, _cryptoProvider, _streamFactory, _socketFactory, _networkManager, _textEncoding, _memoryStreamProvider);
 
             _listener.EnableDualMode = _enableDualMode;
 
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 8800777ca..13c6485e5 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -29,7 +29,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Library.Resolvers;
 using Emby.Server.Implementations.Library.Validators;
-using Emby.Server.Implementations.Logging;
 using Emby.Server.Implementations.ScheduledTasks;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Channels;
@@ -2266,7 +2265,7 @@ namespace Emby.Server.Implementations.Library
 
         public bool IsVideoFile(string path, LibraryOptions libraryOptions)
         {
-            var resolver = new VideoResolver(GetNamingOptions(libraryOptions), new PatternsLogger());
+            var resolver = new VideoResolver(GetNamingOptions(libraryOptions), new NullLogger());
             return resolver.IsVideoFile(path);
         }
 
@@ -2294,7 +2293,7 @@ namespace Emby.Server.Implementations.Library
         public bool FillMissingEpisodeNumbersFromPath(Episode episode)
         {
             var resolver = new EpisodeResolver(GetNamingOptions(),
-                new PatternsLogger());
+                new NullLogger());
 
             var isFolder = episode.VideoType == VideoType.BluRay || episode.VideoType == VideoType.Dvd ||
                            episode.VideoType == VideoType.HdDvd;
@@ -2440,7 +2439,7 @@ namespace Emby.Server.Implementations.Library
 
         public ItemLookupInfo ParseName(string name)
         {
-            var resolver = new VideoResolver(GetNamingOptions(), new PatternsLogger());
+            var resolver = new VideoResolver(GetNamingOptions(), new NullLogger());
 
             var result = resolver.CleanDateTime(name);
             var cleanName = resolver.CleanString(result.Name);
@@ -2459,7 +2458,7 @@ namespace Emby.Server.Implementations.Library
                 .SelectMany(i => _fileSystem.GetFiles(i.FullName, false))
                 .ToList();
 
-            var videoListResolver = new VideoListResolver(GetNamingOptions(), new PatternsLogger());
+            var videoListResolver = new VideoListResolver(GetNamingOptions(), new NullLogger());
 
             var videos = videoListResolver.Resolve(fileSystemChildren);
 
@@ -2505,7 +2504,7 @@ namespace Emby.Server.Implementations.Library
                 .SelectMany(i => _fileSystem.GetFiles(i.FullName, false))
                 .ToList();
 
-            var videoListResolver = new VideoListResolver(GetNamingOptions(), new PatternsLogger());
+            var videoListResolver = new VideoListResolver(GetNamingOptions(), new NullLogger());
 
             var videos = videoListResolver.Resolve(fileSystemChildren);
 
@@ -2628,7 +2627,7 @@ namespace Emby.Server.Implementations.Library
 
         private void SetExtraTypeFromFilename(Video item)
         {
-            var resolver = new ExtraResolver(GetNamingOptions(), new PatternsLogger(), new RegexProvider());
+            var resolver = new ExtraResolver(GetNamingOptions(), new NullLogger(), new RegexProvider());
 
             var result = resolver.GetExtraInfo(item.Path);
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index f8e105195..871b2d46d 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -8,7 +8,6 @@ using MediaBrowser.Naming.Audio;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Emby.Server.Implementations.Logging;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Configuration;
@@ -164,7 +163,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         {
             var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions(libraryOptions);
 
-            var parser = new AlbumParser(namingOptions, new PatternsLogger());
+            var parser = new AlbumParser(namingOptions, new NullLogger());
             var result = parser.ParseMultiPart(path);
 
             return result.IsMultiPart;
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index b7819eb68..d9c3ac5ab 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Naming.Video;
 using System;
 using System.IO;
-using Emby.Server.Implementations.Logging;
+using MediaBrowser.Model.Logging;
 
 namespace Emby.Server.Implementations.Library.Resolvers
 {
@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
             var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
             
             // If the path is a file check for a matching extensions
-            var parser = new MediaBrowser.Naming.Video.VideoResolver(namingOptions, new PatternsLogger());
+            var parser = new MediaBrowser.Naming.Video.VideoResolver(namingOptions, new NullLogger());
 
             if (args.IsDirectory)
             {
@@ -258,7 +258,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
         {
             var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
 
-            var resolver = new Format3DParser(namingOptions, new PatternsLogger());
+            var resolver = new Format3DParser(namingOptions, new NullLogger());
             var result = resolver.Parse(video.Path);
 
             Set3DFormat(video, result.Is3D, result.Format3D);
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index d8c8b2024..002505b56 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -11,10 +11,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Emby.Server.Implementations.Logging;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
 
 namespace Emby.Server.Implementations.Library.Resolvers.Movies
 {
@@ -133,7 +133,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
             var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
 
-            var resolver = new VideoListResolver(namingOptions, new PatternsLogger());
+            var resolver = new VideoListResolver(namingOptions, new NullLogger());
             var resolverResult = resolver.Resolve(files, suppportMultiEditions).ToList();
 
             var result = new MultiItemResolverResult
@@ -486,7 +486,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
-            var resolver = new StackResolver(namingOptions, new PatternsLogger());
+            var resolver = new StackResolver(namingOptions, new NullLogger());
 
             var result = resolver.ResolveDirectories(folderPaths);
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 44eb0e3e2..e5cad9f91 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -10,7 +10,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Emby.Server.Implementations.Logging;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Configuration;
@@ -171,7 +170,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                                 .ToList();
                         }
 
-                        var episodeResolver = new MediaBrowser.Naming.TV.EpisodeResolver(namingOptions, new PatternsLogger());
+                        var episodeResolver = new MediaBrowser.Naming.TV.EpisodeResolver(namingOptions, new NullLogger());
                         var episodeInfo = episodeResolver.Resolve(fullName, false, false);
                         if (episodeInfo != null && episodeInfo.EpisodeNumber.HasValue)
                         {
diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
index 57723e3c5..33db69ee2 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
@@ -116,7 +116,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             }
 
             var path = await GetXml(info.Path, cancellationToken).ConfigureAwait(false);
-            var reader = new XmlTvReader(path, GetLanguage(), null);
+            var reader = new XmlTvReader(path, GetLanguage());
 
             var results = reader.GetProgrammes(channelNumber, startDateUtc, endDateUtc, cancellationToken);
             return results.Select(p => GetProgramInfo(p, info));
@@ -175,7 +175,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         {
             // Add the channel image url
             var path = await GetXml(info.Path, cancellationToken).ConfigureAwait(false);
-            var reader = new XmlTvReader(path, GetLanguage(), null);
+            var reader = new XmlTvReader(path, GetLanguage());
             var results = reader.GetChannels().ToList();
 
             if (channels != null)
@@ -208,7 +208,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         {
             // In theory this should never be called because there is always only one lineup
             var path = await GetXml(info.Path, CancellationToken.None).ConfigureAwait(false);
-            var reader = new XmlTvReader(path, GetLanguage(), null);
+            var reader = new XmlTvReader(path, GetLanguage());
             var results = reader.GetChannels();
 
             // Should this method be async?
@@ -219,7 +219,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         {
             // In theory this should never be called because there is always only one lineup
             var path = await GetXml(info.Path, cancellationToken).ConfigureAwait(false);
-            var reader = new XmlTvReader(path, GetLanguage(), null);
+            var reader = new XmlTvReader(path, GetLanguage());
             var results = reader.GetChannels();
 
             // Should this method be async?
diff --git a/Emby.Server.Implementations/Logging/PatternsLogger.cs b/Emby.Server.Implementations/Logging/PatternsLogger.cs
deleted file mode 100644
index 6dbf33d61..000000000
--- a/Emby.Server.Implementations/Logging/PatternsLogger.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Patterns.Logging;
-using System;
-
-namespace Emby.Server.Implementations.Logging
-{
-    public class PatternsLogger : ILogger
-    {
-        private readonly MediaBrowser.Model.Logging.ILogger _logger;
-
-        public PatternsLogger()
-            : this(new MediaBrowser.Model.Logging.NullLogger())
-        {
-        }
-
-        public PatternsLogger(MediaBrowser.Model.Logging.ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public void Debug(string message, params object[] paramList)
-        {
-            _logger.Debug(message, paramList);
-        }
-
-        public void Error(string message, params object[] paramList)
-        {
-            _logger.Error(message, paramList);
-        }
-
-        public void ErrorException(string message, Exception exception, params object[] paramList)
-        {
-            _logger.ErrorException(message, exception, paramList);
-        }
-
-        public void Fatal(string message, params object[] paramList)
-        {
-            _logger.Fatal(message, paramList);
-        }
-
-        public void FatalException(string message, Exception exception, params object[] paramList)
-        {
-            _logger.FatalException(message, exception, paramList);
-        }
-
-        public void Info(string message, params object[] paramList)
-        {
-            _logger.Info(message, paramList);
-        }
-
-        public void Warn(string message, params object[] paramList)
-        {
-            _logger.Warn(message, paramList);
-        }
-
-        public void Log(LogSeverity severity, string message, params object[] paramList)
-        {
-        }
-
-        public void LogMultiline(string message, LogSeverity severity, System.Text.StringBuilder additionalContent)
-        {
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config
index 75c14aa58..71fdbffc2 100644
--- a/Emby.Server.Implementations/packages.config
+++ b/Emby.Server.Implementations/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="portable45-net45+win8" />
-  <package id="Patterns.Logging" version="1.0.0.6" targetFramework="portable45-net45+win8" />
+  <package id="Emby.XmlTv" version="1.0.1" targetFramework="portable45-net45+win8" />
+  <package id="MediaBrowser.Naming" version="1.0.2" targetFramework="portable45-net45+win8" />
   <package id="UniversalDetector" version="1.0.1" targetFramework="portable45-net45+win8" />
-  <package id="Emby.XmlTv" version="1.0.63" targetFramework="portable45-net45+win8" />
 </packages>
\ No newline at end of file
diff --git a/Emby.Server.Implementations/project.json b/Emby.Server.Implementations/project.json
deleted file mode 100644
index 13bdedb41..000000000
--- a/Emby.Server.Implementations/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "frameworks":{
-        "netstandard1.6":{
-           "dependencies":{
-                "NETStandard.Library":"1.6.0",
-            }
-        },
-        ".NETPortable,Version=v4.5,Profile=Profile7":{
-            "buildOptions": {
-                "define": [  ]
-            },
-            "frameworkAssemblies":{
-                
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index b62d99a13..b4c89826f 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -72,10 +72,6 @@
       <HintPath>..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Patterns.Logging, Version=1.0.6151.30227, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="MediaBrowser.IsoMounting.Linux">
       <HintPath>..\ThirdParty\MediaBrowser.IsoMounting.Linux\MediaBrowser.IsoMounting.Linux.dll</HintPath>
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 7c77f67ed..9a8ac7763 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -10,18 +10,21 @@ using System.Linq;
 using System.Net;
 using System.Net.Security;
 using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Emby.Common.Implementations.EnvironmentInfo;
 using Emby.Common.Implementations.IO;
 using Emby.Common.Implementations.Logging;
+using Emby.Common.Implementations.Networking;
+using Emby.Common.Implementations.Security;
 using Emby.Server.Core;
 using Emby.Server.Implementations.IO;
 using MediaBrowser.Model.System;
+using MediaBrowser.Server.Startup.Common.IO;
 using Mono.Unix.Native;
 using NLog;
 using ILogger = MediaBrowser.Model.Logging.ILogger;
+using X509Certificate = System.Security.Cryptography.X509Certificates.X509Certificate;
 
 namespace MediaBrowser.Server.Mono
 {
@@ -90,7 +93,22 @@ namespace MediaBrowser.Server.Mono
 
             var nativeApp = new MonoApp(options, logManager.GetLogger("App"), environmentInfo);
 
-            _appHost = new ApplicationHost(appPaths, logManager, options, fileSystem, nativeApp, new PowerManagement(), "emby.mono.zip", environmentInfo);
+            var imageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, logManager, fileSystem, options, () => _appHost.HttpClient, appPaths);
+
+            _appHost = new ApplicationHost(appPaths,
+                logManager,
+                options,
+                fileSystem,
+                nativeApp,
+                new PowerManagement(),
+                "emby.mono.zip",
+                environmentInfo,
+                imageEncoder,
+                new Startup.Common.SystemEvents(logManager.GetLogger("SystemEvents")),
+                new MemoryStreamProvider(),
+                new NetworkManager(logManager.GetLogger("NetworkManager")),
+                GenerateCertificate,
+                () => Environment.UserDomainName);
 
             if (options.ContainsOption("-v"))
             {
@@ -115,6 +133,11 @@ namespace MediaBrowser.Server.Mono
             Task.WaitAll(task);
         }
 
+        private static void GenerateCertificate(string certPath, string certHost)
+        {
+            CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, _logger);
+        }
+
         private static MonoEnvironmentInfo GetEnvironmentInfo()
         {
             var info = new MonoEnvironmentInfo();
diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config
index 8d1ebc141..259ad4182 100644
--- a/MediaBrowser.Server.Mono/packages.config
+++ b/MediaBrowser.Server.Mono/packages.config
@@ -2,5 +2,4 @@
 <packages>
   <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
   <package id="NLog" version="4.4.0-betaV15" targetFramework="net46" />
-  <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs b/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs
index f5a337505..9e14b7713 100644
--- a/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs
@@ -9,7 +9,7 @@ namespace Emby.Common.Implementations.Security
     {
         private const string MonoTestRootAgency = "<RSAKeyValue><Modulus>v/4nALBxCE+9JgEC0LnDUvKh6e96PwTpN4Rj+vWnqKT7IAp1iK/JjuqvAg6DQ2vTfv0dTlqffmHH51OyioprcT5nzxcSTsZb/9jcHScG0s3/FRIWnXeLk/fgm7mSYhjUaHNI0m1/NTTktipicjKxo71hGIg9qucCWnDum+Krh/k=</Modulus><Exponent>AQAB</Exponent><P>9jbKxMXEruW2CfZrzhxtull4O8P47+mNsEL+9gf9QsRO1jJ77C+jmzfU6zbzjf8+ViK+q62tCMdC1ZzulwdpXQ==</P><Q>x5+p198l1PkK0Ga2mRh0SIYSykENpY2aLXoyZD/iUpKYAvATm0/wvKNrE4dKJyPCA+y3hfTdgVag+SP9avvDTQ==</Q><DP>ISSjCvXsUfbOGG05eddN1gXxL2pj+jegQRfjpk7RAsnWKvNExzhqd5x+ZuNQyc6QH5wxun54inP4RTUI0P/IaQ==</DP><DQ>R815VQmR3RIbPqzDXzv5j6CSH6fYlcTiQRtkBsUnzhWmkd/y3XmamO+a8zJFjOCCx9CcjpVuGziivBqi65lVPQ==</DQ><InverseQ>iYiu0KwMWI/dyqN3RJYUzuuLj02/oTD1pYpwo2rvNCXU1Q5VscOeu2DpNg1gWqI+1RrRCsEoaTNzXB1xtKNlSw==</InverseQ><D>nIfh1LYF8fjRBgMdAH/zt9UKHWiaCnc+jXzq5tkR8HVSKTVdzitD8bl1JgAfFQD8VjSXiCJqluexy/B5SGrCXQ49c78NIQj0hD+J13Y8/E0fUbW1QYbhj6Ff7oHyhaYe1WOQfkp2t/h+llHOdt1HRf7bt7dUknYp7m8bQKGxoYE=</D></RSAKeyValue>";
 
-        internal static void CreateSelfSignCertificatePfx(
+        public static void CreateSelfSignCertificatePfx(
             string fileName,
             string hostname,
             ILogger logger)
diff --git a/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs b/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs
index e66c000d9..0a1470f93 100644
--- a/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs
+++ b/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs
@@ -1,9 +1,10 @@
-using Emby.Drawing;
+using System;
+using Emby.Drawing;
 using Emby.Drawing.Net;
 using Emby.Drawing.ImageMagick;
 using Emby.Server.Core;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
@@ -16,14 +17,14 @@ namespace MediaBrowser.Server.Startup.Common
             ILogManager logManager, 
             IFileSystem fileSystem, 
             StartupOptions startupOptions, 
-            IHttpClient httpClient,
-            IServerConfigurationManager config)
+            Func<IHttpClient> httpClient,
+            IApplicationPaths appPaths)
         {
             if (!startupOptions.ContainsOption("-enablegdi"))
             {
                 try
                 {
-                    return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), config.ApplicationPaths, httpClient, fileSystem, config);
+                    return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
                 }
                 catch
                 {
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index 262b0e2e8..95da7feab 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -44,8 +44,8 @@
       <HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MediaBrowser.Naming, Version=1.0.6151.30291, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.59\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
+    <Reference Include="MediaBrowser.Naming, Version=1.0.6159.25070, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MediaBrowser.Naming.1.0.2\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -60,14 +60,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
     </Reference>
-    <Reference Include="Patterns.Logging, Version=1.0.6159.22455, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Patterns.Logging.1.0.0.7\lib\netstandard1.3\Patterns.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ServiceStack, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
-    </Reference>
     <Reference Include="ServiceStack.Text, Version=4.5.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath>
       <Private>True</Private>
@@ -76,10 +68,6 @@
       <HintPath>..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SocketHttpListener, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SocketHttpListener.Portable.1.0.50\lib\portable-net45+win8\SocketHttpListener.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -212,6 +200,10 @@
       <Project>{21002819-c39a-4d3e-be83-2a276a77fb1f}</Project>
       <Name>RSSDP</Name>
     </ProjectReference>
+    <ProjectReference Include="..\ServiceStack\ServiceStack.csproj">
+      <Project>{680a1709-25eb-4d52-a87f-ee03ffd94baa}</Project>
+      <Name>ServiceStack</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/MediaBrowser.Server.Startup.Common/packages.config b/MediaBrowser.Server.Startup.Common/packages.config
index b364fe32b..db6116c82 100644
--- a/MediaBrowser.Server.Startup.Common/packages.config
+++ b/MediaBrowser.Server.Startup.Common/packages.config
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ini-parser" version="2.3.0" targetFramework="net46" />
-  <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />
+  <package id="MediaBrowser.Naming" version="1.0.2" targetFramework="net46" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
   <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
-  <package id="Patterns.Logging" version="1.0.0.7" targetFramework="net46" />
   <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
   <package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
-  <package id="SocketHttpListener.Portable" version="1.0.50" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index adfc0a588..09c948a4a 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -20,11 +20,14 @@ using System.Windows.Forms;
 using Emby.Common.Implementations.EnvironmentInfo;
 using Emby.Common.Implementations.IO;
 using Emby.Common.Implementations.Logging;
+using Emby.Common.Implementations.Networking;
+using Emby.Common.Implementations.Security;
 using Emby.Server.Core;
 using Emby.Server.Core.Browser;
 using Emby.Server.Implementations.IO;
 using ImageMagickSharp;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Server.Startup.Common.IO;
 
 namespace MediaBrowser.ServerApplication
 {
@@ -64,8 +67,8 @@ namespace MediaBrowser.ServerApplication
             return false;
         }
         /// <summary>
-         /// Defines the entry point of the application.
-         /// </summary>
+        /// Defines the entry point of the application.
+        /// </summary>
         public static void Main()
         {
             var options = new StartupOptions();
@@ -319,14 +322,22 @@ namespace MediaBrowser.ServerApplication
                 IsRunningAsService = runService
             };
 
+            var imageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, logManager, fileSystem, options, () => _appHost.HttpClient, appPaths);
+
             _appHost = new ApplicationHost(appPaths,
                 logManager,
                 options,
                 fileSystem,
-                nativeApp, 
+                nativeApp,
                 new PowerManagement(),
                 "emby.windows.zip",
-                new EnvironmentInfo());
+                new EnvironmentInfo(),
+                imageEncoder,
+                new Server.Startup.Common.SystemEvents(logManager.GetLogger("SystemEvents")),
+                new RecyclableMemoryStreamProvider(),
+                new NetworkManager(logManager.GetLogger("NetworkManager")),
+                GenerateCertificate,
+                () => Environment.UserDomainName);
 
             var initProgress = new Progress<double>();
 
@@ -367,6 +378,11 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
+        private static void GenerateCertificate(string certPath, string certHost)
+        {
+            CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, _logger);
+        }
+
         private static ServerNotifyIcon _serverNotifyIcon;
         private static TaskScheduler _mainTaskScheduler;
         private static void ShowTrayIcon()
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index b082b14d8..4a4a3ca43 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -78,10 +78,6 @@
       <HintPath>..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Patterns.Logging, Version=1.0.6151.30227, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config
index 8dbcaa2b9..169cf7c4b 100644
--- a/MediaBrowser.ServerApplication/packages.config
+++ b/MediaBrowser.ServerApplication/packages.config
@@ -2,6 +2,5 @@
 <packages>
   <package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" />
   <package id="NLog" version="4.4.0-betaV15" targetFramework="net462" />
-  <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net462" />
   <package id="System.Data.SQLite.Core" version="1.0.103" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 0a650254e..6b8deb9c9 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
-  <package id="WebMarkupMin.Core" version="2.1.0" targetFramework="net45" requireReinstallation="true" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index aff9c5c11..292d0345c 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -78,6 +78,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Drawing.ImageMagick",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Drawing.Net", "Emby.Drawing.Net\Emby.Drawing.Net.csproj", "{C97A239E-A96C-4D64-A844-CCF8CC30AECB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack", "ServiceStack\ServiceStack.csproj", "{680A1709-25EB-4D52-A87F-EE03FFD94BAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketHttpListener.Portable", "SocketHttpListener.Portable\SocketHttpListener.Portable.csproj", "{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -95,6 +99,11 @@ Global
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		Signed|Any CPU = Signed|Any CPU
+		Signed|Mixed Platforms = Signed|Mixed Platforms
+		Signed|Win32 = Signed|Win32
+		Signed|x64 = Signed|x64
+		Signed|x86 = Signed|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -120,6 +129,16 @@ Global
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x64.ActiveCfg = Release|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.ActiveCfg = Release|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.Build.0 = Release|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -143,6 +162,16 @@ Global
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x64.ActiveCfg = Release|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x86.ActiveCfg = Release|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x86.Build.0 = Release|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -166,6 +195,16 @@ Global
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x86.ActiveCfg = Release|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x86.Build.0 = Release|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -192,6 +231,16 @@ Global
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x64.ActiveCfg = Release|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x86.ActiveCfg = Release|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x86.Build.0 = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|Win32.Build.0 = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|x64.ActiveCfg = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|x64.Build.0 = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|x86.ActiveCfg = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Signed|x86.Build.0 = Release|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -215,6 +264,16 @@ Global
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x64.ActiveCfg = Release|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x86.ActiveCfg = Release|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x86.Build.0 = Release|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -236,6 +295,16 @@ Global
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|Win32.ActiveCfg = Release|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -257,6 +326,16 @@ Global
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|Win32.ActiveCfg = Release|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|x64.ActiveCfg = Release|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|x86.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|Win32.Build.0 = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|x64.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|x64.Build.0 = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|x86.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Signed|x86.Build.0 = Release|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -278,6 +357,16 @@ Global
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|Win32.ActiveCfg = Release|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|x64.ActiveCfg = Release|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -300,6 +389,16 @@ Global
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|Win32.ActiveCfg = Release|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|x64.ActiveCfg = Release|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|x86.ActiveCfg = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|Mixed Platforms.ActiveCfg = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|Mixed Platforms.Build.0 = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|Win32.ActiveCfg = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|Win32.Build.0 = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|x64.ActiveCfg = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|x64.Build.0 = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|x86.ActiveCfg = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Signed|x86.Build.0 = Debug|x86
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -321,6 +420,16 @@ Global
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|Win32.ActiveCfg = Release|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|x64.ActiveCfg = Release|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -342,6 +451,16 @@ Global
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|Win32.ActiveCfg = Release|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|Win32.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|Win32.Build.0 = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|x64.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|x64.Build.0 = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|x86.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Signed|x86.Build.0 = Release Mono|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -363,6 +482,16 @@ Global
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|x64.ActiveCfg = Release|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|x86.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|Win32.Build.0 = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|x64.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|x64.Build.0 = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|x86.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Signed|x86.Build.0 = Release|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -384,6 +513,16 @@ Global
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|Win32.ActiveCfg = Release|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|x64.ActiveCfg = Release|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|x86.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|Win32.Build.0 = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|x64.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|x64.Build.0 = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|x86.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|x86.Build.0 = Release|Any CPU
 		{175A9388-F352-4586-A6B4-070DED62B644}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{175A9388-F352-4586-A6B4-070DED62B644}.Debug|Any CPU.Build.0 = Debug|x86
 		{175A9388-F352-4586-A6B4-070DED62B644}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
@@ -410,6 +549,16 @@ Global
 		{175A9388-F352-4586-A6B4-070DED62B644}.Release|x64.ActiveCfg = Release|Any CPU
 		{175A9388-F352-4586-A6B4-070DED62B644}.Release|x86.ActiveCfg = Release|x86
 		{175A9388-F352-4586-A6B4-070DED62B644}.Release|x86.Build.0 = Release|x86
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|Mixed Platforms.ActiveCfg = Release|x86
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|Mixed Platforms.Build.0 = Release|x86
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|Win32.ActiveCfg = Release|x86
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|Win32.Build.0 = Release|x86
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|x64.ActiveCfg = Release|Any CPU
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|x64.Build.0 = Release|Any CPU
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|x86.ActiveCfg = Release|x86
+		{175A9388-F352-4586-A6B4-070DED62B644}.Signed|x86.Build.0 = Release|x86
 		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -431,6 +580,16 @@ Global
 		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Release|Win32.ActiveCfg = Release|Any CPU
 		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Release|x64.ActiveCfg = Release|Any CPU
 		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Release|x86.ActiveCfg = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|Win32.Build.0 = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|x64.ActiveCfg = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|x64.Build.0 = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|x86.ActiveCfg = Release|Any CPU
+		{B90AB8F2-1BFF-4568-A3FD-2A338A435A75}.Signed|x86.Build.0 = Release|Any CPU
 		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -452,6 +611,16 @@ Global
 		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Release|Win32.ActiveCfg = Release|Any CPU
 		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Release|x64.ActiveCfg = Release|Any CPU
 		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Release|x86.ActiveCfg = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|Win32.Build.0 = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|x64.ActiveCfg = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|x64.Build.0 = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|x86.ActiveCfg = Release|Any CPU
+		{08FFF49B-F175-4807-A2B5-73B0EBD9F716}.Signed|x86.Build.0 = Release|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -482,6 +651,16 @@ Global
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Release|x64.Build.0 = Release|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Release|x86.ActiveCfg = Release|Any CPU
 		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Release|x86.Build.0 = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|Win32.Build.0 = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|x64.ActiveCfg = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|x64.Build.0 = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|x86.ActiveCfg = Release|Any CPU
+		{89AB4548-770D-41FD-A891-8DAFF44F452C}.Signed|x86.Build.0 = Release|Any CPU
 		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -512,6 +691,16 @@ Global
 		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Release|x64.Build.0 = Release|Any CPU
 		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Release|x86.ActiveCfg = Release|Any CPU
 		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Release|x86.Build.0 = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|Win32.Build.0 = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|x64.ActiveCfg = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|x64.Build.0 = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|x86.ActiveCfg = Release|Any CPU
+		{713F42B5-878E-499D-A878-E4C652B1D5E8}.Signed|x86.Build.0 = Release|Any CPU
 		{5A27010A-09C6-4E86-93EA-437484C10917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A27010A-09C6-4E86-93EA-437484C10917}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A27010A-09C6-4E86-93EA-437484C10917}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -542,6 +731,16 @@ Global
 		{5A27010A-09C6-4E86-93EA-437484C10917}.Release|x64.Build.0 = Release|Any CPU
 		{5A27010A-09C6-4E86-93EA-437484C10917}.Release|x86.ActiveCfg = Release|Any CPU
 		{5A27010A-09C6-4E86-93EA-437484C10917}.Release|x86.Build.0 = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|Win32.Build.0 = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|x64.ActiveCfg = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|x64.Build.0 = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|x86.ActiveCfg = Release|Any CPU
+		{5A27010A-09C6-4E86-93EA-437484C10917}.Signed|x86.Build.0 = Release|Any CPU
 		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -572,6 +771,16 @@ Global
 		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Release|x64.Build.0 = Release|Any CPU
 		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Release|x86.ActiveCfg = Release|Any CPU
 		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Release|x86.Build.0 = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|Win32.Build.0 = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|x64.ActiveCfg = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|x64.Build.0 = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|x86.ActiveCfg = Release|Any CPU
+		{88AE38DF-19D7-406F-A6A9-09527719A21E}.Signed|x86.Build.0 = Release|Any CPU
 		{E383961B-9356-4D5D-8233-9A1079D03055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E383961B-9356-4D5D-8233-9A1079D03055}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E383961B-9356-4D5D-8233-9A1079D03055}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -602,6 +811,16 @@ Global
 		{E383961B-9356-4D5D-8233-9A1079D03055}.Release|x64.Build.0 = Release|Any CPU
 		{E383961B-9356-4D5D-8233-9A1079D03055}.Release|x86.ActiveCfg = Release|Any CPU
 		{E383961B-9356-4D5D-8233-9A1079D03055}.Release|x86.Build.0 = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|Win32.Build.0 = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|x64.ActiveCfg = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|x64.Build.0 = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|x86.ActiveCfg = Release|Any CPU
+		{E383961B-9356-4D5D-8233-9A1079D03055}.Signed|x86.Build.0 = Release|Any CPU
 		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -632,6 +851,16 @@ Global
 		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Release|x64.Build.0 = Release|Any CPU
 		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Release|x86.ActiveCfg = Release|Any CPU
 		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Release|x86.Build.0 = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|Win32.Build.0 = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|x64.ActiveCfg = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|x64.Build.0 = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|x86.ActiveCfg = Release|Any CPU
+		{4ACAB6A2-AC9A-4B50-BAEC-1FE4A1F3B8BC}.Signed|x86.Build.0 = Release|Any CPU
 		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -662,6 +891,16 @@ Global
 		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Release|x64.Build.0 = Release|Any CPU
 		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Release|x86.ActiveCfg = Release|Any CPU
 		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Release|x86.Build.0 = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|Win32.Build.0 = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|x64.ActiveCfg = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|x64.Build.0 = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|x86.ActiveCfg = Release|Any CPU
+		{21002819-C39A-4D3E-BE83-2A276A77FB1F}.Signed|x86.Build.0 = Release|Any CPU
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -692,6 +931,16 @@ Global
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|x64.Build.0 = Release|Any CPU
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|x86.ActiveCfg = Release|Any CPU
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|x86.Build.0 = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|Win32.Build.0 = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|x64.ActiveCfg = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|x64.Build.0 = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|x86.ActiveCfg = Release|Any CPU
+		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Signed|x86.Build.0 = Release|Any CPU
 		{65AA7D67-8059-40CD-91F1-16D02687226C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{65AA7D67-8059-40CD-91F1-16D02687226C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{65AA7D67-8059-40CD-91F1-16D02687226C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -722,6 +971,16 @@ Global
 		{65AA7D67-8059-40CD-91F1-16D02687226C}.Release|x64.Build.0 = Release|Any CPU
 		{65AA7D67-8059-40CD-91F1-16D02687226C}.Release|x86.ActiveCfg = Release|Any CPU
 		{65AA7D67-8059-40CD-91F1-16D02687226C}.Release|x86.Build.0 = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|Win32.Build.0 = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|x64.ActiveCfg = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|x64.Build.0 = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|x86.ActiveCfg = Release|Any CPU
+		{65AA7D67-8059-40CD-91F1-16D02687226C}.Signed|x86.Build.0 = Release|Any CPU
 		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -752,6 +1011,16 @@ Global
 		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Release|x64.Build.0 = Release|Any CPU
 		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Release|x86.ActiveCfg = Release|Any CPU
 		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Release|x86.Build.0 = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|Win32.Build.0 = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|x64.ActiveCfg = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|x64.Build.0 = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|x86.ActiveCfg = Release|Any CPU
+		{6CFEE013-6E7C-432B-AC37-CABF0880C69A}.Signed|x86.Build.0 = Release|Any CPU
 		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -782,6 +1051,96 @@ Global
 		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Release|x64.Build.0 = Release|Any CPU
 		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Release|x86.ActiveCfg = Release|Any CPU
 		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Release|x86.Build.0 = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|Win32.Build.0 = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|x64.ActiveCfg = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|x64.Build.0 = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|x86.ActiveCfg = Release|Any CPU
+		{C97A239E-A96C-4D64-A844-CCF8CC30AECB}.Signed|x86.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Win32.Build.0 = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Any CPU.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Mixed Platforms.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Win32.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Win32.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|x64.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|x64.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|x86.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|x86.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Win32.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Win32.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|x64.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|x86.Build.0 = Release|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Any CPU.ActiveCfg = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Any CPU.Build.0 = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Mixed Platforms.ActiveCfg = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Mixed Platforms.Build.0 = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Win32.ActiveCfg = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Win32.Build.0 = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|x64.ActiveCfg = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|x64.Build.0 = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|x86.ActiveCfg = Signed|Any CPU
+		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|x86.Build.0 = Signed|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|Win32.Build.0 = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|x64.Build.0 = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Debug|x86.Build.0 = Debug|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|Any CPU.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|Mixed Platforms.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|Win32.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|Win32.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|x64.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|x64.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|x86.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release Mono|x86.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|Win32.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|Win32.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|x64.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|x64.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|x86.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Release|x86.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|Any CPU.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|Any CPU.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|Win32.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|Win32.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|x64.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|x64.Build.0 = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|x86.ActiveCfg = Release|Any CPU
+		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ServiceStack/FilterAttributeCache.cs b/ServiceStack/FilterAttributeCache.cs
new file mode 100644
index 000000000..378433add
--- /dev/null
+++ b/ServiceStack/FilterAttributeCache.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using ServiceStack;
+
+namespace ServiceStack.Support.WebHost
+{
+    public static class FilterAttributeCache
+    {
+        public static MediaBrowser.Model.Services.IHasRequestFilter[] GetRequestFilterAttributes(Type requestDtoType)
+        {
+            var attributes = requestDtoType.AllAttributes().OfType<MediaBrowser.Model.Services.IHasRequestFilter>().ToList();
+
+            var serviceType = ServiceStackHost.Instance.Metadata.GetServiceTypeByRequest(requestDtoType);
+            if (serviceType != null)
+            {
+                attributes.AddRange(serviceType.AllAttributes().OfType<MediaBrowser.Model.Services.IHasRequestFilter>());
+            }
+
+			attributes.Sort((x,y) => x.Priority - y.Priority);
+
+            return attributes.ToArray();
+        }
+    }
+}
diff --git a/ServiceStack/Host/ActionContext.cs b/ServiceStack/Host/ActionContext.cs
new file mode 100644
index 000000000..9f165cff1
--- /dev/null
+++ b/ServiceStack/Host/ActionContext.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace ServiceStack.Host
+{
+    /// <summary>
+    /// Context to capture IService action
+    /// </summary>
+    public class ActionContext
+    {
+        public const string AnyAction = "ANY";
+
+        public string Id { get; set; }
+
+        public ActionInvokerFn ServiceAction { get; set; }
+        public MediaBrowser.Model.Services.IHasRequestFilter[] RequestFilters { get; set; }
+
+        public static string Key(Type serviceType, string method, string requestDtoName)
+        {
+            return serviceType.FullName + " " + method.ToUpper() + " " + requestDtoName;
+        }
+
+        public static string AnyKey(Type serviceType, string requestDtoName)
+        {
+            return Key(serviceType, AnyAction, requestDtoName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/Host/ContentTypes.cs b/ServiceStack/Host/ContentTypes.cs
new file mode 100644
index 000000000..22fdc3e50
--- /dev/null
+++ b/ServiceStack/Host/ContentTypes.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using MediaBrowser.Model.Services;
+
+namespace ServiceStack.Host
+{
+    public class ContentTypes
+    {
+        public static ContentTypes Instance = new ContentTypes();
+
+        public void SerializeToStream(IRequest req, object response, Stream responseStream)
+        {
+            var contentType = req.ResponseContentType;
+            var serializer = GetResponseSerializer(contentType);
+            if (serializer == null)
+                throw new NotSupportedException("ContentType not supported: " + contentType);
+
+            var httpRes = new HttpResponseStreamWrapper(responseStream, req)
+            {
+                Dto = req.Response.Dto
+            };
+            serializer(req, response, httpRes);
+        }
+
+        public Action<IRequest, object, IResponse> GetResponseSerializer(string contentType)
+        {
+            var serializer = GetStreamSerializer(contentType);
+            if (serializer == null) return null;
+
+            return (httpReq, dto, httpRes) => serializer(httpReq, dto, httpRes.OutputStream);
+        }
+
+        public Action<IRequest, object, Stream> GetStreamSerializer(string contentType)
+        {
+            switch (GetRealContentType(contentType))
+            {
+                case "application/xml":
+                case "text/xml":
+                case "text/xml; charset=utf-8": //"text/xml; charset=utf-8" also matches xml
+                    return (r, o, s) => ServiceStackHost.Instance.SerializeToXml(o, s);
+
+                case "application/json":
+                case "text/json":
+                    return (r, o, s) => ServiceStackHost.Instance.SerializeToJson(o, s);
+            }
+
+            return null;
+        }
+
+        public Func<Type, Stream, object> GetStreamDeserializer(string contentType)
+        {
+            switch (GetRealContentType(contentType))
+            {
+                case "application/xml":
+                case "text/xml":
+                case "text/xml; charset=utf-8": //"text/xml; charset=utf-8" also matches xml
+                    return ServiceStackHost.Instance.DeserializeXml;
+
+                case "application/json":
+                case "text/json":
+                    return ServiceStackHost.Instance.DeserializeJson;
+            }
+
+            return null;
+        }
+
+        private static string GetRealContentType(string contentType)
+        {
+            return contentType == null
+                       ? null
+                       : contentType.Split(';')[0].ToLower().Trim();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/Host/HttpResponseStreamWrapper.cs b/ServiceStack/Host/HttpResponseStreamWrapper.cs
new file mode 100644
index 000000000..33038da72
--- /dev/null
+++ b/ServiceStack/Host/HttpResponseStreamWrapper.cs
@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using MediaBrowser.Model.Services;
+
+namespace ServiceStack.Host
+{
+    public class HttpResponseStreamWrapper : IHttpResponse
+    {
+        private static readonly UTF8Encoding UTF8EncodingWithoutBom = new UTF8Encoding(false);
+
+        public HttpResponseStreamWrapper(Stream stream, IRequest request)
+        {
+            this.OutputStream = stream;
+            this.Request = request;
+            this.Headers = new Dictionary<string, string>();
+            this.Items = new Dictionary<string, object>();
+        }
+
+        public Dictionary<string, string> Headers { get; set; }
+
+        public object OriginalResponse
+        {
+            get { return null; }
+        }
+
+        public IRequest Request { get; private set; }
+
+        public int StatusCode { set; get; }
+        public string StatusDescription { set; get; }
+        public string ContentType { get; set; }
+
+        public void AddHeader(string name, string value)
+        {
+            this.Headers[name] = value;
+        }
+
+        public string GetHeader(string name)
+        {
+            return this.Headers[name];
+        }
+
+        public void Redirect(string url)
+        {
+            this.Headers["Location"] = url;
+        }
+
+        public Stream OutputStream { get; private set; }
+
+        public object Dto { get; set; }
+
+        public void Write(string text)
+        {
+            var bytes = UTF8EncodingWithoutBom.GetBytes(text);
+            OutputStream.Write(bytes, 0, bytes.Length);
+        }
+
+        public bool UseBufferedStream { get; set; }
+
+        public void Close()
+        {
+            if (IsClosed) return;
+
+            OutputStream.Dispose();
+            IsClosed = true;
+        }
+
+        public void End()
+        {
+            Close();
+        }
+
+        public void Flush()
+        {
+            OutputStream.Flush();
+        }
+
+        public bool IsClosed { get; private set; }
+
+        public void SetContentLength(long contentLength) {}
+
+        public bool KeepAlive { get; set; }
+
+        public Dictionary<string, object> Items { get; private set; }
+
+        public void SetCookie(Cookie cookie)
+        {
+        }
+
+        public void ClearCookies()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/Host/RestHandler.cs b/ServiceStack/Host/RestHandler.cs
new file mode 100644
index 000000000..5c360d150
--- /dev/null
+++ b/ServiceStack/Host/RestHandler.cs
@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace ServiceStack.Host
+{
+    public class RestHandler
+    {
+        public string RequestName { get; set; }
+
+        public async Task<object> HandleResponseAsync(object response)
+        {
+            var taskResponse = response as Task;
+
+            if (taskResponse == null)
+            {
+                return response;
+            }
+
+            await taskResponse.ConfigureAwait(false);
+
+            var taskResult = ServiceStackHost.Instance.GetTaskResult(taskResponse, RequestName);
+
+            var taskResults = taskResult as Task[];
+
+            if (taskResults == null)
+            {
+                var subTask = taskResult as Task;
+                if (subTask != null)
+                    taskResult = ServiceStackHost.Instance.GetTaskResult(subTask, RequestName);
+
+                return taskResult;
+            }
+
+            if (taskResults.Length == 0)
+            {
+                return new object[] { };
+            }
+
+            var firstResponse = ServiceStackHost.Instance.GetTaskResult(taskResults[0], RequestName);
+            var batchedResponses = firstResponse != null
+                ? (object[])Array.CreateInstance(firstResponse.GetType(), taskResults.Length)
+                : new object[taskResults.Length];
+            batchedResponses[0] = firstResponse;
+            for (var i = 1; i < taskResults.Length; i++)
+            {
+                batchedResponses[i] = ServiceStackHost.Instance.GetTaskResult(taskResults[i], RequestName);
+            }
+            return batchedResponses;
+        }
+
+        protected static object CreateContentTypeRequest(IRequest httpReq, Type requestType, string contentType)
+        {
+            if (!string.IsNullOrEmpty(contentType) && httpReq.ContentLength > 0)
+            {
+                var deserializer = ContentTypes.Instance.GetStreamDeserializer(contentType);
+                if (deserializer != null)
+                {
+                    return deserializer(requestType, httpReq.InputStream);
+                }
+            }
+            return ServiceStackHost.Instance.CreateInstance(requestType); //Return an empty DTO, even for empty request bodies
+        }
+
+        protected static object GetCustomRequestFromBinder(IRequest httpReq, Type requestType)
+        {
+            Func<IRequest, object> requestFactoryFn;
+            ServiceStackHost.Instance.ServiceController.RequestTypeFactoryMap.TryGetValue(
+                requestType, out requestFactoryFn);
+
+            return requestFactoryFn != null ? requestFactoryFn(httpReq) : null;
+        }
+
+        public static RestPath FindMatchingRestPath(string httpMethod, string pathInfo, out string contentType)
+        {
+            pathInfo = GetSanitizedPathInfo(pathInfo, out contentType);
+
+            return ServiceStackHost.Instance.ServiceController.GetRestPathForRequest(httpMethod, pathInfo);
+        }
+
+        public static string GetSanitizedPathInfo(string pathInfo, out string contentType)
+        {
+            contentType = null;
+            var pos = pathInfo.LastIndexOf('.');
+            if (pos >= 0)
+            {
+                var format = pathInfo.Substring(pos + 1);
+                contentType = GetFormatContentType(format);
+                if (contentType != null)
+                {
+                    pathInfo = pathInfo.Substring(0, pos);
+                }
+            }
+            return pathInfo;
+        }
+
+        private static string GetFormatContentType(string format)
+        {
+            //built-in formats
+            if (format == "json")
+                return "application/json";
+            if (format == "xml")
+                return "application/xml";
+
+            return null;
+        }
+
+        public RestPath GetRestPath(string httpMethod, string pathInfo)
+        {
+            if (this.RestPath == null)
+            {
+                string contentType;
+                this.RestPath = FindMatchingRestPath(httpMethod, pathInfo, out contentType);
+
+                if (contentType != null)
+                    ResponseContentType = contentType;
+            }
+            return this.RestPath;
+        }
+
+        public RestPath RestPath { get; set; }
+
+        // Set from SSHHF.GetHandlerForPathInfo()
+        public string ResponseContentType { get; set; }
+
+        public async Task ProcessRequestAsync(IRequest httpReq, IResponse httpRes, string operationName)
+        {
+            var appHost = ServiceStackHost.Instance;
+
+            var restPath = GetRestPath(httpReq.Verb, httpReq.PathInfo);
+            if (restPath == null)
+            {
+                throw new NotSupportedException("No RestPath found for: " + httpReq.Verb + " " + httpReq.PathInfo);
+            }
+            httpReq.SetRoute(restPath);
+
+            if (ResponseContentType != null)
+                httpReq.ResponseContentType = ResponseContentType;
+
+            var request = httpReq.Dto = CreateRequest(httpReq, restPath);
+
+            if (appHost.ApplyRequestFilters(httpReq, httpRes, request))
+                return;
+
+            var rawResponse = await ServiceStackHost.Instance.ServiceController.Execute(request, httpReq).ConfigureAwait(false);
+
+            if (httpRes.IsClosed)
+                return;
+
+            var response = await HandleResponseAsync(rawResponse).ConfigureAwait(false);
+
+            if (appHost.ApplyResponseFilters(httpReq, httpRes, response))
+                return;
+
+            await httpRes.WriteToResponse(httpReq, response).ConfigureAwait(false);
+        }
+
+        public static object CreateRequest(IRequest httpReq, RestPath restPath)
+        {
+            var dtoFromBinder = GetCustomRequestFromBinder(httpReq, restPath.RequestType);
+            if (dtoFromBinder != null)
+                return dtoFromBinder;
+
+            var requestParams = httpReq.GetFlattenedRequestParams();
+            return CreateRequest(httpReq, restPath, requestParams);
+        }
+
+        public static object CreateRequest(IRequest httpReq, RestPath restPath, Dictionary<string, string> requestParams)
+        {
+            var requestDto = CreateContentTypeRequest(httpReq, restPath.RequestType, httpReq.ContentType);
+
+            return CreateRequest(httpReq, restPath, requestParams, requestDto);
+        }
+
+        public static object CreateRequest(IRequest httpReq, RestPath restPath, Dictionary<string, string> requestParams, object requestDto)
+        {
+            string contentType;
+            var pathInfo = !restPath.IsWildCardPath
+                ? GetSanitizedPathInfo(httpReq.PathInfo, out contentType)
+                : httpReq.PathInfo;
+
+            return restPath.CreateRequest(pathInfo, requestParams, requestDto);
+        }
+
+        /// <summary>
+        /// Used in Unit tests
+        /// </summary>
+        /// <returns></returns>
+        public object CreateRequest(IRequest httpReq, string operationName)
+        {
+            if (this.RestPath == null)
+                throw new ArgumentNullException("No RestPath found");
+
+            return CreateRequest(httpReq, this.RestPath);
+        }
+    }
+
+}
diff --git a/ServiceStack/Host/RestPath.cs b/ServiceStack/Host/RestPath.cs
new file mode 100644
index 000000000..7222578a9
--- /dev/null
+++ b/ServiceStack/Host/RestPath.cs
@@ -0,0 +1,443 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using ServiceStack.Serialization;
+
+namespace ServiceStack.Host
+{
+    public class RestPath
+    {
+        private const string WildCard = "*";
+        private const char WildCardChar = '*';
+        private const string PathSeperator = "/";
+        private const char PathSeperatorChar = '/';
+        private const char ComponentSeperator = '.';
+        private const string VariablePrefix = "{";
+
+        readonly bool[] componentsWithSeparators;
+
+        private readonly string restPath;
+        private readonly string allowedVerbs;
+        private readonly bool allowsAllVerbs;
+        public bool IsWildCardPath { get; private set; }
+
+        private readonly string[] literalsToMatch;
+
+        private readonly string[] variablesNames;
+
+        private readonly bool[] isWildcard;
+        private readonly int wildcardCount = 0;
+
+        public int VariableArgsCount { get; set; }
+
+        /// <summary>
+        /// The number of segments separated by '/' determinable by path.Split('/').Length
+        /// e.g. /path/to/here.ext == 3
+        /// </summary>
+        public int PathComponentsCount { get; set; }
+
+        /// <summary>
+        /// The total number of segments after subparts have been exploded ('.') 
+        /// e.g. /path/to/here.ext == 4
+        /// </summary>
+        public int TotalComponentsCount { get; set; }
+
+        public string[] Verbs
+        {
+            get 
+            { 
+                return allowsAllVerbs 
+                    ? new[] { ActionContext.AnyAction } 
+                    : AllowedVerbs.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries); 
+            }
+        }
+
+        public Type RequestType { get; private set; }
+
+        public string Path { get { return this.restPath; } }
+
+        public string Summary { get; private set; }
+
+        public string Notes { get; private set; }
+
+        public bool AllowsAllVerbs { get { return this.allowsAllVerbs; } }
+
+        public string AllowedVerbs { get { return this.allowedVerbs; } }
+
+        public int Priority { get; set; } //passed back to RouteAttribute
+
+        public static string[] GetPathPartsForMatching(string pathInfo)
+        {
+            var parts = pathInfo.ToLower().Split(PathSeperatorChar)
+                .Where(x => !string.IsNullOrEmpty(x)).ToArray();
+            return parts;
+        }
+
+        public static IEnumerable<string> GetFirstMatchHashKeys(string[] pathPartsForMatching)
+        {
+            var hashPrefix = pathPartsForMatching.Length + PathSeperator;
+            return GetPotentialMatchesWithPrefix(hashPrefix, pathPartsForMatching);
+        }
+
+        public static IEnumerable<string> GetFirstMatchWildCardHashKeys(string[] pathPartsForMatching)
+        {
+            const string hashPrefix = WildCard + PathSeperator;
+            return GetPotentialMatchesWithPrefix(hashPrefix, pathPartsForMatching);
+        }
+
+        private static IEnumerable<string> GetPotentialMatchesWithPrefix(string hashPrefix, string[] pathPartsForMatching)
+        {
+            foreach (var part in pathPartsForMatching)
+            {
+                yield return hashPrefix + part;
+                var subParts = part.Split(ComponentSeperator);
+                if (subParts.Length == 1) continue;
+
+                foreach (var subPart in subParts)
+                {
+                    yield return hashPrefix + subPart;
+                }
+            }
+        }
+
+        public RestPath(Type requestType, string path, string verbs, string summary = null, string notes = null)
+        {
+            this.RequestType = requestType;
+            this.Summary = summary;
+            this.Notes = notes;
+            this.restPath = path;
+
+            this.allowsAllVerbs = verbs == null || verbs == WildCard;
+            if (!this.allowsAllVerbs)
+            {
+                this.allowedVerbs = verbs.ToUpper();
+            }
+
+            var componentsList = new List<string>();
+
+            //We only split on '.' if the restPath has them. Allows for /{action}.{type}
+            var hasSeparators = new List<bool>();
+            foreach (var component in this.restPath.Split(PathSeperatorChar))
+            {
+                if (string.IsNullOrEmpty(component)) continue;
+
+                if (component.Contains(VariablePrefix)
+                    && component.IndexOf(ComponentSeperator) != -1)
+                {
+                    hasSeparators.Add(true);
+                    componentsList.AddRange(component.Split(ComponentSeperator));
+                }
+                else
+                {
+                    hasSeparators.Add(false);
+                    componentsList.Add(component);
+                }
+            }
+
+            var components = componentsList.ToArray();
+            this.TotalComponentsCount = components.Length;
+
+            this.literalsToMatch = new string[this.TotalComponentsCount];
+            this.variablesNames = new string[this.TotalComponentsCount];
+            this.isWildcard = new bool[this.TotalComponentsCount];
+            this.componentsWithSeparators = hasSeparators.ToArray();
+            this.PathComponentsCount = this.componentsWithSeparators.Length;
+            string firstLiteralMatch = null;
+
+            var sbHashKey = new StringBuilder();
+            for (var i = 0; i < components.Length; i++)
+            {
+                var component = components[i];
+
+                if (component.StartsWith(VariablePrefix))
+                {
+                    var variableName = component.Substring(1, component.Length - 2);
+                    if (variableName[variableName.Length - 1] == WildCardChar)
+                    {
+                        this.isWildcard[i] = true;
+                        variableName = variableName.Substring(0, variableName.Length - 1);
+                    }
+                    this.variablesNames[i] = variableName;
+                    this.VariableArgsCount++;
+                }
+                else
+                {
+                    this.literalsToMatch[i] = component.ToLower();
+                    sbHashKey.Append(i + PathSeperatorChar.ToString() + this.literalsToMatch);
+
+                    if (firstLiteralMatch == null)
+                    {
+                        firstLiteralMatch = this.literalsToMatch[i];
+                    }
+                }
+            }
+
+            for (var i = 0; i < components.Length - 1; i++)
+            {
+                if (!this.isWildcard[i]) continue;
+                if (this.literalsToMatch[i + 1] == null)
+                {
+                    throw new ArgumentException(
+                        "A wildcard path component must be at the end of the path or followed by a literal path component.");
+                }
+            }
+
+            this.wildcardCount = this.isWildcard.Count(x => x);
+            this.IsWildCardPath = this.wildcardCount > 0;
+
+            this.FirstMatchHashKey = !this.IsWildCardPath
+                ? this.PathComponentsCount + PathSeperator + firstLiteralMatch
+                : WildCardChar + PathSeperator + firstLiteralMatch;
+
+            this.IsValid = sbHashKey.Length > 0;
+            this.UniqueMatchHashKey = sbHashKey.ToString();
+
+            this.typeDeserializer = new StringMapTypeDeserializer(this.RequestType);
+            RegisterCaseInsenstivePropertyNameMappings();
+        }
+
+        private void RegisterCaseInsenstivePropertyNameMappings()
+        {
+            foreach (var propertyInfo in RequestType.GetSerializableProperties())
+            {
+                var propertyName = propertyInfo.Name;
+                propertyNamesMap.Add(propertyName.ToLower(), propertyName);
+            }
+        }
+
+        public bool IsValid { get; set; }
+
+        /// <summary>
+        /// Provide for quick lookups based on hashes that can be determined from a request url
+        /// </summary>
+        public string FirstMatchHashKey { get; private set; }
+
+        public string UniqueMatchHashKey { get; private set; }
+
+        private readonly StringMapTypeDeserializer typeDeserializer;
+
+        private readonly Dictionary<string, string> propertyNamesMap = new Dictionary<string, string>();
+
+        public static Func<RestPath, string, string[], int> CalculateMatchScore { get; set; }
+
+        public int MatchScore(string httpMethod, string[] withPathInfoParts)
+        {
+            if (CalculateMatchScore != null)
+                return CalculateMatchScore(this, httpMethod, withPathInfoParts);
+
+            int wildcardMatchCount;
+            var isMatch = IsMatch(httpMethod, withPathInfoParts, out wildcardMatchCount);
+            if (!isMatch) return -1;
+
+            var score = 0;
+
+            //Routes with least wildcard matches get the highest score
+            score += Math.Max((100 - wildcardMatchCount), 1) * 1000;
+
+            //Routes with less variable (and more literal) matches
+            score += Math.Max((10 - VariableArgsCount), 1) * 100;
+
+            //Exact verb match is better than ANY
+            var exactVerb = httpMethod == AllowedVerbs;
+            score += exactVerb ? 10 : 1;
+
+            return score;
+        }
+
+        /// <summary>
+        /// For performance withPathInfoParts should already be a lower case string
+        /// to minimize redundant matching operations.
+        /// </summary>
+        /// <param name="httpMethod"></param>
+        /// <param name="withPathInfoParts"></param>
+        /// <param name="wildcardMatchCount"></param>
+        /// <returns></returns>
+        public bool IsMatch(string httpMethod, string[] withPathInfoParts, out int wildcardMatchCount)
+        {
+            wildcardMatchCount = 0;
+
+            if (withPathInfoParts.Length != this.PathComponentsCount && !this.IsWildCardPath) return false;
+            if (!this.allowsAllVerbs && !this.allowedVerbs.Contains(httpMethod.ToUpper())) return false;
+
+            if (!ExplodeComponents(ref withPathInfoParts)) return false;
+            if (this.TotalComponentsCount != withPathInfoParts.Length && !this.IsWildCardPath) return false;
+
+            int pathIx = 0;
+            for (var i = 0; i < this.TotalComponentsCount; i++)
+            {
+                if (this.isWildcard[i])
+                {
+                    if (i < this.TotalComponentsCount - 1)
+                    {
+                        // Continue to consume up until a match with the next literal
+                        while (pathIx < withPathInfoParts.Length && withPathInfoParts[pathIx] != this.literalsToMatch[i + 1])
+                        {
+                            pathIx++;
+                            wildcardMatchCount++;
+                        }
+
+                        // Ensure there are still enough parts left to match the remainder
+                        if ((withPathInfoParts.Length - pathIx) < (this.TotalComponentsCount - i - 1))
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // A wildcard at the end matches the remainder of path
+                        wildcardMatchCount += withPathInfoParts.Length - pathIx;
+                        pathIx = withPathInfoParts.Length;
+                    }
+                }
+                else
+                {
+                    var literalToMatch = this.literalsToMatch[i];
+                    if (literalToMatch == null)
+                    {
+                        // Matching an ordinary (non-wildcard) variable consumes a single part
+                        pathIx++;
+                        continue;
+                    }
+
+                    if (withPathInfoParts.Length <= pathIx || withPathInfoParts[pathIx] != literalToMatch) return false;
+                    pathIx++;
+                }
+            }
+
+            return pathIx == withPathInfoParts.Length;
+        }
+
+        private bool ExplodeComponents(ref string[] withPathInfoParts)
+        {
+            var totalComponents = new List<string>();
+            for (var i = 0; i < withPathInfoParts.Length; i++)
+            {
+                var component = withPathInfoParts[i];
+                if (string.IsNullOrEmpty(component)) continue;
+
+                if (this.PathComponentsCount != this.TotalComponentsCount
+                    && this.componentsWithSeparators[i])
+                {
+                    var subComponents = component.Split(ComponentSeperator);
+                    if (subComponents.Length < 2) return false;
+                    totalComponents.AddRange(subComponents);
+                }
+                else
+                {
+                    totalComponents.Add(component);
+                }
+            }
+
+            withPathInfoParts = totalComponents.ToArray();
+            return true;
+        }
+
+        public object CreateRequest(string pathInfo, Dictionary<string, string> queryStringAndFormData, object fromInstance)
+        {
+            var requestComponents = pathInfo.Split(PathSeperatorChar)
+                .Where(x => !string.IsNullOrEmpty(x)).ToArray();
+
+            ExplodeComponents(ref requestComponents);
+
+            if (requestComponents.Length != this.TotalComponentsCount)
+            {
+                var isValidWildCardPath = this.IsWildCardPath
+                    && requestComponents.Length >= this.TotalComponentsCount - this.wildcardCount;
+
+                if (!isValidWildCardPath)
+                    throw new ArgumentException(string.Format(
+                        "Path Mismatch: Request Path '{0}' has invalid number of components compared to: '{1}'",
+                        pathInfo, this.restPath));
+            }
+
+            var requestKeyValuesMap = new Dictionary<string, string>();
+            var pathIx = 0;
+            for (var i = 0; i < this.TotalComponentsCount; i++)
+            {
+                var variableName = this.variablesNames[i];
+                if (variableName == null)
+                {
+                    pathIx++;
+                    continue;
+                }
+
+                string propertyNameOnRequest;
+                if (!this.propertyNamesMap.TryGetValue(variableName.ToLower(), out propertyNameOnRequest))
+                {
+                    if (string.Equals("ignore", variableName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        pathIx++;
+                        continue;                       
+                    }
+ 
+                    throw new ArgumentException("Could not find property "
+                        + variableName + " on " + RequestType.GetOperationName());
+                }
+
+                var value = requestComponents.Length > pathIx ? requestComponents[pathIx] : null; //wildcard has arg mismatch
+                if (value != null && this.isWildcard[i])
+                {
+                    if (i == this.TotalComponentsCount - 1)
+                    {
+                        // Wildcard at end of path definition consumes all the rest
+                        var sb = new StringBuilder();
+                        sb.Append(value);
+                        for (var j = pathIx + 1; j < requestComponents.Length; j++)
+                        {
+                            sb.Append(PathSeperatorChar + requestComponents[j]);
+                        }
+                        value = sb.ToString();
+                    }
+                    else
+                    {
+                        // Wildcard in middle of path definition consumes up until it
+                        // hits a match for the next element in the definition (which must be a literal)
+                        // It may consume 0 or more path parts
+                        var stopLiteral = i == this.TotalComponentsCount - 1 ? null : this.literalsToMatch[i + 1];
+                        if (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
+                        {
+                            var sb = new StringBuilder();
+                            sb.Append(value);
+                            pathIx++;
+                            while (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
+                            {
+                                sb.Append(PathSeperatorChar + requestComponents[pathIx++]);
+                            }
+                            value = sb.ToString();
+                        }
+                        else
+                        {
+                            value = null;
+                        }
+                    }
+                }
+                else
+                {
+                    // Variable consumes single path item
+                    pathIx++;
+                }
+
+                requestKeyValuesMap[propertyNameOnRequest] = value;
+            }
+
+            if (queryStringAndFormData != null)
+            {
+                //Query String and form data can override variable path matches
+                //path variables < query string < form data
+                foreach (var name in queryStringAndFormData)
+                {
+                    requestKeyValuesMap[name.Key] = name.Value;
+                }
+            }
+
+            return this.typeDeserializer.PopulateFromMap(fromInstance, requestKeyValuesMap);
+        }
+
+        public override int GetHashCode()
+        {
+            return UniqueMatchHashKey.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/Host/ServiceController.cs b/ServiceStack/Host/ServiceController.cs
new file mode 100644
index 000000000..703f06365
--- /dev/null
+++ b/ServiceStack/Host/ServiceController.cs
@@ -0,0 +1,220 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace ServiceStack.Host
+{
+    public delegate Task<object> InstanceExecFn(IRequest requestContext, object intance, object request);
+    public delegate object ActionInvokerFn(object intance, object request);
+    public delegate void VoidActionInvokerFn(object intance, object request);
+
+    public class ServiceController
+    {
+        private readonly Func<IEnumerable<Type>> _resolveServicesFn;
+
+        public ServiceController(Func<IEnumerable<Type>> resolveServicesFn)
+        {
+            _resolveServicesFn = resolveServicesFn;
+            this.RequestTypeFactoryMap = new Dictionary<Type, Func<IRequest, object>>();
+        }
+
+        public Dictionary<Type, Func<IRequest, object>> RequestTypeFactoryMap { get; set; }
+
+        public void Init()
+        {
+            foreach (var serviceType in _resolveServicesFn())
+            {
+                RegisterService(serviceType);
+            }
+        }
+
+        private Type[] GetGenericArguments(Type type)
+        {
+            return type.GetTypeInfo().IsGenericTypeDefinition
+                ? type.GetTypeInfo().GenericTypeParameters
+                : type.GetTypeInfo().GenericTypeArguments;
+        }
+
+        public void RegisterService(Type serviceType)
+        {
+            var processedReqs = new HashSet<Type>();
+
+            var actions = ServiceExecGeneral.Reset(serviceType);
+
+            var requiresRequestStreamTypeInfo = typeof(IRequiresRequestStream).GetTypeInfo();
+
+            var appHost = ServiceStackHost.Instance;
+            foreach (var mi in serviceType.GetActions())
+            {
+                var requestType = mi.GetParameters()[0].ParameterType;
+                if (processedReqs.Contains(requestType)) continue;
+                processedReqs.Add(requestType);
+
+                ServiceExecGeneral.CreateServiceRunnersFor(requestType, actions);
+
+                var returnMarker = requestType.GetTypeWithGenericTypeDefinitionOf(typeof(IReturn<>));
+                var responseType = returnMarker != null ?
+                      GetGenericArguments(returnMarker)[0]
+                    : mi.ReturnType != typeof(object) && mi.ReturnType != typeof(void) ?
+                      mi.ReturnType
+                    : Type.GetType(requestType.FullName + "Response");
+
+                RegisterRestPaths(requestType);
+
+                appHost.Metadata.Add(serviceType, requestType, responseType);
+
+                if (requiresRequestStreamTypeInfo.IsAssignableFrom(requestType.GetTypeInfo()))
+                {
+                    this.RequestTypeFactoryMap[requestType] = req =>
+                    {
+                        var restPath = req.GetRoute();
+                        var request = RestHandler.CreateRequest(req, restPath, req.GetRequestParams(), ServiceStackHost.Instance.CreateInstance(requestType));
+
+                        var rawReq = (IRequiresRequestStream)request;
+                        rawReq.RequestStream = req.InputStream;
+                        return rawReq;
+                    };
+                }
+            }
+        }
+
+        public readonly Dictionary<string, List<RestPath>> RestPathMap = new Dictionary<string, List<RestPath>>();
+
+        public void RegisterRestPaths(Type requestType)
+        {
+            var appHost = ServiceStackHost.Instance;
+            var attrs = appHost.GetRouteAttributes(requestType);
+            foreach (MediaBrowser.Model.Services.RouteAttribute attr in attrs)
+            {
+                var restPath = new RestPath(requestType, attr.Path, attr.Verbs, attr.Summary, attr.Notes);
+
+                if (!restPath.IsValid)
+                    throw new NotSupportedException(string.Format(
+                        "RestPath '{0}' on Type '{1}' is not Valid", attr.Path, requestType.GetOperationName()));
+
+                RegisterRestPath(restPath);
+            }
+        }
+
+        private static readonly char[] InvalidRouteChars = new[] { '?', '&' };
+
+        public void RegisterRestPath(RestPath restPath)
+        {
+            if (!restPath.Path.StartsWith("/"))
+                throw new ArgumentException(string.Format("Route '{0}' on '{1}' must start with a '/'", restPath.Path, restPath.RequestType.GetOperationName()));
+            if (restPath.Path.IndexOfAny(InvalidRouteChars) != -1)
+                throw new ArgumentException(string.Format("Route '{0}' on '{1}' contains invalid chars. " +
+                                            "See https://github.com/ServiceStack/ServiceStack/wiki/Routing for info on valid routes.", restPath.Path, restPath.RequestType.GetOperationName()));
+
+            List<RestPath> pathsAtFirstMatch;
+            if (!RestPathMap.TryGetValue(restPath.FirstMatchHashKey, out pathsAtFirstMatch))
+            {
+                pathsAtFirstMatch = new List<RestPath>();
+                RestPathMap[restPath.FirstMatchHashKey] = pathsAtFirstMatch;
+            }
+            pathsAtFirstMatch.Add(restPath);
+        }
+
+        public void AfterInit()
+        {
+            var appHost = ServiceStackHost.Instance;
+
+            //Register any routes configured on Metadata.Routes
+            foreach (var restPath in appHost.RestPaths)
+            {
+                RegisterRestPath(restPath);
+            }
+
+            //Sync the RestPaths collections
+            appHost.RestPaths.Clear();
+            appHost.RestPaths.AddRange(RestPathMap.Values.SelectMany(x => x));
+        }
+
+        public RestPath GetRestPathForRequest(string httpMethod, string pathInfo)
+        {
+            var matchUsingPathParts = RestPath.GetPathPartsForMatching(pathInfo);
+
+            List<RestPath> firstMatches;
+
+            var yieldedHashMatches = RestPath.GetFirstMatchHashKeys(matchUsingPathParts);
+            foreach (var potentialHashMatch in yieldedHashMatches)
+            {
+                if (!this.RestPathMap.TryGetValue(potentialHashMatch, out firstMatches)) continue;
+
+                var bestScore = -1;
+                foreach (var restPath in firstMatches)
+                {
+                    var score = restPath.MatchScore(httpMethod, matchUsingPathParts);
+                    if (score > bestScore) bestScore = score;
+                }
+                if (bestScore > 0)
+                {
+                    foreach (var restPath in firstMatches)
+                    {
+                        if (bestScore == restPath.MatchScore(httpMethod, matchUsingPathParts))
+                            return restPath;
+                    }
+                }
+            }
+
+            var yieldedWildcardMatches = RestPath.GetFirstMatchWildCardHashKeys(matchUsingPathParts);
+            foreach (var potentialHashMatch in yieldedWildcardMatches)
+            {
+                if (!this.RestPathMap.TryGetValue(potentialHashMatch, out firstMatches)) continue;
+
+                var bestScore = -1;
+                foreach (var restPath in firstMatches)
+                {
+                    var score = restPath.MatchScore(httpMethod, matchUsingPathParts);
+                    if (score > bestScore) bestScore = score;
+                }
+                if (bestScore > 0)
+                {
+                    foreach (var restPath in firstMatches)
+                    {
+                        if (bestScore == restPath.MatchScore(httpMethod, matchUsingPathParts))
+                            return restPath;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        public async Task<object> Execute(object requestDto, IRequest req)
+        {
+            req.Dto = requestDto;
+            var requestType = requestDto.GetType();
+            req.OperationName = requestType.Name;
+
+            var serviceType = ServiceStackHost.Instance.Metadata.GetServiceTypeByRequest(requestType);
+
+            var service = ServiceStackHost.Instance.CreateInstance(serviceType);
+
+            //var service = typeFactory.CreateInstance(serviceType);
+
+            var serviceRequiresContext = service as IRequiresRequest;
+            if (serviceRequiresContext != null)
+            {
+                serviceRequiresContext.Request = req;
+            }
+
+            if (req.Dto == null) // Don't override existing batched DTO[]
+                req.Dto = requestDto;
+
+            //Executes the service and returns the result
+            var response = await ServiceExecGeneral.Execute(serviceType, req, service, requestDto, requestType.GetOperationName()).ConfigureAwait(false);
+
+            if (req.Response.Dto == null)
+                req.Response.Dto = response;
+
+            return response;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/ServiceStack/Host/ServiceExec.cs b/ServiceStack/Host/ServiceExec.cs
new file mode 100644
index 000000000..cb501a3ad
--- /dev/null
+++ b/ServiceStack/Host/ServiceExec.cs
@@ -0,0 +1,156 @@
+//Copyright (c) Service Stack LLC. All Rights Reserved.
+//License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace ServiceStack.Host
+{
+    public static class ServiceExecExtensions
+    {
+        public static IEnumerable<MethodInfo> GetActions(this Type serviceType)
+        {
+            foreach (var mi in serviceType.GetRuntimeMethods().Where(i => i.IsPublic && !i.IsStatic))
+            {
+                if (mi.GetParameters().Length != 1)
+                    continue;
+
+                var actionName = mi.Name.ToUpper();
+                if (!HttpMethods.AllVerbs.Contains(actionName) && actionName != ActionContext.AnyAction)
+                    continue;
+
+                yield return mi;
+            }
+        }
+    }
+
+    internal static class ServiceExecGeneral
+    {
+        public static Dictionary<string, ActionContext> execMap = new Dictionary<string, ActionContext>();
+
+        public static void CreateServiceRunnersFor(Type requestType, List<ActionContext> actions)
+        {
+            foreach (var actionCtx in actions)
+            {
+                if (execMap.ContainsKey(actionCtx.Id)) continue;
+
+                execMap[actionCtx.Id] = actionCtx;
+            }
+        }
+
+        public static async Task<object> Execute(Type serviceType, IRequest request, object instance, object requestDto, string requestName)
+        {
+            var actionName = request.Verb
+                ?? HttpMethods.Post; //MQ Services
+
+            ActionContext actionContext;
+            if (ServiceExecGeneral.execMap.TryGetValue(ActionContext.Key(serviceType, actionName, requestName), out actionContext)
+                || ServiceExecGeneral.execMap.TryGetValue(ActionContext.AnyKey(serviceType, requestName), out actionContext))
+            {
+                if (actionContext.RequestFilters != null)
+                {
+                    foreach (var requestFilter in actionContext.RequestFilters)
+                    {
+                        requestFilter.RequestFilter(request, request.Response, requestDto);
+                        if (request.Response.IsClosed) return null;
+                    }
+                }
+
+                var response = actionContext.ServiceAction(instance, requestDto);
+
+                var taskResponse = response as Task;
+                if (taskResponse != null)
+                {
+                    await taskResponse.ConfigureAwait(false);
+                    response = ServiceStackHost.Instance.GetTaskResult(taskResponse, requestName);
+                }
+
+                return response;
+            }
+
+            var expectedMethodName = actionName.Substring(0, 1) + actionName.Substring(1).ToLower();
+            throw new NotImplementedException(string.Format("Could not find method named {1}({0}) or Any({0}) on Service {2}", requestDto.GetType().GetOperationName(), expectedMethodName, serviceType.GetOperationName()));
+        }
+
+        public static List<ActionContext> Reset(Type serviceType)
+        {
+            var actions = new List<ActionContext>();
+
+            foreach (var mi in serviceType.GetActions())
+            {
+                var actionName = mi.Name.ToUpper();
+                var args = mi.GetParameters();
+
+                var requestType = args[0].ParameterType;
+                var actionCtx = new ActionContext
+                {
+                    Id = ActionContext.Key(serviceType, actionName, requestType.GetOperationName())
+                };
+
+                try
+                {
+                    actionCtx.ServiceAction = CreateExecFn(serviceType, requestType, mi);
+                }
+                catch
+                {
+                    //Potential problems with MONO, using reflection for fallback
+                    actionCtx.ServiceAction = (service, request) =>
+                                              mi.Invoke(service, new[] { request });
+                }
+
+                var reqFilters = new List<IHasRequestFilter>();
+
+                foreach (var attr in mi.GetCustomAttributes(true))
+                {
+                    var hasReqFilter = attr as IHasRequestFilter;
+
+                    if (hasReqFilter != null)
+                        reqFilters.Add(hasReqFilter);
+                }
+
+                if (reqFilters.Count > 0)
+                    actionCtx.RequestFilters = reqFilters.OrderBy(i => i.Priority).ToArray();
+
+                actions.Add(actionCtx);
+            }
+
+            return actions;
+        }
+
+        private static ActionInvokerFn CreateExecFn(Type serviceType, Type requestType, MethodInfo mi)
+        {
+            var serviceParam = Expression.Parameter(typeof(object), "serviceObj");
+            var serviceStrong = Expression.Convert(serviceParam, serviceType);
+
+            var requestDtoParam = Expression.Parameter(typeof(object), "requestDto");
+            var requestDtoStrong = Expression.Convert(requestDtoParam, requestType);
+
+            Expression callExecute = Expression.Call(
+            serviceStrong, mi, requestDtoStrong);
+
+            if (mi.ReturnType != typeof(void))
+            {
+                var executeFunc = Expression.Lambda<ActionInvokerFn>
+                (callExecute, serviceParam, requestDtoParam).Compile();
+
+                return executeFunc;
+            }
+            else
+            {
+                var executeFunc = Expression.Lambda<VoidActionInvokerFn>
+                (callExecute, serviceParam, requestDtoParam).Compile();
+
+                return (service, request) =>
+                {
+                    executeFunc(service, request);
+                    return null;
+                };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/Host/ServiceMetadata.cs b/ServiceStack/Host/ServiceMetadata.cs
new file mode 100644
index 000000000..240e6f32d
--- /dev/null
+++ b/ServiceStack/Host/ServiceMetadata.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace ServiceStack.Host
+{
+    public class ServiceMetadata
+    {
+        public ServiceMetadata()
+        {
+            this.OperationsMap = new Dictionary<Type, Type>();
+        }
+
+        public Dictionary<Type, Type> OperationsMap { get; protected set; }
+
+        public void Add(Type serviceType, Type requestType, Type responseType)
+        {
+            this.OperationsMap[requestType] = serviceType;
+        }
+
+        public Type GetServiceTypeByRequest(Type requestType)
+        {
+            Type serviceType;
+            OperationsMap.TryGetValue(requestType, out serviceType);
+            return serviceType;
+        }
+    }
+}
diff --git a/ServiceStack/HttpHandlerFactory.cs b/ServiceStack/HttpHandlerFactory.cs
new file mode 100644
index 000000000..d48bfeb5f
--- /dev/null
+++ b/ServiceStack/HttpHandlerFactory.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Model.Services;
+using ServiceStack.Host;
+
+namespace ServiceStack
+{
+    public class HttpHandlerFactory
+    {
+        // Entry point for HttpListener
+        public static RestHandler GetHandler(IHttpRequest httpReq)
+        {
+            var pathInfo = httpReq.PathInfo;
+
+            var pathParts = pathInfo.TrimStart('/').Split('/');
+            if (pathParts.Length == 0) return null;
+
+            string contentType;
+            var restPath = RestHandler.FindMatchingRestPath(httpReq.HttpMethod, pathInfo, out contentType);
+            if (restPath != null)
+                return new RestHandler { RestPath = restPath, RequestName = restPath.RequestType.GetOperationName(), ResponseContentType = contentType };
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/HttpRequestExtensions.cs b/ServiceStack/HttpRequestExtensions.cs
new file mode 100644
index 000000000..c34d62601
--- /dev/null
+++ b/ServiceStack/HttpRequestExtensions.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Model.Services;
+using ServiceStack.Host;
+
+namespace ServiceStack
+{
+    public static class HttpRequestExtensions
+    {
+        /**
+         * 
+             Input: http://localhost:96/Cambia3/Temp/Test.aspx/path/info?q=item#fragment
+
+            Some HttpRequest path and URL properties:
+            Request.ApplicationPath:	/Cambia3
+            Request.CurrentExecutionFilePath:	/Cambia3/Temp/Test.aspx
+            Request.FilePath:			/Cambia3/Temp/Test.aspx
+            Request.Path:				/Cambia3/Temp/Test.aspx/path/info
+            Request.PathInfo:			/path/info
+            Request.PhysicalApplicationPath:	D:\Inetpub\wwwroot\CambiaWeb\Cambia3\
+            Request.QueryString:		/Cambia3/Temp/Test.aspx/path/info?query=arg
+            Request.Url.AbsolutePath:	/Cambia3/Temp/Test.aspx/path/info
+            Request.Url.AbsoluteUri:	http://localhost:96/Cambia3/Temp/Test.aspx/path/info?query=arg
+            Request.Url.Fragment:	
+            Request.Url.Host:			localhost
+            Request.Url.LocalPath:		/Cambia3/Temp/Test.aspx/path/info
+            Request.Url.PathAndQuery:	/Cambia3/Temp/Test.aspx/path/info?query=arg
+            Request.Url.Port:			96
+            Request.Url.Query:			?query=arg
+            Request.Url.Scheme:			http
+            Request.Url.Segments:		/
+                                        Cambia3/
+                                        Temp/
+                                        Test.aspx/
+                                        path/
+                                        info
+         * */
+
+        /// <summary>
+        /// Duplicate Params are given a unique key by appending a #1 suffix
+        /// </summary>
+        public static Dictionary<string, string> GetRequestParams(this IRequest request)
+        {
+            var map = new Dictionary<string, string>();
+
+            foreach (var name in request.QueryString.Keys)
+            {
+                if (name == null) continue; //thank you ASP.NET
+
+                var values = request.QueryString.GetValues(name);
+                if (values.Length == 1)
+                {
+                    map[name] = values[0];
+                }
+                else
+                {
+                    for (var i = 0; i < values.Length; i++)
+                    {
+                        map[name + (i == 0 ? "" : "#" + i)] = values[i];
+                    }
+                }
+            }
+
+            if ((request.Verb == HttpMethods.Post || request.Verb == HttpMethods.Put)
+                && request.FormData != null)
+            {
+                foreach (var name in request.FormData.Keys)
+                {
+                    if (name == null) continue; //thank you ASP.NET
+
+                    var values = request.FormData.GetValues(name);
+                    if (values.Length == 1)
+                    {
+                        map[name] = values[0];
+                    }
+                    else
+                    {
+                        for (var i = 0; i < values.Length; i++)
+                        {
+                            map[name + (i == 0 ? "" : "#" + i)] = values[i];
+                        }
+                    }
+                }
+            }
+
+            return map;
+        }
+
+        /// <summary>
+        /// Duplicate params have their values joined together in a comma-delimited string
+        /// </summary>
+        public static Dictionary<string, string> GetFlattenedRequestParams(this IRequest request)
+        {
+            var map = new Dictionary<string, string>();
+
+            foreach (var name in request.QueryString.Keys)
+            {
+                if (name == null) continue; //thank you ASP.NET
+                map[name] = request.QueryString[name];
+            }
+
+            if ((request.Verb == HttpMethods.Post || request.Verb == HttpMethods.Put)
+                && request.FormData != null)
+            {
+                foreach (var name in request.FormData.Keys)
+                {
+                    if (name == null) continue; //thank you ASP.NET
+                    map[name] = request.FormData[name];
+                }
+            }
+
+            return map;
+        }
+
+        public static void SetRoute(this IRequest req, RestPath route)
+        {
+            req.Items["__route"] = route;
+        }
+
+        public static RestPath GetRoute(this IRequest req)
+        {
+            object route;
+            req.Items.TryGetValue("__route", out route);
+            return route as RestPath;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/HttpResponseExtensionsInternal.cs b/ServiceStack/HttpResponseExtensionsInternal.cs
new file mode 100644
index 000000000..1195f63ca
--- /dev/null
+++ b/ServiceStack/HttpResponseExtensionsInternal.cs
@@ -0,0 +1,237 @@
+//Copyright (c) Service Stack LLC. All Rights Reserved.
+//License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
+
+using System;
+using System.IO;
+using System.Net;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Model.Services;
+using ServiceStack.Host;
+
+namespace ServiceStack
+{
+    public static class HttpResponseExtensionsInternal
+    {
+        public static async Task<bool> WriteToOutputStream(IResponse response, object result)
+        {
+            var asyncStreamWriter = result as IAsyncStreamWriter;
+            if (asyncStreamWriter != null)
+            {
+                await asyncStreamWriter.WriteToAsync(response.OutputStream, CancellationToken.None).ConfigureAwait(false);
+                return true;
+            }
+
+            var streamWriter = result as IStreamWriter;
+            if (streamWriter != null)
+            {
+                streamWriter.WriteTo(response.OutputStream);
+                return true;
+            }
+
+            var stream = result as Stream;
+            if (stream != null)
+            {
+                WriteTo(stream, response.OutputStream);
+                return true;
+            }
+
+            var bytes = result as byte[];
+            if (bytes != null)
+            {
+                response.ContentType = "application/octet-stream";
+                response.SetContentLength(bytes.Length);
+
+                response.OutputStream.Write(bytes, 0, bytes.Length);
+                return true;
+            }
+
+            return false;
+        }
+
+        public static long WriteTo(Stream inStream, Stream outStream)
+        {
+            var memoryStream = inStream as MemoryStream;
+            if (memoryStream != null)
+            {
+                memoryStream.WriteTo(outStream);
+                return memoryStream.Position;
+            }
+
+            var data = new byte[4096];
+            long total = 0;
+            int bytesRead;
+
+            while ((bytesRead = inStream.Read(data, 0, data.Length)) > 0)
+            {
+                outStream.Write(data, 0, bytesRead);
+                total += bytesRead;
+            }
+
+            return total;
+        }
+
+        /// <summary>
+        /// End a ServiceStack Request with no content
+        /// </summary>
+        public static void EndRequestWithNoContent(this IResponse httpRes)
+        {
+            if (httpRes.StatusCode == (int)HttpStatusCode.OK)
+            {
+                httpRes.StatusCode = (int)HttpStatusCode.NoContent;
+            }
+
+            httpRes.SetContentLength(0);
+        }
+
+        public static Task WriteToResponse(this IResponse httpRes, MediaBrowser.Model.Services.IRequest httpReq, object result)
+        {
+            if (result == null)
+            {
+                httpRes.EndRequestWithNoContent();
+                return Task.FromResult(true);
+            }
+
+            var httpResult = result as IHttpResult;
+            if (httpResult != null)
+            {
+                httpResult.RequestContext = httpReq;
+                httpReq.ResponseContentType = httpResult.ContentType ?? httpReq.ResponseContentType;
+                var httpResSerializer = ContentTypes.Instance.GetResponseSerializer(httpReq.ResponseContentType);
+                return httpRes.WriteToResponse(httpResult, httpResSerializer, httpReq);
+            }
+
+            var serializer = ContentTypes.Instance.GetResponseSerializer(httpReq.ResponseContentType);
+            return httpRes.WriteToResponse(result, serializer, httpReq);
+        }
+
+        private static object GetDto(object response)
+        {
+            if (response == null) return null;
+            var httpResult = response as IHttpResult;
+            return httpResult != null ? httpResult.Response : response;
+        }
+
+        /// <summary>
+        /// Writes to response.
+        /// Response headers are customizable by implementing IHasHeaders an returning Dictionary of Http headers.
+        /// </summary>
+        /// <param name="response">The response.</param>
+        /// <param name="result">Whether or not it was implicity handled by ServiceStack's built-in handlers.</param>
+        /// <param name="defaultAction">The default action.</param>
+        /// <param name="request">The serialization context.</param>
+        /// <returns></returns>
+        public static async Task WriteToResponse(this IResponse response, object result, Action<IRequest, object, IResponse> defaultAction, MediaBrowser.Model.Services.IRequest request)
+        {
+            var defaultContentType = request.ResponseContentType;
+            if (result == null)
+            {
+                response.EndRequestWithNoContent();
+                return;
+            }
+
+            var httpResult = result as IHttpResult;
+            if (httpResult != null)
+            {
+                if (httpResult.RequestContext == null)
+                    httpResult.RequestContext = request;
+
+                response.Dto = response.Dto ?? GetDto(httpResult);
+
+                response.StatusCode = httpResult.Status;
+                response.StatusDescription = httpResult.StatusDescription ?? httpResult.StatusCode.ToString();
+                if (string.IsNullOrEmpty(httpResult.ContentType))
+                {
+                    httpResult.ContentType = defaultContentType;
+                }
+                response.ContentType = httpResult.ContentType;
+
+                if (httpResult.Cookies != null)
+                {
+                    var httpRes = response as IHttpResponse;
+                    if (httpRes != null)
+                    {
+                        foreach (var cookie in httpResult.Cookies)
+                        {
+                            httpRes.SetCookie(cookie);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                response.Dto = result;
+            }
+
+            /* Mono Error: Exception: Method not found: 'System.Web.HttpResponse.get_Headers' */
+            var responseOptions = result as IHasHeaders;
+            if (responseOptions != null)
+            {
+                //Reserving options with keys in the format 'xx.xxx' (No Http headers contain a '.' so its a safe restriction)
+                const string reservedOptions = ".";
+
+                foreach (var responseHeaders in responseOptions.Headers)
+                {
+                    if (responseHeaders.Key.Contains(reservedOptions)) continue;
+                    if (responseHeaders.Key == "Content-Length")
+                    {
+                        response.SetContentLength(long.Parse(responseHeaders.Value));
+                        continue;
+                    }
+
+                    response.AddHeader(responseHeaders.Key, responseHeaders.Value);
+                }
+            }
+
+            //ContentType='text/html' is the default for a HttpResponse
+            //Do not override if another has been set
+            if (response.ContentType == null || response.ContentType == "text/html")
+            {
+                response.ContentType = defaultContentType;
+            }
+
+            if (new HashSet<string> { "application/json", }.Contains(response.ContentType))
+            {
+                response.ContentType += "; charset=utf-8";
+            }
+
+            var disposableResult = result as IDisposable;
+            var writeToOutputStreamResult = await WriteToOutputStream(response, result).ConfigureAwait(false);
+            if (writeToOutputStreamResult)
+            {
+                response.Flush(); //required for Compression
+                if (disposableResult != null) disposableResult.Dispose();
+                return;
+            }
+
+            if (httpResult != null)
+                result = httpResult.Response;
+
+            var responseText = result as string;
+            if (responseText != null)
+            {
+                if (response.ContentType == null || response.ContentType == "text/html")
+                    response.ContentType = defaultContentType;
+                response.Write(responseText);
+
+                return;
+            }
+
+            if (defaultAction == null)
+            {
+                throw new ArgumentNullException("defaultAction", String.Format(
+                    "As result '{0}' is not a supported responseType, a defaultAction must be supplied",
+                    (result != null ? result.GetType().GetOperationName() : "")));
+            }
+
+
+            if (result != null)
+                defaultAction(request, result, response);
+
+            if (disposableResult != null)
+                disposableResult.Dispose();
+        }
+
+    }
+}
diff --git a/ServiceStack/HttpResult.cs b/ServiceStack/HttpResult.cs
new file mode 100644
index 000000000..23a5cdffb
--- /dev/null
+++ b/ServiceStack/HttpResult.cs
@@ -0,0 +1,250 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+using ServiceStack.Host;
+
+namespace ServiceStack
+{
+    public class HttpResult
+        : IHttpResult, IAsyncStreamWriter
+    {
+        public HttpResult()
+            : this((object)null, null)
+        {
+        }
+
+        public HttpResult(object response)
+            : this(response, null)
+        {
+        }
+
+        public HttpResult(object response, string contentType)
+            : this(response, contentType, HttpStatusCode.OK)
+        {
+        }
+
+        public HttpResult(HttpStatusCode statusCode, string statusDescription)
+            : this()
+        {
+            StatusCode = statusCode;
+            StatusDescription = statusDescription;
+        }
+
+        public HttpResult(object response, HttpStatusCode statusCode)
+            : this(response, null, statusCode)
+        { }
+
+        public HttpResult(object response, string contentType, HttpStatusCode statusCode)
+        {
+            this.Headers = new Dictionary<string, string>();
+            this.Cookies = new List<Cookie>();
+
+            this.Response = response;
+            this.ContentType = contentType;
+            this.StatusCode = statusCode;
+        }
+
+        public HttpResult(Stream responseStream, string contentType)
+            : this(null, contentType, HttpStatusCode.OK)
+        {
+            this.ResponseStream = responseStream;
+        }
+
+        public HttpResult(string responseText, string contentType)
+            : this(null, contentType, HttpStatusCode.OK)
+        {
+            this.ResponseText = responseText;
+        }
+
+        public HttpResult(byte[] responseBytes, string contentType)
+            : this(null, contentType, HttpStatusCode.OK)
+        {
+            this.ResponseStream = new MemoryStream(responseBytes);
+        }
+
+        public string ResponseText { get; private set; }
+
+        public Stream ResponseStream { get; private set; }
+
+        public string ContentType { get; set; }
+
+        public IDictionary<string, string> Headers { get; private set; }
+
+        public List<Cookie> Cookies { get; private set; }
+
+        public string ETag { get; set; }
+
+        public TimeSpan? Age { get; set; }
+
+        public TimeSpan? MaxAge { get; set; }
+
+        public DateTime? Expires { get; set; }
+
+        public DateTime? LastModified { get; set; }
+
+        public Func<IDisposable> ResultScope { get; set; }
+
+        public string Location
+        {
+            set
+            {
+                if (StatusCode == HttpStatusCode.OK)
+                    StatusCode = HttpStatusCode.Redirect;
+
+                this.Headers["Location"] = value;
+            }
+        }
+
+        public void SetPermanentCookie(string name, string value)
+        {
+            SetCookie(name, value, DateTime.UtcNow.AddYears(20), null);
+        }
+
+        public void SetPermanentCookie(string name, string value, string path)
+        {
+            SetCookie(name, value, DateTime.UtcNow.AddYears(20), path);
+        }
+
+        public void SetSessionCookie(string name, string value)
+        {
+            SetSessionCookie(name, value, null);
+        }
+
+        public void SetSessionCookie(string name, string value, string path)
+        {
+            path = path ?? "/";
+            this.Headers["Set-Cookie"] = string.Format("{0}={1};path=" + path, name, value);
+        }
+
+        public void SetCookie(string name, string value, TimeSpan expiresIn, string path)
+        {
+            var expiresAt = DateTime.UtcNow.Add(expiresIn);
+            SetCookie(name, value, expiresAt, path);
+        }
+
+        public void SetCookie(string name, string value, DateTime expiresAt, string path, bool secure = false, bool httpOnly = false)
+        {
+            path = path ?? "/";
+            var cookie = string.Format("{0}={1};expires={2};path={3}", name, value, expiresAt.ToString("R"), path);
+            if (secure)
+                cookie += ";Secure";
+            if (httpOnly)
+                cookie += ";HttpOnly";
+
+            this.Headers["Set-Cookie"] = cookie;
+        }
+
+        public void DeleteCookie(string name)
+        {
+            var cookie = string.Format("{0}=;expires={1};path=/", name, DateTime.UtcNow.AddDays(-1).ToString("R"));
+            this.Headers["Set-Cookie"] = cookie;
+        }
+
+        public int Status { get; set; }
+
+        public HttpStatusCode StatusCode
+        {
+            get { return (HttpStatusCode)Status; }
+            set { Status = (int)value; }
+        }
+
+        public string StatusDescription { get; set; }
+
+        public object Response { get; set; }
+
+        public MediaBrowser.Model.Services.IRequest RequestContext { get; set; }
+
+        public string View { get; set; }
+
+        public string Template { get; set; }
+
+        public int PaddingLength { get; set; }
+
+        public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await WriteToInternalAsync(responseStream, cancellationToken).ConfigureAwait(false);
+                responseStream.Flush();
+            }
+            finally
+            {
+                DisposeStream();
+            }
+        }
+
+        public static Task WriteTo(Stream inStream, Stream outStream, CancellationToken cancellationToken)
+        {
+            var memoryStream = inStream as MemoryStream;
+            if (memoryStream != null)
+            {
+                memoryStream.WriteTo(outStream);
+                return Task.FromResult(true);
+            }
+
+            return inStream.CopyToAsync(outStream, 81920, cancellationToken);
+        }
+
+        public async Task WriteToInternalAsync(Stream responseStream, CancellationToken cancellationToken)
+        {
+            var response = RequestContext != null ? RequestContext.Response : null;
+
+            if (this.ResponseStream != null)
+            {
+                if (response != null)
+                {
+                    var ms = ResponseStream as MemoryStream;
+                    if (ms != null)
+                    {
+                        response.SetContentLength(ms.Length);
+
+                        await ms.CopyToAsync(responseStream, 81920, cancellationToken).ConfigureAwait(false);
+                        return;
+                    }
+                }
+
+                await WriteTo(this.ResponseStream, responseStream, cancellationToken).ConfigureAwait(false);
+                return;
+            }
+
+            if (this.ResponseText != null)
+            {
+                var bytes = Encoding.UTF8.GetBytes(this.ResponseText);
+                if (response != null)
+                    response.SetContentLength(bytes.Length);
+
+                await responseStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                return;
+            }
+
+            var bytesResponse = this.Response as byte[];
+            if (bytesResponse != null)
+            {
+                if (response != null)
+                    response.SetContentLength(bytesResponse.Length);
+
+                await responseStream.WriteAsync(bytesResponse, 0, bytesResponse.Length).ConfigureAwait(false);
+                return;
+            }
+
+            ContentTypes.Instance.SerializeToStream(this.RequestContext, this.Response, responseStream);
+        }
+
+        private void DisposeStream()
+        {
+            try
+            {
+                if (ResponseStream != null)
+                {
+                    this.ResponseStream.Dispose();
+                }
+            }
+            catch { /*ignore*/ }
+        }
+    }
+}
diff --git a/ServiceStack/HttpUtils.cs b/ServiceStack/HttpUtils.cs
new file mode 100644
index 000000000..41d191d61
--- /dev/null
+++ b/ServiceStack/HttpUtils.cs
@@ -0,0 +1,34 @@
+//Copyright (c) Service Stack LLC. All Rights Reserved.
+//License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
+
+using System;
+using System.Collections.Generic;
+
+namespace ServiceStack
+{
+    internal static class HttpMethods
+    {
+        static readonly string[] allVerbs = new[] {
+            "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT", // RFC 2616
+            "PROPFIND", "PROPPATCH", "MKCOL", "COPY", "MOVE", "LOCK", "UNLOCK",    // RFC 2518
+            "VERSION-CONTROL", "REPORT", "CHECKOUT", "CHECKIN", "UNCHECKOUT",
+            "MKWORKSPACE", "UPDATE", "LABEL", "MERGE", "BASELINE-CONTROL", "MKACTIVITY",  // RFC 3253
+            "ORDERPATCH", // RFC 3648
+            "ACL",        // RFC 3744
+            "PATCH",      // https://datatracker.ietf.org/doc/draft-dusseault-http-patch/
+            "SEARCH",     // https://datatracker.ietf.org/doc/draft-reschke-webdav-search/
+            "BCOPY", "BDELETE", "BMOVE", "BPROPFIND", "BPROPPATCH", "NOTIFY",
+            "POLL",  "SUBSCRIBE", "UNSUBSCRIBE" //MS Exchange WebDav: http://msdn.microsoft.com/en-us/library/aa142917.aspx
+        };
+
+        public static HashSet<string> AllVerbs = new HashSet<string>(allVerbs);
+
+        public const string Get = "GET";
+        public const string Put = "PUT";
+        public const string Post = "POST";
+        public const string Delete = "DELETE";
+        public const string Options = "OPTIONS";
+        public const string Head = "HEAD";
+        public const string Patch = "PATCH";
+    }
+}
diff --git a/ServiceStack/Properties/AssemblyInfo.cs b/ServiceStack/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..6073dc0b4
--- /dev/null
+++ b/ServiceStack/Properties/AssemblyInfo.cs
@@ -0,0 +1,25 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ServiceStack")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Service Stack LLC")]
+[assembly: AssemblyProduct("ServiceStack")]
+[assembly: AssemblyCopyright("Copyright (c) ServiceStack 2016")]
+[assembly: AssemblyTrademark("Service Stack")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("06704d66-af8e-411f-8260-8d05de5ce6ad")]
+
+[assembly: AssemblyVersion("4.0.0.0")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
diff --git a/ServiceStack/ReflectionExtensions.cs b/ServiceStack/ReflectionExtensions.cs
new file mode 100644
index 000000000..bbabd0dd7
--- /dev/null
+++ b/ServiceStack/ReflectionExtensions.cs
@@ -0,0 +1,270 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ServiceStack
+{
+    public static class ReflectionExtensions
+    {
+        public static bool IsInstanceOf(this Type type, Type thisOrBaseType)
+        {
+            while (type != null)
+            {
+                if (type == thisOrBaseType)
+                    return true;
+
+                type = type.BaseType();
+            }
+            return false;
+        }
+
+        public static Type FirstGenericType(this Type type)
+        {
+            while (type != null)
+            {
+                if (type.IsGeneric())
+                    return type;
+
+                type = type.BaseType();
+            }
+            return null;
+        }
+
+        public static Type GetTypeWithGenericTypeDefinitionOf(this Type type, Type genericTypeDefinition)
+        {
+            foreach (var t in type.GetTypeInterfaces())
+            {
+                if (t.IsGeneric() && t.GetGenericTypeDefinition() == genericTypeDefinition)
+                {
+                    return t;
+                }
+            }
+
+            var genericType = type.FirstGenericType();
+            if (genericType != null && genericType.GetGenericTypeDefinition() == genericTypeDefinition)
+            {
+                return genericType;
+            }
+
+            return null;
+        }
+
+        public static PropertyInfo[] GetAllProperties(this Type type)
+        {
+            if (type.IsInterface())
+            {
+                var propertyInfos = new List<PropertyInfo>();
+
+                var considered = new List<Type>();
+                var queue = new Queue<Type>();
+                considered.Add(type);
+                queue.Enqueue(type);
+
+                while (queue.Count > 0)
+                {
+                    var subType = queue.Dequeue();
+                    foreach (var subInterface in subType.GetTypeInterfaces())
+                    {
+                        if (considered.Contains(subInterface)) continue;
+
+                        considered.Add(subInterface);
+                        queue.Enqueue(subInterface);
+                    }
+
+                    var typeProperties = subType.GetTypesProperties();
+
+                    var newPropertyInfos = typeProperties
+                        .Where(x => !propertyInfos.Contains(x));
+
+                    propertyInfos.InsertRange(0, newPropertyInfos);
+                }
+
+                return propertyInfos.ToArray();
+            }
+
+            return type.GetTypesProperties()
+                .Where(t => t.GetIndexParameters().Length == 0) // ignore indexed properties
+                .ToArray();
+        }
+
+        public static PropertyInfo[] GetPublicProperties(this Type type)
+        {
+            if (type.IsInterface())
+            {
+                var propertyInfos = new List<PropertyInfo>();
+
+                var considered = new List<Type>();
+                var queue = new Queue<Type>();
+                considered.Add(type);
+                queue.Enqueue(type);
+
+                while (queue.Count > 0)
+                {
+                    var subType = queue.Dequeue();
+                    foreach (var subInterface in subType.GetTypeInterfaces())
+                    {
+                        if (considered.Contains(subInterface)) continue;
+
+                        considered.Add(subInterface);
+                        queue.Enqueue(subInterface);
+                    }
+
+                    var typeProperties = subType.GetTypesPublicProperties();
+
+                    var newPropertyInfos = typeProperties
+                        .Where(x => !propertyInfos.Contains(x));
+
+                    propertyInfos.InsertRange(0, newPropertyInfos);
+                }
+
+                return propertyInfos.ToArray();
+            }
+
+            return type.GetTypesPublicProperties()
+                .Where(t => t.GetIndexParameters().Length == 0) // ignore indexed properties
+                .ToArray();
+        }
+
+        public const string DataMember = "DataMemberAttribute";
+
+        internal static string[] IgnoreAttributesNamed = new[] {
+            "IgnoreDataMemberAttribute",
+            "JsonIgnoreAttribute"
+        };
+
+        public static PropertyInfo[] GetSerializableProperties(this Type type)
+        {
+            var properties = type.IsDto()
+                ? type.GetAllProperties()
+                : type.GetPublicProperties();
+            return properties.OnlySerializableProperties(type);
+        }
+
+
+        private static List<Type> _excludeTypes = new List<Type> { typeof(Stream) };
+
+        public static PropertyInfo[] OnlySerializableProperties(this PropertyInfo[] properties, Type type = null)
+        {
+            var isDto = type.IsDto();
+            var readableProperties = properties.Where(x => x.PropertyGetMethod(nonPublic: isDto) != null);
+
+            if (isDto)
+            {
+                return readableProperties.Where(attr =>
+                    attr.HasAttribute<DataMemberAttribute>()).ToArray();
+            }
+
+            // else return those properties that are not decorated with IgnoreDataMember
+            return readableProperties
+                .Where(prop => prop.AllAttributes()
+                    .All(attr =>
+                    {
+                        var name = attr.GetType().Name;
+                        return !IgnoreAttributesNamed.Contains(name);
+                    }))
+                .Where(prop => !_excludeTypes.Contains(prop.PropertyType))
+                .ToArray();
+        }
+    }
+
+    public static class PlatformExtensions //Because WinRT is a POS
+    {
+        public static bool IsInterface(this Type type)
+        {
+            return type.GetTypeInfo().IsInterface;
+        }
+
+        public static bool IsGeneric(this Type type)
+        {
+            return type.GetTypeInfo().IsGenericType;
+        }
+
+        public static Type BaseType(this Type type)
+        {
+            return type.GetTypeInfo().BaseType;
+        }
+
+        public static Type[] GetTypeInterfaces(this Type type)
+        {
+            return type.GetTypeInfo().ImplementedInterfaces.ToArray();
+        }
+
+        internal static PropertyInfo[] GetTypesPublicProperties(this Type subType)
+        {
+            var pis = new List<PropertyInfo>();
+            foreach (var pi in subType.GetRuntimeProperties())
+            {
+                var mi = pi.GetMethod ?? pi.SetMethod;
+                if (mi != null && mi.IsStatic) continue;
+                pis.Add(pi);
+            }
+            return pis.ToArray();
+        }
+
+        internal static PropertyInfo[] GetTypesProperties(this Type subType)
+        {
+            var pis = new List<PropertyInfo>();
+            foreach (var pi in subType.GetRuntimeProperties())
+            {
+                var mi = pi.GetMethod ?? pi.SetMethod;
+                if (mi != null && mi.IsStatic) continue;
+                pis.Add(pi);
+            }
+            return pis.ToArray();
+        }
+
+        public static bool HasAttribute<T>(this Type type)
+        {
+            return type.AllAttributes().Any(x => x.GetType() == typeof(T));
+        }
+
+        public static bool HasAttribute<T>(this PropertyInfo pi)
+        {
+            return pi.AllAttributes().Any(x => x.GetType() == typeof(T));
+        }
+
+        public static bool IsDto(this Type type)
+        {
+            if (type == null)
+                return false;
+
+            return type.HasAttribute<DataContractAttribute>();
+        }
+
+        public static MethodInfo PropertyGetMethod(this PropertyInfo pi, bool nonPublic = false)
+        {
+            return pi.GetMethod;
+        }
+
+        public static object[] AllAttributes(this PropertyInfo propertyInfo)
+        {
+            return propertyInfo.GetCustomAttributes(true).ToArray();
+        }
+
+        public static object[] AllAttributes(this PropertyInfo propertyInfo, Type attrType)
+        {
+            return propertyInfo.GetCustomAttributes(true).Where(x => attrType.IsInstanceOf(x.GetType())).ToArray();
+        }
+
+        public static object[] AllAttributes(this Type type)
+        {
+            return type.GetTypeInfo().GetCustomAttributes(true).ToArray();
+        }
+
+        public static TAttr[] AllAttributes<TAttr>(this PropertyInfo pi)
+        {
+            return pi.AllAttributes(typeof(TAttr)).Cast<TAttr>().ToArray();
+        }
+
+        public static TAttr[] AllAttributes<TAttr>(this Type type)
+            where TAttr : Attribute
+        {
+            return type.GetTypeInfo().GetCustomAttributes<TAttr>(true).ToArray();
+        }
+    }
+}
diff --git a/ServiceStack/ServiceStack.csproj b/ServiceStack/ServiceStack.csproj
new file mode 100644
index 000000000..3402339a6
--- /dev/null
+++ b/ServiceStack/ServiceStack.csproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{680A1709-25EB-4D52-A87F-EE03FFD94BAA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ServiceStack</RootNamespace>
+    <AssemblyName>ServiceStack</AssemblyName>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;MONO</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DocumentationFile>
+    </DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Signed|AnyCPU'">
+    <OutputPath>bin\Signed\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\ServiceStack.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="HttpUtils.cs" />
+    <Compile Include="Host\ContentTypes.cs" />
+    <Compile Include="ReflectionExtensions.cs" />
+    <Compile Include="StringMapTypeDeserializer.cs" />
+    <Compile Include="Host\HttpResponseStreamWrapper.cs" />
+    <Compile Include="HttpResult.cs" />
+    <Compile Include="ServiceStackHost.cs" />
+    <Compile Include="ServiceStackHost.Runtime.cs" />
+    <Compile Include="Host\ServiceExec.cs" />
+    <Compile Include="UrlExtensions.cs" />
+    <Compile Include="Host\ActionContext.cs" />
+    <Compile Include="HttpRequestExtensions.cs" />
+    <Compile Include="Host\RestPath.cs" />
+    <Compile Include="Host\ServiceController.cs" />
+    <Compile Include="Host\ServiceMetadata.cs" />
+    <Compile Include="Host\RestHandler.cs" />
+    <Compile Include="HttpResponseExtensionsInternal.cs" />
+    <Compile Include="HttpHandlerFactory.cs" />
+    <Compile Include="FilterAttributeCache.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
+      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
+      <Name>MediaBrowser.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/ServiceStack/ServiceStack.nuget.targets b/ServiceStack/ServiceStack.nuget.targets
new file mode 100644
index 000000000..e69ce0e64
--- /dev/null
+++ b/ServiceStack/ServiceStack.nuget.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
+    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/ServiceStack/ServiceStack.xproj b/ServiceStack/ServiceStack.xproj
new file mode 100644
index 000000000..ba8f8b8f2
--- /dev/null
+++ b/ServiceStack/ServiceStack.xproj
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>b2d733ab-620e-4c53-88a4-4b6638ab6a7a</ProjectGuid>
+    <RootNamespace>ServiceStack</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/ServiceStack/ServiceStackHost.Runtime.cs b/ServiceStack/ServiceStackHost.Runtime.cs
new file mode 100644
index 000000000..1a1656a0e
--- /dev/null
+++ b/ServiceStack/ServiceStackHost.Runtime.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Service Stack LLC. All Rights Reserved.
+// License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
+
+
+using MediaBrowser.Model.Services;
+using ServiceStack.Support.WebHost;
+
+namespace ServiceStack
+{
+    public abstract partial class ServiceStackHost
+    {
+        /// <summary>
+        /// Applies the request filters. Returns whether or not the request has been handled 
+        /// and no more processing should be done.
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool ApplyRequestFilters(IRequest req, IResponse res, object requestDto)
+        {
+            if (res.IsClosed) return res.IsClosed;
+
+            //Exec all RequestFilter attributes with Priority < 0
+            var attributes = FilterAttributeCache.GetRequestFilterAttributes(requestDto.GetType());
+            var i = 0;
+            for (; i < attributes.Length && attributes[i].Priority < 0; i++)
+            {
+                var attribute = attributes[i];
+                attribute.RequestFilter(req, res, requestDto);
+                if (res.IsClosed) return res.IsClosed;
+            }
+
+            if (res.IsClosed) return res.IsClosed;
+
+            //Exec global filters
+            foreach (var requestFilter in GlobalRequestFilters)
+            {
+                requestFilter(req, res, requestDto);
+                if (res.IsClosed) return res.IsClosed;
+            }
+
+            //Exec remaining RequestFilter attributes with Priority >= 0
+            for (; i < attributes.Length && attributes[i].Priority >= 0; i++)
+            {
+                var attribute = attributes[i];
+                attribute.RequestFilter(req, res, requestDto);
+                if (res.IsClosed) return res.IsClosed;
+            }
+
+            return res.IsClosed;
+        }
+
+        /// <summary>
+        /// Applies the response filters. Returns whether or not the request has been handled 
+        /// and no more processing should be done.
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool ApplyResponseFilters(IRequest req, IResponse res, object response)
+        {
+            if (response != null)
+            {
+                if (res.IsClosed) return res.IsClosed;
+            }
+
+            //Exec global filters
+            foreach (var responseFilter in GlobalResponseFilters)
+            {
+                responseFilter(req, res, response);
+                if (res.IsClosed) return res.IsClosed;
+            }
+
+            return res.IsClosed;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/ServiceStack/ServiceStackHost.cs b/ServiceStack/ServiceStackHost.cs
new file mode 100644
index 000000000..8a1db25e4
--- /dev/null
+++ b/ServiceStack/ServiceStackHost.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Service Stack LLC. All Rights Reserved.
+// License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
+
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Services;
+using ServiceStack.Host;
+
+namespace ServiceStack
+{
+    public abstract partial class ServiceStackHost : IDisposable
+    {
+        public static ServiceStackHost Instance { get; protected set; }
+
+        protected ServiceStackHost(string serviceName)
+        {
+            ServiceName = serviceName;
+            ServiceController = CreateServiceController();
+
+            RestPaths = new List<RestPath>();
+            Metadata = new ServiceMetadata();
+            GlobalRequestFilters = new List<Action<IRequest, IResponse, object>>();
+            GlobalResponseFilters = new List<Action<IRequest, IResponse, object>>();
+        }
+
+        public abstract void Configure();
+
+        public abstract object CreateInstance(Type type);
+
+        protected abstract ServiceController CreateServiceController();
+
+        public virtual ServiceStackHost Init()
+        {
+            Instance = this;
+
+            ServiceController.Init();
+            Configure();
+
+            ServiceController.AfterInit();
+
+            return this;
+        }
+
+        public virtual ServiceStackHost Start(string urlBase)
+        {
+            throw new NotImplementedException("Start(listeningAtUrlBase) is not supported by this AppHost");
+        }
+
+        public string ServiceName { get; set; }
+
+        public ServiceMetadata Metadata { get; set; }
+
+        public ServiceController ServiceController { get; set; }
+
+        public List<RestPath> RestPaths = new List<RestPath>();
+
+        public List<Action<IRequest, IResponse, object>> GlobalRequestFilters { get; set; }
+
+        public List<Action<IRequest, IResponse, object>> GlobalResponseFilters { get; set; }
+
+        public abstract T TryResolve<T>();
+        public abstract T Resolve<T>();
+
+        public virtual MediaBrowser.Model.Services.RouteAttribute[] GetRouteAttributes(Type requestType)
+        {
+            return requestType.AllAttributes<MediaBrowser.Model.Services.RouteAttribute>();
+        }
+
+        public abstract object GetTaskResult(Task task, string requestName);
+
+        public abstract Func<string, object> GetParseFn(Type propertyType);
+
+        public abstract void SerializeToJson(object o, Stream stream);
+        public abstract void SerializeToXml(object o, Stream stream);
+        public abstract object DeserializeXml(Type type, Stream stream);
+        public abstract object DeserializeJson(Type type, Stream stream);
+
+        public virtual void Dispose()
+        {
+            //JsConfig.Reset(); //Clears Runtime Attributes
+
+            Instance = null;
+        }
+
+        protected abstract ILogger Logger
+        {
+            get;
+        }
+
+        public void OnLogError(Type type, string message)
+        {
+            Logger.Error(message);
+        }
+
+        public void OnLogError(Type type, string message, Exception ex)
+        {
+            Logger.ErrorException(message, ex);
+        }
+    }
+}
diff --git a/ServiceStack/StringMapTypeDeserializer.cs b/ServiceStack/StringMapTypeDeserializer.cs
new file mode 100644
index 000000000..762e8aaff
--- /dev/null
+++ b/ServiceStack/StringMapTypeDeserializer.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Linq;
+using System.Reflection;
+
+namespace ServiceStack.Serialization
+{
+    /// <summary>
+    /// Serializer cache of delegates required to create a type from a string map (e.g. for REST urls)
+    /// </summary>
+    public class StringMapTypeDeserializer
+    {
+        internal class PropertySerializerEntry
+        {
+            public PropertySerializerEntry(Action<object,object> propertySetFn, Func<string, object> propertyParseStringFn)
+            {
+                PropertySetFn = propertySetFn;
+                PropertyParseStringFn = propertyParseStringFn;
+            }
+
+            public Action<object, object> PropertySetFn;
+            public Func<string,object> PropertyParseStringFn;
+            public Type PropertyType;
+        }
+
+        private readonly Type type;
+        private readonly Dictionary<string, PropertySerializerEntry> propertySetterMap
+            = new Dictionary<string, PropertySerializerEntry>(StringComparer.OrdinalIgnoreCase);
+
+        public Func<string, object> GetParseFn(Type propertyType)
+        {
+            //Don't JSV-decode string values for string properties
+            if (propertyType == typeof(string))
+                return s => s;
+
+            return ServiceStackHost.Instance.GetParseFn(propertyType);
+        }
+
+        public StringMapTypeDeserializer(Type type)
+        {
+            this.type = type;
+
+            foreach (var propertyInfo in type.GetSerializableProperties())
+            {
+                var propertySetFn = TypeAccessor.GetSetPropertyMethod(type, propertyInfo);
+                var propertyType = propertyInfo.PropertyType;
+                var propertyParseStringFn = GetParseFn(propertyType);
+                var propertySerializer = new PropertySerializerEntry(propertySetFn, propertyParseStringFn) { PropertyType = propertyType };
+
+                var attr = propertyInfo.AllAttributes<DataMemberAttribute>().FirstOrDefault();
+                if (attr != null && attr.Name != null)
+                {
+                    propertySetterMap[attr.Name] = propertySerializer;
+                }
+                propertySetterMap[propertyInfo.Name] = propertySerializer;
+            }
+        }
+
+        public object PopulateFromMap(object instance, IDictionary<string, string> keyValuePairs)
+        {
+            string propertyName = null;
+            string propertyTextValue = null;
+            PropertySerializerEntry propertySerializerEntry = null;
+
+            if (instance == null)
+                instance = ServiceStackHost.Instance.CreateInstance(type);
+
+            foreach (var pair in keyValuePairs.Where(x => !string.IsNullOrEmpty(x.Value)))
+            {
+                propertyName = pair.Key;
+                propertyTextValue = pair.Value;
+
+                if (!propertySetterMap.TryGetValue(propertyName, out propertySerializerEntry))
+                {
+                    if (propertyName == "v")
+                    {
+                        continue;
+                    }
+
+                    continue;
+                }
+
+                if (propertySerializerEntry.PropertySetFn == null)
+                {
+                    continue;
+                }
+
+                if (propertySerializerEntry.PropertyType == typeof(bool))
+                {
+                    //InputExtensions.cs#530 MVC Checkbox helper emits extra hidden input field, generating 2 values, first is the real value
+                    propertyTextValue = LeftPart(propertyTextValue, ',');
+                }
+
+                var value = propertySerializerEntry.PropertyParseStringFn(propertyTextValue);
+                if (value == null)
+                {
+                    continue;
+                }
+                propertySerializerEntry.PropertySetFn(instance, value);
+            }
+
+            return instance;
+        }
+
+        public static string LeftPart(string strVal, char needle)
+        {
+            if (strVal == null) return null;
+            var pos = strVal.IndexOf(needle);
+            return pos == -1
+                ? strVal
+                : strVal.Substring(0, pos);
+        }
+    }
+
+    internal class TypeAccessor
+    {
+        public static Action<object, object> GetSetPropertyMethod(Type type, PropertyInfo propertyInfo)
+        {
+            if (!propertyInfo.CanWrite || propertyInfo.GetIndexParameters().Any()) return null;
+
+            var setMethodInfo = propertyInfo.SetMethod;
+            return (instance, value) => setMethodInfo.Invoke(instance, new[] { value });
+        }
+    }
+}
diff --git a/ServiceStack/UrlExtensions.cs b/ServiceStack/UrlExtensions.cs
new file mode 100644
index 000000000..7b5a50ef1
--- /dev/null
+++ b/ServiceStack/UrlExtensions.cs
@@ -0,0 +1,33 @@
+using System;
+
+namespace ServiceStack
+{
+    /// <summary>
+    /// Donated by Ivan Korneliuk from his post:
+    /// http://korneliuk.blogspot.com/2012/08/servicestack-reusing-dtos.html
+    /// 
+    /// Modified to only allow using routes matching the supplied HTTP Verb
+    /// </summary>
+    public static class UrlExtensions
+    {
+        public static string GetOperationName(this Type type)
+        {
+            var typeName = type.FullName != null //can be null, e.g. generic types
+                ? LeftPart(type.FullName, "[[")   //Generic Fullname
+                    .Replace(type.Namespace + ".", "") //Trim Namespaces
+                    .Replace("+", ".") //Convert nested into normal type
+                : type.Name;
+
+            return type.IsGenericParameter ? "'" + typeName : typeName;
+        }
+
+        public static string LeftPart(string strVal, string needle)
+        {
+            if (strVal == null) return null;
+            var pos = strVal.IndexOf(needle, StringComparison.OrdinalIgnoreCase);
+            return pos == -1
+                ? strVal
+                : strVal.Substring(0, pos);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ServiceStack/packages.config b/ServiceStack/packages.config
new file mode 100644
index 000000000..6b8deb9c9
--- /dev/null
+++ b/ServiceStack/packages.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+</packages>
\ No newline at end of file
diff --git a/ServiceStack/project.json b/ServiceStack/project.json
new file mode 100644
index 000000000..fbbe9eaf3
--- /dev/null
+++ b/ServiceStack/project.json
@@ -0,0 +1,17 @@
+{
+    "frameworks":{
+        "netstandard1.6":{
+           "dependencies":{
+                "NETStandard.Library":"1.6.0",
+            }
+        },
+        ".NETPortable,Version=v4.5,Profile=Profile7":{
+            "buildOptions": {
+                "define": [  ]
+            },
+            "frameworkAssemblies":{
+                
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/ByteOrder.cs b/SocketHttpListener.Portable/ByteOrder.cs
new file mode 100644
index 000000000..f5db52fd7
--- /dev/null
+++ b/SocketHttpListener.Portable/ByteOrder.cs
@@ -0,0 +1,17 @@
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the values that indicate whether the byte order is a Little-endian or Big-endian.
+  /// </summary>
+  public enum ByteOrder : byte
+  {
+    /// <summary>
+    /// Indicates a Little-endian.
+    /// </summary>
+    Little,
+    /// <summary>
+    /// Indicates a Big-endian.
+    /// </summary>
+    Big
+  }
+}
diff --git a/SocketHttpListener.Portable/CloseEventArgs.cs b/SocketHttpListener.Portable/CloseEventArgs.cs
new file mode 100644
index 000000000..b1bb4b196
--- /dev/null
+++ b/SocketHttpListener.Portable/CloseEventArgs.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Text;
+
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the event data associated with a <see cref="WebSocket.OnClose"/> event.
+  /// </summary>
+  /// <remarks>
+  /// A <see cref="WebSocket.OnClose"/> event occurs when the WebSocket connection has been closed.
+  /// If you would like to get the reason for the close, you should access the <see cref="Code"/> or
+  /// <see cref="Reason"/> property.
+  /// </remarks>
+  public class CloseEventArgs : EventArgs
+  {
+    #region Private Fields
+
+    private bool   _clean;
+    private ushort _code;
+    private string _reason;
+
+    #endregion
+
+    #region Internal Constructors
+
+    internal CloseEventArgs (PayloadData payload)
+    {
+      var data = payload.ApplicationData;
+      var len = data.Length;
+      _code = len > 1
+              ? data.SubArray (0, 2).ToUInt16 (ByteOrder.Big)
+              : (ushort) CloseStatusCode.NoStatusCode;
+
+      _reason = len > 2
+                ? GetUtf8String(data.SubArray (2, len - 2))
+                : String.Empty;
+    }
+
+      private string GetUtf8String(byte[] bytes)
+      {
+          return Encoding.UTF8.GetString(bytes, 0, bytes.Length);
+      }
+
+    #endregion
+
+    #region Public Properties
+
+    /// <summary>
+    /// Gets the status code for the close.
+    /// </summary>
+    /// <value>
+    /// A <see cref="ushort"/> that represents the status code for the close if any.
+    /// </value>
+    public ushort Code {
+      get {
+        return _code;
+      }
+    }
+
+    /// <summary>
+    /// Gets the reason for the close.
+    /// </summary>
+    /// <value>
+    /// A <see cref="string"/> that represents the reason for the close if any.
+    /// </value>
+    public string Reason {
+      get {
+        return _reason;
+      }
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether the WebSocket connection has been closed cleanly.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if the WebSocket connection has been closed cleanly; otherwise, <c>false</c>.
+    /// </value>
+    public bool WasClean {
+      get {
+        return _clean;
+      }
+
+      internal set {
+        _clean = value;
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/SocketHttpListener.Portable/CloseStatusCode.cs b/SocketHttpListener.Portable/CloseStatusCode.cs
new file mode 100644
index 000000000..62a268bce
--- /dev/null
+++ b/SocketHttpListener.Portable/CloseStatusCode.cs
@@ -0,0 +1,94 @@
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the values of the status code for the WebSocket connection close.
+  /// </summary>
+  /// <remarks>
+  ///   <para>
+  ///   The values of the status code are defined in
+  ///   <see href="http://tools.ietf.org/html/rfc6455#section-7.4">Section 7.4</see>
+  ///   of RFC 6455.
+  ///   </para>
+  ///   <para>
+  ///   "Reserved value" must not be set as a status code in a close control frame
+  ///   by an endpoint. It's designated for use in applications expecting a status
+  ///   code to indicate that the connection was closed due to the system grounds.
+  ///   </para>
+  /// </remarks>
+  public enum CloseStatusCode : ushort
+  {
+    /// <summary>
+    /// Equivalent to close status 1000.
+    /// Indicates a normal close.
+    /// </summary>
+    Normal = 1000,
+    /// <summary>
+    /// Equivalent to close status 1001.
+    /// Indicates that an endpoint is going away.
+    /// </summary>
+    Away = 1001,
+    /// <summary>
+    /// Equivalent to close status 1002.
+    /// Indicates that an endpoint is terminating the connection due to a protocol error.
+    /// </summary>
+    ProtocolError = 1002,
+    /// <summary>
+    /// Equivalent to close status 1003.
+    /// Indicates that an endpoint is terminating the connection because it has received
+    /// an unacceptable type message.
+    /// </summary>
+    IncorrectData = 1003,
+    /// <summary>
+    /// Equivalent to close status 1004.
+    /// Still undefined. Reserved value.
+    /// </summary>
+    Undefined = 1004,
+    /// <summary>
+    /// Equivalent to close status 1005.
+    /// Indicates that no status code was actually present. Reserved value.
+    /// </summary>
+    NoStatusCode = 1005,
+    /// <summary>
+    /// Equivalent to close status 1006.
+    /// Indicates that the connection was closed abnormally. Reserved value.
+    /// </summary>
+    Abnormal = 1006,
+    /// <summary>
+    /// Equivalent to close status 1007.
+    /// Indicates that an endpoint is terminating the connection because it has received
+    /// a message that contains a data that isn't consistent with the type of the message.
+    /// </summary>
+    InconsistentData = 1007,
+    /// <summary>
+    /// Equivalent to close status 1008.
+    /// Indicates that an endpoint is terminating the connection because it has received
+    /// a message that violates its policy.
+    /// </summary>
+    PolicyViolation = 1008,
+    /// <summary>
+    /// Equivalent to close status 1009.
+    /// Indicates that an endpoint is terminating the connection because it has received
+    /// a message that is too big to process.
+    /// </summary>
+    TooBig = 1009,
+    /// <summary>
+    /// Equivalent to close status 1010.
+    /// Indicates that the client is terminating the connection because it has expected
+    /// the server to negotiate one or more extension, but the server didn't return them
+    /// in the handshake response.
+    /// </summary>
+    IgnoreExtension = 1010,
+    /// <summary>
+    /// Equivalent to close status 1011.
+    /// Indicates that the server is terminating the connection because it has encountered
+    /// an unexpected condition that prevented it from fulfilling the request.
+    /// </summary>
+    ServerError = 1011,
+    /// <summary>
+    /// Equivalent to close status 1015.
+    /// Indicates that the connection was closed due to a failure to perform a TLS handshake.
+    /// Reserved value.
+    /// </summary>
+    TlsHandshakeFailure = 1015
+  }
+}
diff --git a/SocketHttpListener.Portable/CompressionMethod.cs b/SocketHttpListener.Portable/CompressionMethod.cs
new file mode 100644
index 000000000..36a48d94c
--- /dev/null
+++ b/SocketHttpListener.Portable/CompressionMethod.cs
@@ -0,0 +1,23 @@
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the values of the compression method used to compress the message on the WebSocket
+  /// connection.
+  /// </summary>
+  /// <remarks>
+  /// The values of the compression method are defined in
+  /// <see href="http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression-09">Compression
+  /// Extensions for WebSocket</see>.
+  /// </remarks>
+  public enum CompressionMethod : byte
+  {
+    /// <summary>
+    /// Indicates non compression.
+    /// </summary>
+    None,
+    /// <summary>
+    /// Indicates using DEFLATE.
+    /// </summary>
+    Deflate
+  }
+}
diff --git a/SocketHttpListener.Portable/ErrorEventArgs.cs b/SocketHttpListener.Portable/ErrorEventArgs.cs
new file mode 100644
index 000000000..bf1d6fc95
--- /dev/null
+++ b/SocketHttpListener.Portable/ErrorEventArgs.cs
@@ -0,0 +1,46 @@
+using System;
+
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the event data associated with a <see cref="WebSocket.OnError"/> event.
+  /// </summary>
+  /// <remarks>
+  /// A <see cref="WebSocket.OnError"/> event occurs when the <see cref="WebSocket"/> gets an error.
+  /// If you would like to get the error message, you should access the <see cref="Message"/>
+  /// property.
+  /// </remarks>
+  public class ErrorEventArgs : EventArgs
+  {
+    #region Private Fields
+
+    private string _message;
+
+    #endregion
+
+    #region Internal Constructors
+
+    internal ErrorEventArgs (string message)
+    {
+      _message = message;
+    }
+
+    #endregion
+
+    #region Public Properties
+
+    /// <summary>
+    /// Gets the error message.
+    /// </summary>
+    /// <value>
+    /// A <see cref="string"/> that represents the error message.
+    /// </value>
+    public string Message {
+      get {
+        return _message;
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/SocketHttpListener.Portable/Ext.cs b/SocketHttpListener.Portable/Ext.cs
new file mode 100644
index 000000000..303263d0b
--- /dev/null
+++ b/SocketHttpListener.Portable/Ext.cs
@@ -0,0 +1,1089 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.IO.Compression;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+using SocketHttpListener.Net;
+using HttpListenerResponse = SocketHttpListener.Net.HttpListenerResponse;
+using HttpStatusCode = SocketHttpListener.Net.HttpStatusCode;
+
+namespace SocketHttpListener
+{
+    /// <summary>
+    /// Provides a set of static methods for the websocket-sharp.
+    /// </summary>
+    public static class Ext
+    {
+        #region Private Const Fields
+
+        private const string _tspecials = "()<>@,;:\\\"/[]?={} \t";
+
+        #endregion
+
+        #region Private Methods
+
+        private static MemoryStream compress(this Stream stream)
+        {
+            var output = new MemoryStream();
+            if (stream.Length == 0)
+                return output;
+
+            stream.Position = 0;
+            using (var ds = new DeflateStream(output, CompressionMode.Compress, true))
+            {
+                stream.CopyTo(ds);
+                //ds.Close(); // "BFINAL" set to 1.
+                output.Position = 0;
+
+                return output;
+            }
+        }
+
+        private static byte[] decompress(this byte[] value)
+        {
+            if (value.Length == 0)
+                return value;
+
+            using (var input = new MemoryStream(value))
+            {
+                return input.decompressToArray();
+            }
+        }
+
+        private static MemoryStream decompress(this Stream stream)
+        {
+            var output = new MemoryStream();
+            if (stream.Length == 0)
+                return output;
+
+            stream.Position = 0;
+            using (var ds = new DeflateStream(stream, CompressionMode.Decompress, true))
+            {
+                ds.CopyTo(output, true);
+                return output;
+            }
+        }
+
+        private static byte[] decompressToArray(this Stream stream)
+        {
+            using (var decomp = stream.decompress())
+            {
+                return decomp.ToArray();
+            }
+        }
+
+        private static byte[] readBytes(this Stream stream, byte[] buffer, int offset, int length)
+        {
+            var len = stream.Read(buffer, offset, length);
+            if (len < 1)
+                return buffer.SubArray(0, offset);
+
+            var tmp = 0;
+            while (len < length)
+            {
+                tmp = stream.Read(buffer, offset + len, length - len);
+                if (tmp < 1)
+                    break;
+
+                len += tmp;
+            }
+
+            return len < length
+                   ? buffer.SubArray(0, offset + len)
+                   : buffer;
+        }
+
+        private static bool readBytes(
+          this Stream stream, byte[] buffer, int offset, int length, Stream dest)
+        {
+            var bytes = stream.readBytes(buffer, offset, length);
+            var len = bytes.Length;
+            dest.Write(bytes, 0, len);
+
+            return len == offset + length;
+        }
+
+        #endregion
+
+        #region Internal Methods
+
+        internal static byte[] Append(this ushort code, string reason)
+        {
+            using (var buffer = new MemoryStream())
+            {
+                var tmp = code.ToByteArrayInternally(ByteOrder.Big);
+                buffer.Write(tmp, 0, 2);
+                if (reason != null && reason.Length > 0)
+                {
+                    tmp = Encoding.UTF8.GetBytes(reason);
+                    buffer.Write(tmp, 0, tmp.Length);
+                }
+
+                return buffer.ToArray();
+            }
+        }
+
+        internal static string CheckIfClosable(this WebSocketState state)
+        {
+            return state == WebSocketState.Closing
+                   ? "While closing the WebSocket connection."
+                   : state == WebSocketState.Closed
+                     ? "The WebSocket connection has already been closed."
+                     : null;
+        }
+
+        internal static string CheckIfOpen(this WebSocketState state)
+        {
+            return state == WebSocketState.Connecting
+                   ? "A WebSocket connection isn't established."
+                   : state == WebSocketState.Closing
+                     ? "While closing the WebSocket connection."
+                     : state == WebSocketState.Closed
+                       ? "The WebSocket connection has already been closed."
+                       : null;
+        }
+
+        internal static string CheckIfValidControlData(this byte[] data, string paramName)
+        {
+            return data.Length > 125
+                   ? String.Format("'{0}' length must be less.", paramName)
+                   : null;
+        }
+
+        internal static string CheckIfValidSendData(this byte[] data)
+        {
+            return data == null
+                   ? "'data' must not be null."
+                   : null;
+        }
+
+        internal static string CheckIfValidSendData(this string data)
+        {
+            return data == null
+                   ? "'data' must not be null."
+                   : null;
+        }
+
+        internal static void Close(this HttpListenerResponse response, HttpStatusCode code)
+        {
+            response.StatusCode = (int)code;
+            response.OutputStream.Dispose();
+        }
+
+        internal static Stream Compress(this Stream stream, CompressionMethod method)
+        {
+            return method == CompressionMethod.Deflate
+                   ? stream.compress()
+                   : stream;
+        }
+
+        internal static bool Contains<T>(this IEnumerable<T> source, Func<T, bool> condition)
+        {
+            foreach (T elm in source)
+                if (condition(elm))
+                    return true;
+
+            return false;
+        }
+
+        internal static void CopyTo(this Stream src, Stream dest, bool setDefaultPosition)
+        {
+            var readLen = 0;
+            var bufferLen = 256;
+            var buffer = new byte[bufferLen];
+            while ((readLen = src.Read(buffer, 0, bufferLen)) > 0)
+            {
+                dest.Write(buffer, 0, readLen);
+            }
+
+            if (setDefaultPosition)
+                dest.Position = 0;
+        }
+
+        internal static byte[] Decompress(this byte[] value, CompressionMethod method)
+        {
+            return method == CompressionMethod.Deflate
+                   ? value.decompress()
+                   : value;
+        }
+
+        internal static byte[] DecompressToArray(this Stream stream, CompressionMethod method)
+        {
+            return method == CompressionMethod.Deflate
+                   ? stream.decompressToArray()
+                   : stream.ToByteArray();
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="int"/> equals the specified <see cref="char"/>,
+        /// and invokes the specified Action&lt;int&gt; delegate at the same time.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if <paramref name="value"/> equals <paramref name="c"/>;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        /// <param name="value">
+        /// An <see cref="int"/> to compare.
+        /// </param>
+        /// <param name="c">
+        /// A <see cref="char"/> to compare.
+        /// </param>
+        /// <param name="action">
+        /// An Action&lt;int&gt; delegate that references the method(s) called at
+        /// the same time as comparing. An <see cref="int"/> parameter to pass to
+        /// the method(s) is <paramref name="value"/>.
+        /// </param>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <paramref name="value"/> isn't between 0 and 255.
+        /// </exception>
+        internal static bool EqualsWith(this int value, char c, Action<int> action)
+        {
+            if (value < 0 || value > 255)
+                throw new ArgumentOutOfRangeException("value");
+
+            action(value);
+            return value == c - 0;
+        }
+
+        internal static string GetMessage(this CloseStatusCode code)
+        {
+            return code == CloseStatusCode.ProtocolError
+                   ? "A WebSocket protocol error has occurred."
+                   : code == CloseStatusCode.IncorrectData
+                     ? "An incorrect data has been received."
+                     : code == CloseStatusCode.Abnormal
+                       ? "An exception has occurred."
+                       : code == CloseStatusCode.InconsistentData
+                         ? "An inconsistent data has been received."
+                         : code == CloseStatusCode.PolicyViolation
+                           ? "A policy violation has occurred."
+                           : code == CloseStatusCode.TooBig
+                             ? "A too big data has been received."
+                             : code == CloseStatusCode.IgnoreExtension
+                               ? "WebSocket client did not receive expected extension(s)."
+                               : code == CloseStatusCode.ServerError
+                                 ? "WebSocket server got an internal error."
+                                 : code == CloseStatusCode.TlsHandshakeFailure
+                                   ? "An error has occurred while handshaking."
+                                   : String.Empty;
+        }
+
+        internal static string GetNameInternal(this string nameAndValue, string separator)
+        {
+            var i = nameAndValue.IndexOf(separator);
+            return i > 0
+                   ? nameAndValue.Substring(0, i).Trim()
+                   : null;
+        }
+
+        internal static string GetValueInternal(this string nameAndValue, string separator)
+        {
+            var i = nameAndValue.IndexOf(separator);
+            return i >= 0 && i < nameAndValue.Length - 1
+                   ? nameAndValue.Substring(i + 1).Trim()
+                   : null;
+        }
+
+        internal static bool IsCompressionExtension(this string value, CompressionMethod method)
+        {
+            return value.StartsWith(method.ToExtensionString());
+        }
+
+        internal static bool IsPortNumber(this int value)
+        {
+            return value > 0 && value < 65536;
+        }
+
+        internal static bool IsReserved(this ushort code)
+        {
+            return code == (ushort)CloseStatusCode.Undefined ||
+                   code == (ushort)CloseStatusCode.NoStatusCode ||
+                   code == (ushort)CloseStatusCode.Abnormal ||
+                   code == (ushort)CloseStatusCode.TlsHandshakeFailure;
+        }
+
+        internal static bool IsReserved(this CloseStatusCode code)
+        {
+            return code == CloseStatusCode.Undefined ||
+                   code == CloseStatusCode.NoStatusCode ||
+                   code == CloseStatusCode.Abnormal ||
+                   code == CloseStatusCode.TlsHandshakeFailure;
+        }
+
+        internal static bool IsText(this string value)
+        {
+            var len = value.Length;
+            for (var i = 0; i < len; i++)
+            {
+                char c = value[i];
+                if (c < 0x20 && !"\r\n\t".Contains(c))
+                    return false;
+
+                if (c == 0x7f)
+                    return false;
+
+                if (c == '\n' && ++i < len)
+                {
+                    c = value[i];
+                    if (!" \t".Contains(c))
+                        return false;
+                }
+            }
+
+            return true;
+        }
+
+        internal static bool IsToken(this string value)
+        {
+            foreach (char c in value)
+                if (c < 0x20 || c >= 0x7f || _tspecials.Contains(c))
+                    return false;
+
+            return true;
+        }
+
+        internal static string Quote(this string value)
+        {
+            return value.IsToken()
+                   ? value
+                   : String.Format("\"{0}\"", value.Replace("\"", "\\\""));
+        }
+
+        internal static byte[] ReadBytes(this Stream stream, int length)
+        {
+            return stream.readBytes(new byte[length], 0, length);
+        }
+
+        internal static byte[] ReadBytes(this Stream stream, long length, int bufferLength)
+        {
+            using (var result = new MemoryStream())
+            {
+                var count = length / bufferLength;
+                var rem = (int)(length % bufferLength);
+
+                var buffer = new byte[bufferLength];
+                var end = false;
+                for (long i = 0; i < count; i++)
+                {
+                    if (!stream.readBytes(buffer, 0, bufferLength, result))
+                    {
+                        end = true;
+                        break;
+                    }
+                }
+
+                if (!end && rem > 0)
+                    stream.readBytes(new byte[rem], 0, rem, result);
+
+                return result.ToArray();
+            }
+        }
+
+        internal static async Task<byte[]> ReadBytesAsync(this Stream stream, int length)
+        {
+            var buffer = new byte[length];
+
+            var len = await stream.ReadAsync(buffer, 0, length).ConfigureAwait(false);
+            var bytes = len < 1
+                ? new byte[0]
+                : len < length
+                  ? stream.readBytes(buffer, len, length - len)
+                  : buffer;
+
+            return bytes;
+        }
+
+        internal static string RemovePrefix(this string value, params string[] prefixes)
+        {
+            var i = 0;
+            foreach (var prefix in prefixes)
+            {
+                if (value.StartsWith(prefix))
+                {
+                    i = prefix.Length;
+                    break;
+                }
+            }
+
+            return i > 0
+                   ? value.Substring(i)
+                   : value;
+        }
+
+        internal static T[] Reverse<T>(this T[] array)
+        {
+            var len = array.Length;
+            T[] reverse = new T[len];
+
+            var end = len - 1;
+            for (var i = 0; i <= end; i++)
+                reverse[i] = array[end - i];
+
+            return reverse;
+        }
+
+        internal static IEnumerable<string> SplitHeaderValue(
+          this string value, params char[] separator)
+        {
+            var len = value.Length;
+            var separators = new string(separator);
+
+            var buffer = new StringBuilder(32);
+            var quoted = false;
+            var escaped = false;
+
+            char c;
+            for (var i = 0; i < len; i++)
+            {
+                c = value[i];
+                if (c == '"')
+                {
+                    if (escaped)
+                        escaped = !escaped;
+                    else
+                        quoted = !quoted;
+                }
+                else if (c == '\\')
+                {
+                    if (i < len - 1 && value[i + 1] == '"')
+                        escaped = true;
+                }
+                else if (separators.Contains(c))
+                {
+                    if (!quoted)
+                    {
+                        yield return buffer.ToString();
+                        buffer.Length = 0;
+
+                        continue;
+                    }
+                }
+                else {
+                }
+
+                buffer.Append(c);
+            }
+
+            if (buffer.Length > 0)
+                yield return buffer.ToString();
+        }
+
+        internal static byte[] ToByteArray(this Stream stream)
+        {
+            using (var output = new MemoryStream())
+            {
+                stream.Position = 0;
+                stream.CopyTo(output);
+
+                return output.ToArray();
+            }
+        }
+
+        internal static byte[] ToByteArrayInternally(this ushort value, ByteOrder order)
+        {
+            var bytes = BitConverter.GetBytes(value);
+            if (!order.IsHostOrder())
+                Array.Reverse(bytes);
+
+            return bytes;
+        }
+
+        internal static byte[] ToByteArrayInternally(this ulong value, ByteOrder order)
+        {
+            var bytes = BitConverter.GetBytes(value);
+            if (!order.IsHostOrder())
+                Array.Reverse(bytes);
+
+            return bytes;
+        }
+
+        internal static string ToExtensionString(
+          this CompressionMethod method, params string[] parameters)
+        {
+            if (method == CompressionMethod.None)
+                return String.Empty;
+
+            var m = String.Format("permessage-{0}", method.ToString().ToLower());
+            if (parameters == null || parameters.Length == 0)
+                return m;
+
+            return String.Format("{0}; {1}", m, parameters.ToString("; "));
+        }
+
+        internal static List<TSource> ToList<TSource>(this IEnumerable<TSource> source)
+        {
+            return new List<TSource>(source);
+        }
+
+        internal static ushort ToUInt16(this byte[] src, ByteOrder srcOrder)
+        {
+            return BitConverter.ToUInt16(src.ToHostOrder(srcOrder), 0);
+        }
+
+        internal static ulong ToUInt64(this byte[] src, ByteOrder srcOrder)
+        {
+            return BitConverter.ToUInt64(src.ToHostOrder(srcOrder), 0);
+        }
+
+        internal static string TrimEndSlash(this string value)
+        {
+            value = value.TrimEnd('/');
+            return value.Length > 0
+                   ? value
+                   : "/";
+        }
+
+        internal static string Unquote(this string value)
+        {
+            var start = value.IndexOf('\"');
+            var end = value.LastIndexOf('\"');
+            if (start < end)
+                value = value.Substring(start + 1, end - start - 1).Replace("\\\"", "\"");
+
+            return value.Trim();
+        }
+
+        internal static void WriteBytes(this Stream stream, byte[] value)
+        {
+            using (var src = new MemoryStream(value))
+            {
+                src.CopyTo(stream);
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Determines whether the specified <see cref="string"/> contains any of characters
+        /// in the specified array of <see cref="char"/>.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if <paramref name="value"/> contains any of <paramref name="chars"/>;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        /// <param name="value">
+        /// A <see cref="string"/> to test.
+        /// </param>
+        /// <param name="chars">
+        /// An array of <see cref="char"/> that contains characters to find.
+        /// </param>
+        public static bool Contains(this string value, params char[] chars)
+        {
+            return chars == null || chars.Length == 0
+                   ? true
+                   : value == null || value.Length == 0
+                     ? false
+                     : value.IndexOfAny(chars) != -1;
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="QueryParamCollection"/> contains the entry
+        /// with the specified <paramref name="name"/>.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if <paramref name="collection"/> contains the entry
+        /// with <paramref name="name"/>; otherwise, <c>false</c>.
+        /// </returns>
+        /// <param name="collection">
+        /// A <see cref="QueryParamCollection"/> to test.
+        /// </param>
+        /// <param name="name">
+        /// A <see cref="string"/> that represents the key of the entry to find.
+        /// </param>
+        public static bool Contains(this QueryParamCollection collection, string name)
+        {
+            return collection == null || collection.Count == 0
+                   ? false
+                   : collection[name] != null;
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="QueryParamCollection"/> contains the entry
+        /// with the specified both <paramref name="name"/> and <paramref name="value"/>.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if <paramref name="collection"/> contains the entry
+        /// with both <paramref name="name"/> and <paramref name="value"/>;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        /// <param name="collection">
+        /// A <see cref="QueryParamCollection"/> to test.
+        /// </param>
+        /// <param name="name">
+        /// A <see cref="string"/> that represents the key of the entry to find.
+        /// </param>
+        /// <param name="value">
+        /// A <see cref="string"/> that represents the value of the entry to find.
+        /// </param>
+        public static bool Contains(this QueryParamCollection collection, string name, string value)
+        {
+            if (collection == null || collection.Count == 0)
+                return false;
+
+            var values = collection[name];
+            if (values == null)
+                return false;
+
+            foreach (var v in values.Split(','))
+                if (v.Trim().Equals(value, StringComparison.OrdinalIgnoreCase))
+                    return true;
+
+            return false;
+        }
+
+        /// <summary>
+        /// Emits the specified <see cref="EventHandler"/> delegate if it isn't <see langword="null"/>.
+        /// </summary>
+        /// <param name="eventHandler">
+        /// A <see cref="EventHandler"/> to emit.
+        /// </param>
+        /// <param name="sender">
+        /// An <see cref="object"/> from which emits this <paramref name="eventHandler"/>.
+        /// </param>
+        /// <param name="e">
+        /// A <see cref="EventArgs"/> that contains no event data.
+        /// </param>
+        public static void Emit(this EventHandler eventHandler, object sender, EventArgs e)
+        {
+            if (eventHandler != null)
+                eventHandler(sender, e);
+        }
+
+        /// <summary>
+        /// Emits the specified <c>EventHandler&lt;TEventArgs&gt;</c> delegate
+        /// if it isn't <see langword="null"/>.
+        /// </summary>
+        /// <param name="eventHandler">
+        /// An <c>EventHandler&lt;TEventArgs&gt;</c> to emit.
+        /// </param>
+        /// <param name="sender">
+        /// An <see cref="object"/> from which emits this <paramref name="eventHandler"/>.
+        /// </param>
+        /// <param name="e">
+        /// A <c>TEventArgs</c> that represents the event data.
+        /// </param>
+        /// <typeparam name="TEventArgs">
+        /// The type of the event data generated by the event.
+        /// </typeparam>
+        public static void Emit<TEventArgs>(
+          this EventHandler<TEventArgs> eventHandler, object sender, TEventArgs e)
+          where TEventArgs : EventArgs
+        {
+            if (eventHandler != null)
+                eventHandler(sender, e);
+        }
+
+        /// <summary>
+        /// Gets the collection of the HTTP cookies from the specified HTTP <paramref name="headers"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="CookieCollection"/> that receives a collection of the HTTP cookies.
+        /// </returns>
+        /// <param name="headers">
+        /// A <see cref="QueryParamCollection"/> that contains a collection of the HTTP headers.
+        /// </param>
+        /// <param name="response">
+        /// <c>true</c> if <paramref name="headers"/> is a collection of the response headers;
+        /// otherwise, <c>false</c>.
+        /// </param>
+        public static CookieCollection GetCookies(this QueryParamCollection headers, bool response)
+        {
+            var name = response ? "Set-Cookie" : "Cookie";
+            return headers == null || !headers.Contains(name)
+                   ? new CookieCollection()
+                   : CookieHelper.Parse(headers[name], response);
+        }
+
+        /// <summary>
+        /// Gets the description of the specified HTTP status <paramref name="code"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string"/> that represents the description of the HTTP status code.
+        /// </returns>
+        /// <param name="code">
+        /// One of <see cref="HttpStatusCode"/> enum values, indicates the HTTP status codes.
+        /// </param>
+        public static string GetDescription(this HttpStatusCode code)
+        {
+            return ((int)code).GetStatusDescription();
+        }
+
+        /// <summary>
+        /// Gets the name from the specified <see cref="string"/> that contains a pair of name and
+        /// value separated by a separator string.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string"/> that represents the name if any; otherwise, <c>null</c>.
+        /// </returns>
+        /// <param name="nameAndValue">
+        /// A <see cref="string"/> that contains a pair of name and value separated by a separator
+        /// string.
+        /// </param>
+        /// <param name="separator">
+        /// A <see cref="string"/> that represents a separator string.
+        /// </param>
+        public static string GetName(this string nameAndValue, string separator)
+        {
+            return (nameAndValue != null && nameAndValue.Length > 0) &&
+                   (separator != null && separator.Length > 0)
+                   ? nameAndValue.GetNameInternal(separator)
+                   : null;
+        }
+
+        /// <summary>
+        /// Gets the name and value from the specified <see cref="string"/> that contains a pair of
+        /// name and value separated by a separator string.
+        /// </summary>
+        /// <returns>
+        /// A <c>KeyValuePair&lt;string, string&gt;</c> that represents the name and value if any.
+        /// </returns>
+        /// <param name="nameAndValue">
+        /// A <see cref="string"/> that contains a pair of name and value separated by a separator
+        /// string.
+        /// </param>
+        /// <param name="separator">
+        /// A <see cref="string"/> that represents a separator string.
+        /// </param>
+        public static KeyValuePair<string, string> GetNameAndValue(
+          this string nameAndValue, string separator)
+        {
+            var name = nameAndValue.GetName(separator);
+            var value = nameAndValue.GetValue(separator);
+            return name != null
+                   ? new KeyValuePair<string, string>(name, value)
+                   : new KeyValuePair<string, string>(null, null);
+        }
+
+        /// <summary>
+        /// Gets the description of the specified HTTP status <paramref name="code"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string"/> that represents the description of the HTTP status code.
+        /// </returns>
+        /// <param name="code">
+        /// An <see cref="int"/> that represents the HTTP status code.
+        /// </param>
+        public static string GetStatusDescription(this int code)
+        {
+            switch (code)
+            {
+                case 100: return "Continue";
+                case 101: return "Switching Protocols";
+                case 102: return "Processing";
+                case 200: return "OK";
+                case 201: return "Created";
+                case 202: return "Accepted";
+                case 203: return "Non-Authoritative Information";
+                case 204: return "No Content";
+                case 205: return "Reset Content";
+                case 206: return "Partial Content";
+                case 207: return "Multi-Status";
+                case 300: return "Multiple Choices";
+                case 301: return "Moved Permanently";
+                case 302: return "Found";
+                case 303: return "See Other";
+                case 304: return "Not Modified";
+                case 305: return "Use Proxy";
+                case 307: return "Temporary Redirect";
+                case 400: return "Bad Request";
+                case 401: return "Unauthorized";
+                case 402: return "Payment Required";
+                case 403: return "Forbidden";
+                case 404: return "Not Found";
+                case 405: return "Method Not Allowed";
+                case 406: return "Not Acceptable";
+                case 407: return "Proxy Authentication Required";
+                case 408: return "Request Timeout";
+                case 409: return "Conflict";
+                case 410: return "Gone";
+                case 411: return "Length Required";
+                case 412: return "Precondition Failed";
+                case 413: return "Request Entity Too Large";
+                case 414: return "Request-Uri Too Long";
+                case 415: return "Unsupported Media Type";
+                case 416: return "Requested Range Not Satisfiable";
+                case 417: return "Expectation Failed";
+                case 422: return "Unprocessable Entity";
+                case 423: return "Locked";
+                case 424: return "Failed Dependency";
+                case 500: return "Internal Server Error";
+                case 501: return "Not Implemented";
+                case 502: return "Bad Gateway";
+                case 503: return "Service Unavailable";
+                case 504: return "Gateway Timeout";
+                case 505: return "Http Version Not Supported";
+                case 507: return "Insufficient Storage";
+            }
+
+            return String.Empty;
+        }
+
+        /// <summary>
+        /// Gets the value from the specified <see cref="string"/> that contains a pair of name and
+        /// value separated by a separator string.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string"/> that represents the value if any; otherwise, <c>null</c>.
+        /// </returns>
+        /// <param name="nameAndValue">
+        /// A <see cref="string"/> that contains a pair of name and value separated by a separator
+        /// string.
+        /// </param>
+        /// <param name="separator">
+        /// A <see cref="string"/> that represents a separator string.
+        /// </param>
+        public static string GetValue(this string nameAndValue, string separator)
+        {
+            return (nameAndValue != null && nameAndValue.Length > 0) &&
+                   (separator != null && separator.Length > 0)
+                   ? nameAndValue.GetValueInternal(separator)
+                   : null;
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="ByteOrder"/> is host
+        /// (this computer architecture) byte order.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if <paramref name="order"/> is host byte order;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        /// <param name="order">
+        /// One of the <see cref="ByteOrder"/> enum values, to test.
+        /// </param>
+        public static bool IsHostOrder(this ByteOrder order)
+        {
+            // true : !(true ^ true)  or !(false ^ false)
+            // false: !(true ^ false) or !(false ^ true)
+            return !(BitConverter.IsLittleEndian ^ (order == ByteOrder.Little));
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="string"/> is a predefined scheme.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if <paramref name="value"/> is a predefined scheme; otherwise, <c>false</c>.
+        /// </returns>
+        /// <param name="value">
+        /// A <see cref="string"/> to test.
+        /// </param>
+        public static bool IsPredefinedScheme(this string value)
+        {
+            if (value == null || value.Length < 2)
+                return false;
+
+            var c = value[0];
+            if (c == 'h')
+                return value == "http" || value == "https";
+
+            if (c == 'w')
+                return value == "ws" || value == "wss";
+
+            if (c == 'f')
+                return value == "file" || value == "ftp";
+
+            if (c == 'n')
+            {
+                c = value[1];
+                return c == 'e'
+                       ? value == "news" || value == "net.pipe" || value == "net.tcp"
+                       : value == "nntp";
+            }
+
+            return (c == 'g' && value == "gopher") || (c == 'm' && value == "mailto");
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="string"/> is a URI string.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if <paramref name="value"/> may be a URI string; otherwise, <c>false</c>.
+        /// </returns>
+        /// <param name="value">
+        /// A <see cref="string"/> to test.
+        /// </param>
+        public static bool MaybeUri(this string value)
+        {
+            if (value == null || value.Length == 0)
+                return false;
+
+            var i = value.IndexOf(':');
+            if (i == -1)
+                return false;
+
+            if (i >= 10)
+                return false;
+
+            return value.Substring(0, i).IsPredefinedScheme();
+        }
+
+        /// <summary>
+        /// Retrieves a sub-array from the specified <paramref name="array"/>.
+        /// A sub-array starts at the specified element position.
+        /// </summary>
+        /// <returns>
+        /// An array of T that receives a sub-array, or an empty array of T if any problems
+        /// with the parameters.
+        /// </returns>
+        /// <param name="array">
+        /// An array of T that contains the data to retrieve a sub-array.
+        /// </param>
+        /// <param name="startIndex">
+        /// An <see cref="int"/> that contains the zero-based starting position of a sub-array
+        /// in <paramref name="array"/>.
+        /// </param>
+        /// <param name="length">
+        /// An <see cref="int"/> that contains the number of elements to retrieve a sub-array.
+        /// </param>
+        /// <typeparam name="T">
+        /// The type of elements in the <paramref name="array"/>.
+        /// </typeparam>
+        public static T[] SubArray<T>(this T[] array, int startIndex, int length)
+        {
+            if (array == null || array.Length == 0)
+                return new T[0];
+
+            if (startIndex < 0 || length <= 0)
+                return new T[0];
+
+            if (startIndex + length > array.Length)
+                return new T[0];
+
+            if (startIndex == 0 && array.Length == length)
+                return array;
+
+            T[] subArray = new T[length];
+            Array.Copy(array, startIndex, subArray, 0, length);
+
+            return subArray;
+        }
+
+        /// <summary>
+        /// Converts the order of the specified array of <see cref="byte"/> to the host byte order.
+        /// </summary>
+        /// <returns>
+        /// An array of <see cref="byte"/> converted from <paramref name="src"/>.
+        /// </returns>
+        /// <param name="src">
+        /// An array of <see cref="byte"/> to convert.
+        /// </param>
+        /// <param name="srcOrder">
+        /// One of the <see cref="ByteOrder"/> enum values, indicates the byte order of
+        /// <paramref name="src"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException">
+        /// <paramref name="src"/> is <see langword="null"/>.
+        /// </exception>
+        public static byte[] ToHostOrder(this byte[] src, ByteOrder srcOrder)
+        {
+            if (src == null)
+                throw new ArgumentNullException("src");
+
+            return src.Length > 1 && !srcOrder.IsHostOrder()
+                   ? src.Reverse()
+                   : src;
+        }
+
+        /// <summary>
+        /// Converts the specified <paramref name="array"/> to a <see cref="string"/> that
+        /// concatenates the each element of <paramref name="array"/> across the specified
+        /// <paramref name="separator"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string"/> converted from <paramref name="array"/>,
+        /// or <see cref="String.Empty"/> if <paramref name="array"/> is empty.
+        /// </returns>
+        /// <param name="array">
+        /// An array of T to convert.
+        /// </param>
+        /// <param name="separator">
+        /// A <see cref="string"/> that represents the separator string.
+        /// </param>
+        /// <typeparam name="T">
+        /// The type of elements in <paramref name="array"/>.
+        /// </typeparam>
+        /// <exception cref="ArgumentNullException">
+        /// <paramref name="array"/> is <see langword="null"/>.
+        /// </exception>
+        public static string ToString<T>(this T[] array, string separator)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+
+            var len = array.Length;
+            if (len == 0)
+                return String.Empty;
+
+            if (separator == null)
+                separator = String.Empty;
+
+            var buff = new StringBuilder(64);
+            (len - 1).Times(i => buff.AppendFormat("{0}{1}", array[i].ToString(), separator));
+
+            buff.Append(array[len - 1].ToString());
+            return buff.ToString();
+        }
+
+        /// <summary>
+        /// Executes the specified <c>Action&lt;int&gt;</c> delegate <paramref name="n"/> times.
+        /// </summary>
+        /// <param name="n">
+        /// An <see cref="int"/> is the number of times to execute.
+        /// </param>
+        /// <param name="action">
+        /// An <c>Action&lt;int&gt;</c> delegate that references the method(s) to execute.
+        /// An <see cref="int"/> parameter to pass to the method(s) is the zero-based count of
+        /// iteration.
+        /// </param>
+        public static void Times(this int n, Action<int> action)
+        {
+            if (n > 0 && action != null)
+                for (int i = 0; i < n; i++)
+                    action(i);
+        }
+
+        /// <summary>
+        /// Converts the specified <see cref="string"/> to a <see cref="Uri"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="Uri"/> converted from <paramref name="uriString"/>, or <see langword="null"/>
+        /// if <paramref name="uriString"/> isn't successfully converted.
+        /// </returns>
+        /// <param name="uriString">
+        /// A <see cref="string"/> to convert.
+        /// </param>
+        public static Uri ToUri(this string uriString)
+        {
+            Uri res;
+            return Uri.TryCreate(
+                     uriString, uriString.MaybeUri() ? UriKind.Absolute : UriKind.Relative, out res)
+                   ? res
+                   : null;
+        }
+
+        /// <summary>
+        /// URL-decodes the specified <see cref="string"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string"/> that receives the decoded string, or the <paramref name="value"/>
+        /// if it's <see langword="null"/> or empty.
+        /// </returns>
+        /// <param name="value">
+        /// A <see cref="string"/> to decode.
+        /// </param>
+        public static string UrlDecode(this string value)
+        {
+            return value == null || value.Length == 0
+                   ? value
+                   : WebUtility.UrlDecode(value);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/Fin.cs b/SocketHttpListener.Portable/Fin.cs
new file mode 100644
index 000000000..f91401b99
--- /dev/null
+++ b/SocketHttpListener.Portable/Fin.cs
@@ -0,0 +1,8 @@
+namespace SocketHttpListener
+{
+  internal enum Fin : byte
+  {
+    More = 0x0,
+    Final = 0x1
+  }
+}
diff --git a/SocketHttpListener.Portable/HttpBase.cs b/SocketHttpListener.Portable/HttpBase.cs
new file mode 100644
index 000000000..5172ba497
--- /dev/null
+++ b/SocketHttpListener.Portable/HttpBase.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Text;
+using System.Threading;
+using MediaBrowser.Model.Services;
+
+namespace SocketHttpListener
+{
+    internal abstract class HttpBase
+    {
+        #region Private Fields
+
+        private QueryParamCollection _headers;
+        private Version _version;
+
+        #endregion
+
+        #region Internal Fields
+
+        internal byte[] EntityBodyData;
+
+        #endregion
+
+        #region Protected Fields
+
+        protected const string CrLf = "\r\n";
+
+        #endregion
+
+        #region Protected Constructors
+
+        protected HttpBase(Version version, QueryParamCollection headers)
+        {
+            _version = version;
+            _headers = headers;
+        }
+
+        #endregion
+
+        #region Public Properties
+
+        public string EntityBody
+        {
+            get
+            {
+                var data = EntityBodyData;
+
+                return data != null && data.Length > 0
+                       ? getEncoding(_headers["Content-Type"]).GetString(data, 0, data.Length)
+                       : String.Empty;
+            }
+        }
+
+        public QueryParamCollection Headers
+        {
+            get
+            {
+                return _headers;
+            }
+        }
+
+        public Version ProtocolVersion
+        {
+            get
+            {
+                return _version;
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private static Encoding getEncoding(string contentType)
+        {
+            if (contentType == null || contentType.Length == 0)
+                return Encoding.UTF8;
+
+            var i = contentType.IndexOf("charset=", StringComparison.Ordinal);
+            if (i == -1)
+                return Encoding.UTF8;
+
+            var charset = contentType.Substring(i + 8);
+            i = charset.IndexOf(';');
+            if (i != -1)
+                charset = charset.Substring(0, i).TrimEnd();
+
+            return Encoding.GetEncoding(charset.Trim('"'));
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        public byte[] ToByteArray()
+        {
+            return Encoding.UTF8.GetBytes(ToString());
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/HttpResponse.cs b/SocketHttpListener.Portable/HttpResponse.cs
new file mode 100644
index 000000000..5aca28c7c
--- /dev/null
+++ b/SocketHttpListener.Portable/HttpResponse.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Net;
+using System.Text;
+using HttpStatusCode = SocketHttpListener.Net.HttpStatusCode;
+using HttpVersion = SocketHttpListener.Net.HttpVersion;
+using System.Linq;
+using MediaBrowser.Model.Services;
+
+namespace SocketHttpListener
+{
+    internal class HttpResponse : HttpBase
+    {
+        #region Private Fields
+
+        private string _code;
+        private string _reason;
+
+        #endregion
+
+        #region Private Constructors
+
+        private HttpResponse(string code, string reason, Version version, QueryParamCollection headers)
+            : base(version, headers)
+        {
+            _code = code;
+            _reason = reason;
+        }
+
+        #endregion
+
+        #region Internal Constructors
+
+        internal HttpResponse(HttpStatusCode code)
+            : this(code, code.GetDescription())
+        {
+        }
+
+        internal HttpResponse(HttpStatusCode code, string reason)
+            : this(((int)code).ToString(), reason, HttpVersion.Version11, new QueryParamCollection())
+        {
+            Headers["Server"] = "websocket-sharp/1.0";
+        }
+
+        #endregion
+
+        #region Public Properties
+
+        public CookieCollection Cookies
+        {
+            get
+            {
+                return Headers.GetCookies(true);
+            }
+        }
+
+        public bool IsProxyAuthenticationRequired
+        {
+            get
+            {
+                return _code == "407";
+            }
+        }
+
+        public bool IsUnauthorized
+        {
+            get
+            {
+                return _code == "401";
+            }
+        }
+
+        public bool IsWebSocketResponse
+        {
+            get
+            {
+                var headers = Headers;
+                return ProtocolVersion > HttpVersion.Version10 &&
+                       _code == "101" &&
+                       headers.Contains("Upgrade", "websocket") &&
+                       headers.Contains("Connection", "Upgrade");
+            }
+        }
+
+        public string Reason
+        {
+            get
+            {
+                return _reason;
+            }
+        }
+
+        public string StatusCode
+        {
+            get
+            {
+                return _code;
+            }
+        }
+
+        #endregion
+
+        #region Internal Methods
+
+        internal static HttpResponse CreateCloseResponse(HttpStatusCode code)
+        {
+            var res = new HttpResponse(code);
+            res.Headers["Connection"] = "close";
+
+            return res;
+        }
+
+        internal static HttpResponse CreateWebSocketResponse()
+        {
+            var res = new HttpResponse(HttpStatusCode.SwitchingProtocols);
+
+            var headers = res.Headers;
+            headers["Upgrade"] = "websocket";
+            headers["Connection"] = "Upgrade";
+
+            return res;
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        public void SetCookies(CookieCollection cookies)
+        {
+            if (cookies == null || cookies.Count == 0)
+                return;
+
+            var headers = Headers;
+            var sorted = cookies.OfType<Cookie>().OrderBy(i => i.Name).ToList();
+
+            foreach (var cookie in sorted)
+                headers.Add("Set-Cookie", cookie.ToString());
+        }
+
+        public override string ToString()
+        {
+            var output = new StringBuilder(64);
+            output.AppendFormat("HTTP/{0} {1} {2}{3}", ProtocolVersion, _code, _reason, CrLf);
+
+            var headers = Headers;
+            foreach (var key in headers.Keys)
+                output.AppendFormat("{0}: {1}{2}", key, headers[key], CrLf);
+
+            output.Append(CrLf);
+
+            var entity = EntityBody;
+            if (entity.Length > 0)
+                output.Append(entity);
+
+            return output.ToString();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/Mask.cs b/SocketHttpListener.Portable/Mask.cs
new file mode 100644
index 000000000..adc2f098e
--- /dev/null
+++ b/SocketHttpListener.Portable/Mask.cs
@@ -0,0 +1,8 @@
+namespace SocketHttpListener
+{
+  internal enum Mask : byte
+  {
+    Unmask = 0x0,
+    Mask = 0x1
+  }
+}
diff --git a/SocketHttpListener.Portable/MessageEventArgs.cs b/SocketHttpListener.Portable/MessageEventArgs.cs
new file mode 100644
index 000000000..9dbadb9ab
--- /dev/null
+++ b/SocketHttpListener.Portable/MessageEventArgs.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Text;
+
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the event data associated with a <see cref="WebSocket.OnMessage"/> event.
+  /// </summary>
+  /// <remarks>
+  /// A <see cref="WebSocket.OnMessage"/> event occurs when the <see cref="WebSocket"/> receives
+  /// a text or binary data frame.
+  /// If you want to get the received data, you access the <see cref="MessageEventArgs.Data"/> or
+  /// <see cref="MessageEventArgs.RawData"/> property.
+  /// </remarks>
+  public class MessageEventArgs : EventArgs
+  {
+    #region Private Fields
+
+    private string _data;
+    private Opcode _opcode;
+    private byte[] _rawData;
+
+    #endregion
+
+    #region Internal Constructors
+
+    internal MessageEventArgs (Opcode opcode, byte[] data)
+    {
+      _opcode = opcode;
+      _rawData = data;
+      _data = convertToString (opcode, data);
+    }
+
+    internal MessageEventArgs (Opcode opcode, PayloadData payload)
+    {
+      _opcode = opcode;
+      _rawData = payload.ApplicationData;
+      _data = convertToString (opcode, _rawData);
+    }
+
+    #endregion
+
+    #region Public Properties
+
+    /// <summary>
+    /// Gets the received data as a <see cref="string"/>.
+    /// </summary>
+    /// <value>
+    /// A <see cref="string"/> that contains the received data.
+    /// </value>
+    public string Data {
+      get {
+        return _data;
+      }
+    }
+
+    /// <summary>
+    /// Gets the received data as an array of <see cref="byte"/>.
+    /// </summary>
+    /// <value>
+    /// An array of <see cref="byte"/> that contains the received data.
+    /// </value>
+    public byte [] RawData {
+      get {
+        return _rawData;
+      }
+    }
+
+    /// <summary>
+    /// Gets the type of the received data.
+    /// </summary>
+    /// <value>
+    /// One of the <see cref="Opcode"/> values, indicates the type of the received data.
+    /// </value>
+    public Opcode Type {
+      get {
+        return _opcode;
+      }
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private static string convertToString (Opcode opcode, byte [] data)
+    {
+      return data.Length == 0
+             ? String.Empty
+             : opcode == Opcode.Text
+               ? Encoding.UTF8.GetString (data, 0, data.Length)
+               : opcode.ToString ();
+    }
+
+    #endregion
+  }
+}
diff --git a/SocketHttpListener.Portable/Net/AuthenticationSchemeSelector.cs b/SocketHttpListener.Portable/Net/AuthenticationSchemeSelector.cs
new file mode 100644
index 000000000..c6e7e538e
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/AuthenticationSchemeSelector.cs
@@ -0,0 +1,6 @@
+using System.Net;
+
+namespace SocketHttpListener.Net
+{
+    public delegate AuthenticationSchemes AuthenticationSchemeSelector(HttpListenerRequest httpRequest);
+}
diff --git a/SocketHttpListener.Portable/Net/ChunkStream.cs b/SocketHttpListener.Portable/Net/ChunkStream.cs
new file mode 100644
index 000000000..3f3b4a667
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/ChunkStream.cs
@@ -0,0 +1,371 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+
+namespace SocketHttpListener.Net
+{
+    class ChunkStream
+    {
+        enum State
+        {
+            None,
+            PartialSize,
+            Body,
+            BodyFinished,
+            Trailer
+        }
+
+        class Chunk
+        {
+            public byte[] Bytes;
+            public int Offset;
+
+            public Chunk(byte[] chunk)
+            {
+                this.Bytes = chunk;
+            }
+
+            public int Read(byte[] buffer, int offset, int size)
+            {
+                int nread = (size > Bytes.Length - Offset) ? Bytes.Length - Offset : size;
+                Buffer.BlockCopy(Bytes, Offset, buffer, offset, nread);
+                Offset += nread;
+                return nread;
+            }
+        }
+
+        internal WebHeaderCollection headers;
+        int chunkSize;
+        int chunkRead;
+        int totalWritten;
+        State state;
+        //byte [] waitBuffer;
+        StringBuilder saved;
+        bool sawCR;
+        bool gotit;
+        int trailerState;
+        List<Chunk> chunks;
+
+        public ChunkStream(WebHeaderCollection headers)
+        {
+            this.headers = headers;
+            saved = new StringBuilder();
+            chunks = new List<Chunk>();
+            chunkSize = -1;
+            totalWritten = 0;
+        }
+
+        public void ResetBuffer()
+        {
+            chunkSize = -1;
+            chunkRead = 0;
+            totalWritten = 0;
+            chunks.Clear();
+        }
+
+        public void WriteAndReadBack(byte[] buffer, int offset, int size, ref int read)
+        {
+            if (offset + read > 0)
+                Write(buffer, offset, offset + read);
+            read = Read(buffer, offset, size);
+        }
+
+        public int Read(byte[] buffer, int offset, int size)
+        {
+            return ReadFromChunks(buffer, offset, size);
+        }
+
+        int ReadFromChunks(byte[] buffer, int offset, int size)
+        {
+            int count = chunks.Count;
+            int nread = 0;
+
+            var chunksForRemoving = new List<Chunk>(count);
+            for (int i = 0; i < count; i++)
+            {
+                Chunk chunk = (Chunk)chunks[i];
+
+                if (chunk.Offset == chunk.Bytes.Length)
+                {
+                    chunksForRemoving.Add(chunk);
+                    continue;
+                }
+
+                nread += chunk.Read(buffer, offset + nread, size - nread);
+                if (nread == size)
+                    break;
+            }
+
+            foreach (var chunk in chunksForRemoving)
+                chunks.Remove(chunk);
+
+            return nread;
+        }
+
+        public void Write(byte[] buffer, int offset, int size)
+        {
+            if (offset < size)
+                InternalWrite(buffer, ref offset, size);
+        }
+
+        void InternalWrite(byte[] buffer, ref int offset, int size)
+        {
+            if (state == State.None || state == State.PartialSize)
+            {
+                state = GetChunkSize(buffer, ref offset, size);
+                if (state == State.PartialSize)
+                    return;
+
+                saved.Length = 0;
+                sawCR = false;
+                gotit = false;
+            }
+
+            if (state == State.Body && offset < size)
+            {
+                state = ReadBody(buffer, ref offset, size);
+                if (state == State.Body)
+                    return;
+            }
+
+            if (state == State.BodyFinished && offset < size)
+            {
+                state = ReadCRLF(buffer, ref offset, size);
+                if (state == State.BodyFinished)
+                    return;
+
+                sawCR = false;
+            }
+
+            if (state == State.Trailer && offset < size)
+            {
+                state = ReadTrailer(buffer, ref offset, size);
+                if (state == State.Trailer)
+                    return;
+
+                saved.Length = 0;
+                sawCR = false;
+                gotit = false;
+            }
+
+            if (offset < size)
+                InternalWrite(buffer, ref offset, size);
+        }
+
+        public bool WantMore
+        {
+            get { return (chunkRead != chunkSize || chunkSize != 0 || state != State.None); }
+        }
+
+        public bool DataAvailable
+        {
+            get
+            {
+                int count = chunks.Count;
+                for (int i = 0; i < count; i++)
+                {
+                    Chunk ch = (Chunk)chunks[i];
+                    if (ch == null || ch.Bytes == null)
+                        continue;
+                    if (ch.Bytes.Length > 0 && ch.Offset < ch.Bytes.Length)
+                        return (state != State.Body);
+                }
+                return false;
+            }
+        }
+
+        public int TotalDataSize
+        {
+            get { return totalWritten; }
+        }
+
+        public int ChunkLeft
+        {
+            get { return chunkSize - chunkRead; }
+        }
+
+        State ReadBody(byte[] buffer, ref int offset, int size)
+        {
+            if (chunkSize == 0)
+                return State.BodyFinished;
+
+            int diff = size - offset;
+            if (diff + chunkRead > chunkSize)
+                diff = chunkSize - chunkRead;
+
+            byte[] chunk = new byte[diff];
+            Buffer.BlockCopy(buffer, offset, chunk, 0, diff);
+            chunks.Add(new Chunk(chunk));
+            offset += diff;
+            chunkRead += diff;
+            totalWritten += diff;
+            return (chunkRead == chunkSize) ? State.BodyFinished : State.Body;
+
+        }
+
+        State GetChunkSize(byte[] buffer, ref int offset, int size)
+        {
+            chunkRead = 0;
+            chunkSize = 0;
+            char c = '\0';
+            while (offset < size)
+            {
+                c = (char)buffer[offset++];
+                if (c == '\r')
+                {
+                    if (sawCR)
+                        ThrowProtocolViolation("2 CR found");
+
+                    sawCR = true;
+                    continue;
+                }
+
+                if (sawCR && c == '\n')
+                    break;
+
+                if (c == ' ')
+                    gotit = true;
+
+                if (!gotit)
+                    saved.Append(c);
+
+                if (saved.Length > 20)
+                    ThrowProtocolViolation("chunk size too long.");
+            }
+
+            if (!sawCR || c != '\n')
+            {
+                if (offset < size)
+                    ThrowProtocolViolation("Missing \\n");
+
+                try
+                {
+                    if (saved.Length > 0)
+                    {
+                        chunkSize = Int32.Parse(RemoveChunkExtension(saved.ToString()), NumberStyles.HexNumber);
+                    }
+                }
+                catch (Exception)
+                {
+                    ThrowProtocolViolation("Cannot parse chunk size.");
+                }
+
+                return State.PartialSize;
+            }
+
+            chunkRead = 0;
+            try
+            {
+                chunkSize = Int32.Parse(RemoveChunkExtension(saved.ToString()), NumberStyles.HexNumber);
+            }
+            catch (Exception)
+            {
+                ThrowProtocolViolation("Cannot parse chunk size.");
+            }
+
+            if (chunkSize == 0)
+            {
+                trailerState = 2;
+                return State.Trailer;
+            }
+
+            return State.Body;
+        }
+
+        static string RemoveChunkExtension(string input)
+        {
+            int idx = input.IndexOf(';');
+            if (idx == -1)
+                return input;
+            return input.Substring(0, idx);
+        }
+
+        State ReadCRLF(byte[] buffer, ref int offset, int size)
+        {
+            if (!sawCR)
+            {
+                if ((char)buffer[offset++] != '\r')
+                    ThrowProtocolViolation("Expecting \\r");
+
+                sawCR = true;
+                if (offset == size)
+                    return State.BodyFinished;
+            }
+
+            if (sawCR && (char)buffer[offset++] != '\n')
+                ThrowProtocolViolation("Expecting \\n");
+
+            return State.None;
+        }
+
+        State ReadTrailer(byte[] buffer, ref int offset, int size)
+        {
+            char c = '\0';
+
+            // short path
+            if (trailerState == 2 && (char)buffer[offset] == '\r' && saved.Length == 0)
+            {
+                offset++;
+                if (offset < size && (char)buffer[offset] == '\n')
+                {
+                    offset++;
+                    return State.None;
+                }
+                offset--;
+            }
+
+            int st = trailerState;
+            string stString = "\r\n\r";
+            while (offset < size && st < 4)
+            {
+                c = (char)buffer[offset++];
+                if ((st == 0 || st == 2) && c == '\r')
+                {
+                    st++;
+                    continue;
+                }
+
+                if ((st == 1 || st == 3) && c == '\n')
+                {
+                    st++;
+                    continue;
+                }
+
+                if (st > 0)
+                {
+                    saved.Append(stString.Substring(0, saved.Length == 0 ? st - 2 : st));
+                    st = 0;
+                    if (saved.Length > 4196)
+                        ThrowProtocolViolation("Error reading trailer (too long).");
+                }
+            }
+
+            if (st < 4)
+            {
+                trailerState = st;
+                if (offset < size)
+                    ThrowProtocolViolation("Error reading trailer.");
+
+                return State.Trailer;
+            }
+
+            StringReader reader = new StringReader(saved.ToString());
+            string line;
+            while ((line = reader.ReadLine()) != null && line != "")
+                headers.Add(line);
+
+            return State.None;
+        }
+
+        static void ThrowProtocolViolation(string message)
+        {
+            WebException we = new WebException(message, null, WebExceptionStatus.UnknownError, null);
+            //WebException we = new WebException(message, null, WebExceptionStatus.ServerProtocolViolation, null);
+            throw we;
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/ChunkedInputStream.cs b/SocketHttpListener.Portable/Net/ChunkedInputStream.cs
new file mode 100644
index 000000000..6dfd8d8a1
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/ChunkedInputStream.cs
@@ -0,0 +1,160 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    class ChunkedInputStream : RequestStream
+    {
+        bool disposed;
+        ChunkStream decoder;
+        HttpListenerContext context;
+        bool no_more_data;
+
+        //class ReadBufferState
+        //{
+        //    public byte[] Buffer;
+        //    public int Offset;
+        //    public int Count;
+        //    public int InitialCount;
+        //    public HttpStreamAsyncResult Ares;
+        //    public ReadBufferState(byte[] buffer, int offset, int count,
+        //                HttpStreamAsyncResult ares)
+        //    {
+        //        Buffer = buffer;
+        //        Offset = offset;
+        //        Count = count;
+        //        InitialCount = count;
+        //        Ares = ares;
+        //    }
+        //}
+
+        public ChunkedInputStream(HttpListenerContext context, Stream stream,
+                        byte[] buffer, int offset, int length)
+            : base(stream, buffer, offset, length)
+        {
+            this.context = context;
+            WebHeaderCollection coll = (WebHeaderCollection)context.Request.Headers;
+            decoder = new ChunkStream(coll);
+        }
+
+        //public ChunkStream Decoder
+        //{
+        //    get { return decoder; }
+        //    set { decoder = value; }
+        //}
+
+        //public override int Read([In, Out] byte[] buffer, int offset, int count)
+        //{
+        //    IAsyncResult ares = BeginRead(buffer, offset, count, null, null);
+        //    return EndRead(ares);
+        //}
+
+        //public override IAsyncResult BeginRead(byte[] buffer, int offset, int count,
+        //                    AsyncCallback cback, object state)
+        //{
+        //    if (disposed)
+        //        throw new ObjectDisposedException(GetType().ToString());
+
+        //    if (buffer == null)
+        //        throw new ArgumentNullException("buffer");
+
+        //    int len = buffer.Length;
+        //    if (offset < 0 || offset > len)
+        //        throw new ArgumentOutOfRangeException("offset exceeds the size of buffer");
+
+        //    if (count < 0 || offset > len - count)
+        //        throw new ArgumentOutOfRangeException("offset+size exceeds the size of buffer");
+
+        //    HttpStreamAsyncResult ares = new HttpStreamAsyncResult();
+        //    ares.Callback = cback;
+        //    ares.State = state;
+        //    if (no_more_data)
+        //    {
+        //        ares.Complete();
+        //        return ares;
+        //    }
+        //    int nread = decoder.Read(buffer, offset, count);
+        //    offset += nread;
+        //    count -= nread;
+        //    if (count == 0)
+        //    {
+        //        // got all we wanted, no need to bother the decoder yet
+        //        ares.Count = nread;
+        //        ares.Complete();
+        //        return ares;
+        //    }
+        //    if (!decoder.WantMore)
+        //    {
+        //        no_more_data = nread == 0;
+        //        ares.Count = nread;
+        //        ares.Complete();
+        //        return ares;
+        //    }
+        //    ares.Buffer = new byte[8192];
+        //    ares.Offset = 0;
+        //    ares.Count = 8192;
+        //    ReadBufferState rb = new ReadBufferState(buffer, offset, count, ares);
+        //    rb.InitialCount += nread;
+        //    base.BeginRead(ares.Buffer, ares.Offset, ares.Count, OnRead, rb);
+        //    return ares;
+        //}
+
+        //void OnRead(IAsyncResult base_ares)
+        //{
+        //    ReadBufferState rb = (ReadBufferState)base_ares.AsyncState;
+        //    HttpStreamAsyncResult ares = rb.Ares;
+        //    try
+        //    {
+        //        int nread = base.EndRead(base_ares);
+        //        decoder.Write(ares.Buffer, ares.Offset, nread);
+        //        nread = decoder.Read(rb.Buffer, rb.Offset, rb.Count);
+        //        rb.Offset += nread;
+        //        rb.Count -= nread;
+        //        if (rb.Count == 0 || !decoder.WantMore || nread == 0)
+        //        {
+        //            no_more_data = !decoder.WantMore && nread == 0;
+        //            ares.Count = rb.InitialCount - rb.Count;
+        //            ares.Complete();
+        //            return;
+        //        }
+        //        ares.Offset = 0;
+        //        ares.Count = Math.Min(8192, decoder.ChunkLeft + 6);
+        //        base.BeginRead(ares.Buffer, ares.Offset, ares.Count, OnRead, rb);
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        context.Connection.SendError(e.Message, 400);
+        //        ares.Complete(e);
+        //    }
+        //}
+
+        //public override int EndRead(IAsyncResult ares)
+        //{
+        //    if (disposed)
+        //        throw new ObjectDisposedException(GetType().ToString());
+
+        //    HttpStreamAsyncResult my_ares = ares as HttpStreamAsyncResult;
+        //    if (ares == null)
+        //        throw new ArgumentException("Invalid IAsyncResult", "ares");
+
+        //    if (!ares.IsCompleted)
+        //        ares.AsyncWaitHandle.WaitOne();
+
+        //    if (my_ares.Error != null)
+        //        throw new HttpListenerException(400, "I/O operation aborted: " + my_ares.Error.Message);
+
+        //    return my_ares.Count;
+        //}
+
+        //protected override void Dispose(bool disposing)
+        //{
+        //    if (!disposed)
+        //    {
+        //        disposed = true;
+        //        base.Dispose(disposing);
+        //    }
+        //}
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/CookieHelper.cs b/SocketHttpListener.Portable/Net/CookieHelper.cs
new file mode 100644
index 000000000..470507d6b
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/CookieHelper.cs
@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SocketHttpListener.Net
+{
+    public static class CookieHelper
+    {
+        internal static CookieCollection Parse(string value, bool response)
+        {
+            return response
+                ? parseResponse(value)
+                : null;
+        }
+
+        private static string[] splitCookieHeaderValue(string value)
+        {
+            return new List<string>(value.SplitHeaderValue(',', ';')).ToArray();
+        }
+
+        private static CookieCollection parseResponse(string value)
+        {
+            var cookies = new CookieCollection();
+
+            Cookie cookie = null;
+            var pairs = splitCookieHeaderValue(value);
+            for (int i = 0; i < pairs.Length; i++)
+            {
+                var pair = pairs[i].Trim();
+                if (pair.Length == 0)
+                    continue;
+
+                if (pair.StartsWith("version", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.Version = Int32.Parse(pair.GetValueInternal("=").Trim('"'));
+                }
+                else if (pair.StartsWith("expires", StringComparison.OrdinalIgnoreCase))
+                {
+                    var buffer = new StringBuilder(pair.GetValueInternal("="), 32);
+                    if (i < pairs.Length - 1)
+                        buffer.AppendFormat(", {0}", pairs[++i].Trim());
+
+                    DateTime expires;
+                    if (!DateTime.TryParseExact(
+                      buffer.ToString(),
+                      new[] { "ddd, dd'-'MMM'-'yyyy HH':'mm':'ss 'GMT'", "r" },
+                      new CultureInfo("en-US"),
+                      DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal,
+                      out expires))
+                        expires = DateTime.Now;
+
+                    if (cookie != null && cookie.Expires == DateTime.MinValue)
+                        cookie.Expires = expires.ToLocalTime();
+                }
+                else if (pair.StartsWith("max-age", StringComparison.OrdinalIgnoreCase))
+                {
+                    var max = Int32.Parse(pair.GetValueInternal("=").Trim('"'));
+                    var expires = DateTime.Now.AddSeconds((double)max);
+                    if (cookie != null)
+                        cookie.Expires = expires;
+                }
+                else if (pair.StartsWith("path", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.Path = pair.GetValueInternal("=");
+                }
+                else if (pair.StartsWith("domain", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.Domain = pair.GetValueInternal("=");
+                }
+                else if (pair.StartsWith("port", StringComparison.OrdinalIgnoreCase))
+                {
+                    var port = pair.Equals("port", StringComparison.OrdinalIgnoreCase)
+                               ? "\"\""
+                               : pair.GetValueInternal("=");
+
+                    if (cookie != null)
+                        cookie.Port = port;
+                }
+                else if (pair.StartsWith("comment", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.Comment = pair.GetValueInternal("=").UrlDecode();
+                }
+                else if (pair.StartsWith("commenturl", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.CommentUri = pair.GetValueInternal("=").Trim('"').ToUri();
+                }
+                else if (pair.StartsWith("discard", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.Discard = true;
+                }
+                else if (pair.StartsWith("secure", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.Secure = true;
+                }
+                else if (pair.StartsWith("httponly", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (cookie != null)
+                        cookie.HttpOnly = true;
+                }
+                else
+                {
+                    if (cookie != null)
+                        cookies.Add(cookie);
+
+                    string name;
+                    string val = String.Empty;
+
+                    var pos = pair.IndexOf('=');
+                    if (pos == -1)
+                    {
+                        name = pair;
+                    }
+                    else if (pos == pair.Length - 1)
+                    {
+                        name = pair.Substring(0, pos).TrimEnd(' ');
+                    }
+                    else
+                    {
+                        name = pair.Substring(0, pos).TrimEnd(' ');
+                        val = pair.Substring(pos + 1).TrimStart(' ');
+                    }
+
+                    cookie = new Cookie(name, val);
+                }
+            }
+
+            if (cookie != null)
+                cookies.Add(cookie);
+
+            return cookies;
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/EndPointListener.cs b/SocketHttpListener.Portable/Net/EndPointListener.cs
new file mode 100644
index 000000000..b50660ad0
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/EndPointListener.cs
@@ -0,0 +1,368 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Threading;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    sealed class EndPointListener
+    {
+        HttpListener listener;
+        IpEndPointInfo endpoint;
+        ISocket sock;
+        Dictionary<ListenerPrefix,HttpListener> prefixes;  // Dictionary <ListenerPrefix, HttpListener>
+        List<ListenerPrefix> unhandled; // List<ListenerPrefix> unhandled; host = '*'
+        List<ListenerPrefix> all;       // List<ListenerPrefix> all;  host = '+'
+        ICertificate cert;
+        bool secure;
+        Dictionary<HttpConnection, HttpConnection> unregistered;
+        private readonly ILogger _logger;
+        private bool _closed;
+        private readonly bool _enableDualMode;
+        private readonly ICryptoProvider _cryptoProvider;
+        private readonly IStreamFactory _streamFactory;
+        private readonly ISocketFactory _socketFactory;
+        private readonly ITextEncoding _textEncoding;
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
+
+        public EndPointListener(HttpListener listener, IpAddressInfo addr, int port, bool secure, ICertificate cert, ILogger logger, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, ISocketFactory socketFactory, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        {
+            this.listener = listener;
+            _logger = logger;
+            _cryptoProvider = cryptoProvider;
+            _streamFactory = streamFactory;
+            _socketFactory = socketFactory;
+            _memoryStreamFactory = memoryStreamFactory;
+            _textEncoding = textEncoding;
+
+            this.secure = secure;
+            this.cert = cert;
+
+            _enableDualMode = addr.Equals(IpAddressInfo.IPv6Any);
+            endpoint = new IpEndPointInfo(addr, port);
+
+            prefixes = new Dictionary<ListenerPrefix, HttpListener>();
+            unregistered = new Dictionary<HttpConnection, HttpConnection>();
+
+            CreateSocket();
+        }
+
+        internal HttpListener Listener
+        {
+            get
+            {
+                return listener;
+            }
+        }
+
+        private void CreateSocket()
+        {
+            sock = _socketFactory.CreateSocket(endpoint.IpAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp, _enableDualMode);
+
+            sock.Bind(endpoint);
+
+            // This is the number TcpListener uses.
+            sock.Listen(2147483647);
+
+            sock.StartAccept(ProcessAccept, () => _closed);
+            _closed = false;
+        }
+
+        private async void ProcessAccept(ISocket accepted)
+        {
+            try
+            {
+                var listener = this;
+
+                if (listener.secure && listener.cert == null)
+                {
+                    accepted.Close();
+                    return;
+                }
+
+                HttpConnection conn = await HttpConnection.Create(_logger, accepted, listener, listener.secure, listener.cert, _cryptoProvider, _streamFactory, _memoryStreamFactory, _textEncoding).ConfigureAwait(false);
+
+                //_logger.Debug("Adding unregistered connection to {0}. Id: {1}", accepted.RemoteEndPoint, connectionId);
+                lock (listener.unregistered)
+                {
+                    listener.unregistered[conn] = conn;
+                }
+                conn.BeginReadRequest();
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error in ProcessAccept", ex);
+            }
+        }
+
+        internal void RemoveConnection(HttpConnection conn)
+        {
+            lock (unregistered)
+            {
+                unregistered.Remove(conn);
+            }
+        }
+
+        public bool BindContext(HttpListenerContext context)
+        {
+            HttpListenerRequest req = context.Request;
+            ListenerPrefix prefix;
+            HttpListener listener = SearchListener(req.Url, out prefix);
+            if (listener == null)
+                return false;
+
+            context.Listener = listener;
+            context.Connection.Prefix = prefix;
+            return true;
+        }
+
+        public void UnbindContext(HttpListenerContext context)
+        {
+            if (context == null || context.Request == null)
+                return;
+
+            context.Listener.UnregisterContext(context);
+        }
+
+        HttpListener SearchListener(Uri uri, out ListenerPrefix prefix)
+        {
+            prefix = null;
+            if (uri == null)
+                return null;
+
+            string host = uri.Host;
+            int port = uri.Port;
+            string path = WebUtility.UrlDecode(uri.AbsolutePath);
+            string path_slash = path[path.Length - 1] == '/' ? path : path + "/";
+
+            HttpListener best_match = null;
+            int best_length = -1;
+
+            if (host != null && host != "")
+            {
+                var p_ro = prefixes;
+                foreach (ListenerPrefix p in p_ro.Keys)
+                {
+                    string ppath = p.Path;
+                    if (ppath.Length < best_length)
+                        continue;
+
+                    if (p.Host != host || p.Port != port)
+                        continue;
+
+                    if (path.StartsWith(ppath) || path_slash.StartsWith(ppath))
+                    {
+                        best_length = ppath.Length;
+                        best_match = (HttpListener)p_ro[p];
+                        prefix = p;
+                    }
+                }
+                if (best_length != -1)
+                    return best_match;
+            }
+
+            List<ListenerPrefix> list = unhandled;
+            best_match = MatchFromList(host, path, list, out prefix);
+            if (path != path_slash && best_match == null)
+                best_match = MatchFromList(host, path_slash, list, out prefix);
+            if (best_match != null)
+                return best_match;
+
+            list = all;
+            best_match = MatchFromList(host, path, list, out prefix);
+            if (path != path_slash && best_match == null)
+                best_match = MatchFromList(host, path_slash, list, out prefix);
+            if (best_match != null)
+                return best_match;
+
+            return null;
+        }
+
+        HttpListener MatchFromList(string host, string path, List<ListenerPrefix> list, out ListenerPrefix prefix)
+        {
+            prefix = null;
+            if (list == null)
+                return null;
+
+            HttpListener best_match = null;
+            int best_length = -1;
+
+            foreach (ListenerPrefix p in list)
+            {
+                string ppath = p.Path;
+                if (ppath.Length < best_length)
+                    continue;
+
+                if (path.StartsWith(ppath))
+                {
+                    best_length = ppath.Length;
+                    best_match = p.Listener;
+                    prefix = p;
+                }
+            }
+
+            return best_match;
+        }
+
+        void AddSpecial(List<ListenerPrefix> coll, ListenerPrefix prefix)
+        {
+            if (coll == null)
+                return;
+
+            foreach (ListenerPrefix p in coll)
+            {
+                if (p.Path == prefix.Path) //TODO: code
+                    throw new HttpListenerException(400, "Prefix already in use.");
+            }
+            coll.Add(prefix);
+        }
+
+        bool RemoveSpecial(List<ListenerPrefix> coll, ListenerPrefix prefix)
+        {
+            if (coll == null)
+                return false;
+
+            int c = coll.Count;
+            for (int i = 0; i < c; i++)
+            {
+                ListenerPrefix p = (ListenerPrefix)coll[i];
+                if (p.Path == prefix.Path)
+                {
+                    coll.RemoveAt(i);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void CheckIfRemove()
+        {
+            if (prefixes.Count > 0)
+                return;
+
+            List<ListenerPrefix> list = unhandled;
+            if (list != null && list.Count > 0)
+                return;
+
+            list = all;
+            if (list != null && list.Count > 0)
+                return;
+
+            EndPointManager.RemoveEndPoint(this, endpoint);
+        }
+
+        public void Close()
+        {
+            _closed = true;
+            sock.Close();
+            lock (unregistered)
+            {
+                //
+                // Clone the list because RemoveConnection can be called from Close
+                //
+                var connections = new List<HttpConnection>(unregistered.Keys);
+
+                foreach (HttpConnection c in connections)
+                    c.Close(true);
+                unregistered.Clear();
+            }
+        }
+
+        public void AddPrefix(ListenerPrefix prefix, HttpListener listener)
+        {
+            List<ListenerPrefix> current;
+            List<ListenerPrefix> future;
+            if (prefix.Host == "*")
+            {
+                do
+                {
+                    current = unhandled;
+                    future = (current != null) ? current.ToList() : new List<ListenerPrefix>();
+                    prefix.Listener = listener;
+                    AddSpecial(future, prefix);
+                } while (Interlocked.CompareExchange(ref unhandled, future, current) != current);
+                return;
+            }
+
+            if (prefix.Host == "+")
+            {
+                do
+                {
+                    current = all;
+                    future = (current != null) ? current.ToList() : new List<ListenerPrefix>();
+                    prefix.Listener = listener;
+                    AddSpecial(future, prefix);
+                } while (Interlocked.CompareExchange(ref all, future, current) != current);
+                return;
+            }
+
+            Dictionary<ListenerPrefix, HttpListener> prefs;
+            Dictionary<ListenerPrefix, HttpListener> p2;
+            do
+            {
+                prefs = prefixes;
+                if (prefs.ContainsKey(prefix))
+                {
+                    HttpListener other = (HttpListener)prefs[prefix];
+                    if (other != listener) // TODO: code.
+                        throw new HttpListenerException(400, "There's another listener for " + prefix);
+                    return;
+                }
+                p2 = new Dictionary<ListenerPrefix, HttpListener>(prefs);
+                p2[prefix] = listener;
+            } while (Interlocked.CompareExchange(ref prefixes, p2, prefs) != prefs);
+        }
+
+        public void RemovePrefix(ListenerPrefix prefix, HttpListener listener)
+        {
+            List<ListenerPrefix> current;
+            List<ListenerPrefix> future;
+            if (prefix.Host == "*")
+            {
+                do
+                {
+                    current = unhandled;
+                    future = (current != null) ? current.ToList() : new List<ListenerPrefix>();
+                    if (!RemoveSpecial(future, prefix))
+                        break; // Prefix not found
+                } while (Interlocked.CompareExchange(ref unhandled, future, current) != current);
+                CheckIfRemove();
+                return;
+            }
+
+            if (prefix.Host == "+")
+            {
+                do
+                {
+                    current = all;
+                    future = (current != null) ? current.ToList() : new List<ListenerPrefix>();
+                    if (!RemoveSpecial(future, prefix))
+                        break; // Prefix not found
+                } while (Interlocked.CompareExchange(ref all, future, current) != current);
+                CheckIfRemove();
+                return;
+            }
+
+            Dictionary<ListenerPrefix, HttpListener> prefs;
+            Dictionary<ListenerPrefix, HttpListener> p2;
+            do
+            {
+                prefs = prefixes;
+                if (!prefs.ContainsKey(prefix))
+                    break;
+
+                p2 = new Dictionary<ListenerPrefix, HttpListener>(prefs);
+                p2.Remove(prefix);
+            } while (Interlocked.CompareExchange(ref prefixes, p2, prefs) != prefs);
+            CheckIfRemove();
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/EndPointManager.cs b/SocketHttpListener.Portable/Net/EndPointManager.cs
new file mode 100644
index 000000000..797684b3e
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/EndPointManager.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    sealed class EndPointManager
+    {
+        // Dictionary<IPAddress, Dictionary<int, EndPointListener>>
+        static Dictionary<string, Dictionary<int, EndPointListener>> ip_to_endpoints = new Dictionary<string, Dictionary<int, EndPointListener>>();
+
+        private EndPointManager()
+        {
+        }
+
+        public static void AddListener(ILogger logger, HttpListener listener)
+        {
+            List<string> added = new List<string>();
+            try
+            {
+                lock (ip_to_endpoints)
+                {
+                    foreach (string prefix in listener.Prefixes)
+                    {
+                        AddPrefixInternal(logger, prefix, listener);
+                        added.Add(prefix);
+                    }
+                }
+            }
+            catch
+            {
+                foreach (string prefix in added)
+                {
+                    RemovePrefix(logger, prefix, listener);
+                }
+                throw;
+            }
+        }
+
+        public static void AddPrefix(ILogger logger, string prefix, HttpListener listener)
+        {
+            lock (ip_to_endpoints)
+            {
+                AddPrefixInternal(logger, prefix, listener);
+            }
+        }
+
+        static void AddPrefixInternal(ILogger logger, string p, HttpListener listener)
+        {
+            ListenerPrefix lp = new ListenerPrefix(p);
+            if (lp.Path.IndexOf('%') != -1)
+                throw new HttpListenerException(400, "Invalid path.");
+
+            if (lp.Path.IndexOf("//", StringComparison.Ordinal) != -1) // TODO: Code?
+                throw new HttpListenerException(400, "Invalid path.");
+
+            // listens on all the interfaces if host name cannot be parsed by IPAddress.
+            EndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure).Result;
+            epl.AddPrefix(lp, listener);
+        }
+
+        private static IpAddressInfo GetIpAnyAddress(HttpListener listener)
+        {
+            return listener.EnableDualMode ? IpAddressInfo.IPv6Any : IpAddressInfo.Any;
+        }
+
+        static async Task<EndPointListener> GetEPListener(ILogger logger, string host, int port, HttpListener listener, bool secure)
+        {
+            var networkManager = listener.NetworkManager;
+
+            IpAddressInfo addr;
+            if (host == "*" || host == "+")
+                addr = GetIpAnyAddress(listener);
+            else if (networkManager.TryParseIpAddress(host, out addr) == false)
+            {
+                try
+                {
+                    addr = (await networkManager.GetHostAddressesAsync(host).ConfigureAwait(false)).FirstOrDefault() ?? 
+                        GetIpAnyAddress(listener);
+                }
+                catch
+                {
+                    addr = GetIpAnyAddress(listener);
+                }
+            }
+
+            Dictionary<int, EndPointListener> p = null;  // Dictionary<int, EndPointListener>
+            if (!ip_to_endpoints.TryGetValue(addr.Address, out p))
+            {
+                p = new Dictionary<int, EndPointListener>();
+                ip_to_endpoints[addr.Address] = p;
+            }
+
+            EndPointListener epl = null;
+            if (p.ContainsKey(port))
+            {
+                epl = (EndPointListener)p[port];
+            }
+            else
+            {
+                epl = new EndPointListener(listener, addr, port, secure, listener.Certificate, logger, listener.CryptoProvider, listener.StreamFactory, listener.SocketFactory, listener.MemoryStreamFactory, listener.TextEncoding);
+                p[port] = epl;
+            }
+
+            return epl;
+        }
+
+        public static void RemoveEndPoint(EndPointListener epl, IpEndPointInfo ep)
+        {
+            lock (ip_to_endpoints)
+            {
+                // Dictionary<int, EndPointListener> p
+                Dictionary<int, EndPointListener> p;
+                if (ip_to_endpoints.TryGetValue(ep.IpAddress.Address, out p))
+                {
+                    p.Remove(ep.Port);
+                    if (p.Count == 0)
+                    {
+                        ip_to_endpoints.Remove(ep.IpAddress.Address);
+                    }
+                }
+                epl.Close();
+            }
+        }
+
+        public static void RemoveListener(ILogger logger, HttpListener listener)
+        {
+            lock (ip_to_endpoints)
+            {
+                foreach (string prefix in listener.Prefixes)
+                {
+                    RemovePrefixInternal(logger, prefix, listener);
+                }
+            }
+        }
+
+        public static void RemovePrefix(ILogger logger, string prefix, HttpListener listener)
+        {
+            lock (ip_to_endpoints)
+            {
+                RemovePrefixInternal(logger, prefix, listener);
+            }
+        }
+
+        static void RemovePrefixInternal(ILogger logger, string prefix, HttpListener listener)
+        {
+            ListenerPrefix lp = new ListenerPrefix(prefix);
+            if (lp.Path.IndexOf('%') != -1)
+                return;
+
+            if (lp.Path.IndexOf("//", StringComparison.Ordinal) != -1)
+                return;
+
+            EndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure).Result;
+            epl.RemovePrefix(lp, listener);
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpConnection.cs b/SocketHttpListener.Portable/Net/HttpConnection.cs
new file mode 100644
index 000000000..d31da4132
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpConnection.cs
@@ -0,0 +1,550 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    sealed class HttpConnection
+    {
+        const int BufferSize = 8192;
+        ISocket sock;
+        Stream stream;
+        EndPointListener epl;
+        MemoryStream ms;
+        byte[] buffer;
+        HttpListenerContext context;
+        StringBuilder current_line;
+        ListenerPrefix prefix;
+        RequestStream i_stream;
+        ResponseStream o_stream;
+        bool chunked;
+        int reuses;
+        bool context_bound;
+        bool secure;
+        int s_timeout = 300000; // 90k ms for first request, 15k ms from then on
+        IpEndPointInfo local_ep;
+        HttpListener last_listener;
+        int[] client_cert_errors;
+        ICertificate cert;
+        Stream ssl_stream;
+
+        private ILogger _logger;
+        private readonly ICryptoProvider _cryptoProvider;
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
+        private readonly ITextEncoding _textEncoding;
+        private readonly IStreamFactory _streamFactory;
+
+        private HttpConnection(ILogger logger, ISocket sock, EndPointListener epl, bool secure, ICertificate cert, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        {
+            _logger = logger;
+            this.sock = sock;
+            this.epl = epl;
+            this.secure = secure;
+            this.cert = cert;
+            _cryptoProvider = cryptoProvider;
+            _memoryStreamFactory = memoryStreamFactory;
+            _textEncoding = textEncoding;
+            _streamFactory = streamFactory;
+        }
+
+        private async Task InitStream()
+        {
+            if (secure == false)
+            {
+                stream = _streamFactory.CreateNetworkStream(sock, false);
+            }
+            else
+            {
+                //ssl_stream = epl.Listener.CreateSslStream(new NetworkStream(sock, false), false, (t, c, ch, e) =>
+                //{
+                //    if (c == null)
+                //        return true;
+                //    var c2 = c as X509Certificate2;
+                //    if (c2 == null)
+                //        c2 = new X509Certificate2(c.GetRawCertData());
+                //    client_cert = c2;
+                //    client_cert_errors = new int[] { (int)e };
+                //    return true;
+                //});
+                //stream = ssl_stream.AuthenticatedStream;
+
+                ssl_stream = _streamFactory.CreateSslStream(_streamFactory.CreateNetworkStream(sock, false), false);
+                await _streamFactory.AuthenticateSslStreamAsServer(ssl_stream, cert).ConfigureAwait(false);
+                stream = ssl_stream;
+            }
+            Init();
+        }
+
+        public static async Task<HttpConnection> Create(ILogger logger, ISocket sock, EndPointListener epl, bool secure, ICertificate cert, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        {
+            var connection = new HttpConnection(logger, sock, epl, secure, cert, cryptoProvider, streamFactory, memoryStreamFactory, textEncoding);
+
+            await connection.InitStream().ConfigureAwait(false);
+
+            return connection;
+        }
+
+        public Stream Stream
+        {
+            get
+            {
+                return stream;
+            }
+        }
+
+        internal int[] ClientCertificateErrors
+        {
+            get { return client_cert_errors; }
+        }
+
+        void Init()
+        {
+            if (ssl_stream != null)
+            {
+                //ssl_stream.AuthenticateAsServer(client_cert, true, (SslProtocols)ServicePointManager.SecurityProtocol, false);
+                //_streamFactory.AuthenticateSslStreamAsServer(ssl_stream, cert);
+            }
+
+            context_bound = false;
+            i_stream = null;
+            o_stream = null;
+            prefix = null;
+            chunked = false;
+            ms = _memoryStreamFactory.CreateNew();
+            position = 0;
+            input_state = InputState.RequestLine;
+            line_state = LineState.None;
+            context = new HttpListenerContext(this, _logger, _cryptoProvider, _memoryStreamFactory, _textEncoding);
+        }
+
+        public bool IsClosed
+        {
+            get { return (sock == null); }
+        }
+
+        public int Reuses
+        {
+            get { return reuses; }
+        }
+
+        public IpEndPointInfo LocalEndPoint
+        {
+            get
+            {
+                if (local_ep != null)
+                    return local_ep;
+
+                local_ep = (IpEndPointInfo)sock.LocalEndPoint;
+                return local_ep;
+            }
+        }
+
+        public IpEndPointInfo RemoteEndPoint
+        {
+            get { return (IpEndPointInfo)sock.RemoteEndPoint; }
+        }
+
+        public bool IsSecure
+        {
+            get { return secure; }
+        }
+
+        public ListenerPrefix Prefix
+        {
+            get { return prefix; }
+            set { prefix = value; }
+        }
+
+        public async Task BeginReadRequest()
+        {
+            if (buffer == null)
+                buffer = new byte[BufferSize];
+
+            try
+            {
+                //if (reuses == 1)
+                //    s_timeout = 15000;
+                var nRead = await stream.ReadAsync(buffer, 0, BufferSize).ConfigureAwait(false);
+
+                OnReadInternal(nRead);
+            }
+            catch (Exception ex)
+            {
+                OnReadInternalException(ms, ex);
+            }
+        }
+
+        public RequestStream GetRequestStream(bool chunked, long contentlength)
+        {
+            if (i_stream == null)
+            {
+                byte[] buffer;
+                _memoryStreamFactory.TryGetBuffer(ms, out buffer);
+
+                int length = (int)ms.Length;
+                ms = null;
+                if (chunked)
+                {
+                    this.chunked = true;
+                    //context.Response.SendChunked = true;
+                    i_stream = new ChunkedInputStream(context, stream, buffer, position, length - position);
+                }
+                else
+                {
+                    i_stream = new RequestStream(stream, buffer, position, length - position, contentlength);
+                }
+            }
+            return i_stream;
+        }
+
+        public ResponseStream GetResponseStream()
+        {
+            // TODO: can we get this stream before reading the input?
+            if (o_stream == null)
+            {
+                HttpListener listener = context.Listener;
+
+                if (listener == null)
+                    return new ResponseStream(stream, context.Response, true, _memoryStreamFactory, _textEncoding);
+
+                o_stream = new ResponseStream(stream, context.Response, listener.IgnoreWriteExceptions, _memoryStreamFactory, _textEncoding);
+            }
+            return o_stream;
+        }
+
+        void OnReadInternal(int nread)
+        {
+            ms.Write(buffer, 0, nread);
+            if (ms.Length > 32768)
+            {
+                SendError("Bad request", 400);
+                Close(true);
+                return;
+            }
+
+            if (nread == 0)
+            {
+                //if (ms.Length > 0)
+                //	SendError (); // Why bother?
+                CloseSocket();
+                Unbind();
+                return;
+            }
+
+            if (ProcessInput(ms))
+            {
+                if (!context.HaveError)
+                    context.Request.FinishInitialization();
+
+                if (context.HaveError)
+                {
+                    SendError();
+                    Close(true);
+                    return;
+                }
+
+                if (!epl.BindContext(context))
+                {
+                    SendError("Invalid host", 400);
+                    Close(true);
+                    return;
+                }
+                HttpListener listener = context.Listener;
+                if (last_listener != listener)
+                {
+                    RemoveConnection();
+                    listener.AddConnection(this);
+                    last_listener = listener;
+                }
+
+                context_bound = true;
+                listener.RegisterContext(context);
+                return;
+            }
+
+            BeginReadRequest();
+        }
+
+        private void OnReadInternalException(MemoryStream ms, Exception ex)
+        {
+            //_logger.ErrorException("Error in HttpConnection.OnReadInternal", ex);
+
+            if (ms != null && ms.Length > 0)
+                SendError();
+            if (sock != null)
+            {
+                CloseSocket();
+                Unbind();
+            }
+        }
+
+        void RemoveConnection()
+        {
+            if (last_listener == null)
+                epl.RemoveConnection(this);
+            else
+                last_listener.RemoveConnection(this);
+        }
+
+        enum InputState
+        {
+            RequestLine,
+            Headers
+        }
+
+        enum LineState
+        {
+            None,
+            CR,
+            LF
+        }
+
+        InputState input_state = InputState.RequestLine;
+        LineState line_state = LineState.None;
+        int position;
+
+        // true -> done processing
+        // false -> need more input
+        bool ProcessInput(MemoryStream ms)
+        {
+            byte[] buffer;
+            _memoryStreamFactory.TryGetBuffer(ms, out buffer);
+
+            int len = (int)ms.Length;
+            int used = 0;
+            string line;
+
+            while (true)
+            {
+                if (context.HaveError)
+                    return true;
+
+                if (position >= len)
+                    break;
+
+                try
+                {
+                    line = ReadLine(buffer, position, len - position, ref used);
+                    position += used;
+                }
+                catch
+                {
+                    context.ErrorMessage = "Bad request";
+                    context.ErrorStatus = 400;
+                    return true;
+                }
+
+                if (line == null)
+                    break;
+
+                if (line == "")
+                {
+                    if (input_state == InputState.RequestLine)
+                        continue;
+                    current_line = null;
+                    ms = null;
+                    return true;
+                }
+
+                if (input_state == InputState.RequestLine)
+                {
+                    context.Request.SetRequestLine(line);
+                    input_state = InputState.Headers;
+                }
+                else
+                {
+                    try
+                    {
+                        context.Request.AddHeader(line);
+                    }
+                    catch (Exception e)
+                    {
+                        context.ErrorMessage = e.Message;
+                        context.ErrorStatus = 400;
+                        return true;
+                    }
+                }
+            }
+
+            if (used == len)
+            {
+                ms.SetLength(0);
+                position = 0;
+            }
+            return false;
+        }
+
+        string ReadLine(byte[] buffer, int offset, int len, ref int used)
+        {
+            if (current_line == null)
+                current_line = new StringBuilder(128);
+            int last = offset + len;
+            used = 0;
+
+            for (int i = offset; i < last && line_state != LineState.LF; i++)
+            {
+                used++;
+                byte b = buffer[i];
+                if (b == 13)
+                {
+                    line_state = LineState.CR;
+                }
+                else if (b == 10)
+                {
+                    line_state = LineState.LF;
+                }
+                else
+                {
+                    current_line.Append((char)b);
+                }
+            }
+
+            string result = null;
+            if (line_state == LineState.LF)
+            {
+                line_state = LineState.None;
+                result = current_line.ToString();
+                current_line.Length = 0;
+            }
+
+            return result;
+        }
+
+        public void SendError(string msg, int status)
+        {
+            try
+            {
+                HttpListenerResponse response = context.Response;
+                response.StatusCode = status;
+                response.ContentType = "text/html";
+                string description = HttpListenerResponse.GetStatusDescription(status);
+                string str;
+                if (msg != null)
+                    str = String.Format("<h1>{0} ({1})</h1>", description, msg);
+                else
+                    str = String.Format("<h1>{0}</h1>", description);
+
+                byte[] error = context.Response.ContentEncoding.GetBytes(str);
+                response.Close(error, false);
+            }
+            catch
+            {
+                // response was already closed
+            }
+        }
+
+        public void SendError()
+        {
+            SendError(context.ErrorMessage, context.ErrorStatus);
+        }
+
+        void Unbind()
+        {
+            if (context_bound)
+            {
+                epl.UnbindContext(context);
+                context_bound = false;
+            }
+        }
+
+        public void Close()
+        {
+            Close(false);
+        }
+
+        private void CloseSocket()
+        {
+            if (sock == null)
+                return;
+
+            try
+            {
+                sock.Close();
+            }
+            catch
+            {
+            }
+            finally
+            {
+                sock = null;
+            }
+            RemoveConnection();
+        }
+
+        internal void Close(bool force_close)
+        {
+            if (sock != null)
+            {
+                if (!context.Request.IsWebSocketRequest || force_close)
+                {
+                    Stream st = GetResponseStream();
+                    if (st != null)
+                        st.Dispose();
+
+                    o_stream = null;
+                }
+            }
+
+            if (sock != null)
+            {
+                force_close |= !context.Request.KeepAlive;
+                if (!force_close)
+                    force_close = (context.Response.Headers["connection"] == "close");
+                /*
+				if (!force_close) {
+//					bool conn_close = (status_code == 400 || status_code == 408 || status_code == 411 ||
+//							status_code == 413 || status_code == 414 || status_code == 500 ||
+//							status_code == 503);
+					force_close |= (context.Request.ProtocolVersion <= HttpVersion.Version10);
+				}
+				*/
+
+                if (!force_close && context.Request.FlushInput())
+                {
+                    if (chunked && context.Response.ForceCloseChunked == false)
+                    {
+                        // Don't close. Keep working.
+                        reuses++;
+                        Unbind();
+                        Init();
+                        BeginReadRequest();
+                        return;
+                    }
+
+                    reuses++;
+                    Unbind();
+                    Init();
+                    BeginReadRequest();
+                    return;
+                }
+
+                ISocket s = sock;
+                sock = null;
+                try
+                {
+                    if (s != null)
+                        s.Shutdown(true);
+                }
+                catch
+                {
+                }
+                finally
+                {
+                    if (s != null)
+                        s.Close();
+                }
+                Unbind();
+                RemoveConnection();
+                return;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/Net/HttpListener.cs b/SocketHttpListener.Portable/Net/HttpListener.cs
new file mode 100644
index 000000000..83660100a
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpListener.cs
@@ -0,0 +1,299 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    public sealed class HttpListener : IDisposable
+    {
+        internal ICryptoProvider CryptoProvider { get; private set; }
+        internal IStreamFactory StreamFactory { get; private set; }
+        internal ISocketFactory SocketFactory { get; private set; }
+        internal ITextEncoding TextEncoding { get; private set; }
+        internal IMemoryStreamFactory MemoryStreamFactory { get; private set; }
+        internal INetworkManager NetworkManager { get; private set; }
+
+        public bool EnableDualMode { get; set; }
+
+        AuthenticationSchemes auth_schemes;
+        HttpListenerPrefixCollection prefixes;
+        AuthenticationSchemeSelector auth_selector;
+        string realm;
+        bool ignore_write_exceptions;
+        bool unsafe_ntlm_auth;
+        bool listening;
+        bool disposed;
+
+        Dictionary<HttpListenerContext, HttpListenerContext> registry;   // Dictionary<HttpListenerContext,HttpListenerContext> 
+        Dictionary<HttpConnection, HttpConnection> connections;
+        private ILogger _logger;
+        private ICertificate _certificate;
+
+        public Action<HttpListenerContext> OnContext { get; set; }
+
+        public HttpListener(ILogger logger, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, ISocketFactory socketFactory, INetworkManager networkManager, ITextEncoding textEncoding, IMemoryStreamFactory memoryStreamFactory)
+        {
+            _logger = logger;
+            CryptoProvider = cryptoProvider;
+            StreamFactory = streamFactory;
+            SocketFactory = socketFactory;
+            NetworkManager = networkManager;
+            TextEncoding = textEncoding;
+            MemoryStreamFactory = memoryStreamFactory;
+            prefixes = new HttpListenerPrefixCollection(logger, this);
+            registry = new Dictionary<HttpListenerContext, HttpListenerContext>();
+            connections = new Dictionary<HttpConnection, HttpConnection>();
+            auth_schemes = AuthenticationSchemes.Anonymous;
+        }
+
+        public HttpListener(ICertificate certificate, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, ISocketFactory socketFactory, INetworkManager networkManager, ITextEncoding textEncoding, IMemoryStreamFactory memoryStreamFactory)
+            :this(new NullLogger(), certificate, cryptoProvider, streamFactory, socketFactory, networkManager, textEncoding, memoryStreamFactory)
+        {
+        }
+
+        public HttpListener(ILogger logger, ICertificate certificate, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, ISocketFactory socketFactory, INetworkManager networkManager, ITextEncoding textEncoding, IMemoryStreamFactory memoryStreamFactory)
+            : this(logger, cryptoProvider, streamFactory, socketFactory, networkManager, textEncoding, memoryStreamFactory)
+        {
+            _certificate = certificate;
+        }
+
+        public void LoadCert(ICertificate cert)
+        {
+            _certificate = cert;
+        }
+
+        // TODO: Digest, NTLM and Negotiate require ControlPrincipal
+        public AuthenticationSchemes AuthenticationSchemes
+        {
+            get { return auth_schemes; }
+            set
+            {
+                CheckDisposed();
+                auth_schemes = value;
+            }
+        }
+
+        public AuthenticationSchemeSelector AuthenticationSchemeSelectorDelegate
+        {
+            get { return auth_selector; }
+            set
+            {
+                CheckDisposed();
+                auth_selector = value;
+            }
+        }
+
+        public bool IgnoreWriteExceptions
+        {
+            get { return ignore_write_exceptions; }
+            set
+            {
+                CheckDisposed();
+                ignore_write_exceptions = value;
+            }
+        }
+
+        public bool IsListening
+        {
+            get { return listening; }
+        }
+
+        public static bool IsSupported
+        {
+            get { return true; }
+        }
+
+        public HttpListenerPrefixCollection Prefixes
+        {
+            get
+            {
+                CheckDisposed();
+                return prefixes;
+            }
+        }
+
+        // TODO: use this
+        public string Realm
+        {
+            get { return realm; }
+            set
+            {
+                CheckDisposed();
+                realm = value;
+            }
+        }
+
+        public bool UnsafeConnectionNtlmAuthentication
+        {
+            get { return unsafe_ntlm_auth; }
+            set
+            {
+                CheckDisposed();
+                unsafe_ntlm_auth = value;
+            }
+        }
+
+        //internal IMonoSslStream CreateSslStream(Stream innerStream, bool ownsStream, MSI.MonoRemoteCertificateValidationCallback callback)
+        //{
+        //    lock (registry)
+        //    {
+        //        if (tlsProvider == null)
+        //            tlsProvider = MonoTlsProviderFactory.GetProviderInternal();
+        //        if (tlsSettings == null)
+        //            tlsSettings = MSI.MonoTlsSettings.CopyDefaultSettings();
+        //        if (tlsSettings.RemoteCertificateValidationCallback == null)
+        //            tlsSettings.RemoteCertificateValidationCallback = callback;
+        //        return tlsProvider.CreateSslStream(innerStream, ownsStream, tlsSettings);
+        //    }
+        //}
+
+        internal ICertificate Certificate
+        {
+            get { return _certificate; }
+        }
+
+        public void Abort()
+        {
+            if (disposed)
+                return;
+
+            if (!listening)
+            {
+                return;
+            }
+
+            Close(true);
+        }
+
+        public void Close()
+        {
+            if (disposed)
+                return;
+
+            if (!listening)
+            {
+                disposed = true;
+                return;
+            }
+
+            Close(true);
+            disposed = true;
+        }
+
+        void Close(bool force)
+        {
+            CheckDisposed();
+            EndPointManager.RemoveListener(_logger, this);
+            Cleanup(force);
+        }
+
+        void Cleanup(bool close_existing)
+        {
+            lock (registry)
+            {
+                if (close_existing)
+                {
+                    // Need to copy this since closing will call UnregisterContext
+                    ICollection keys = registry.Keys;
+                    var all = new HttpListenerContext[keys.Count];
+                    keys.CopyTo(all, 0);
+                    registry.Clear();
+                    for (int i = all.Length - 1; i >= 0; i--)
+                        all[i].Connection.Close(true);
+                }
+
+                lock (connections)
+                {
+                    ICollection keys = connections.Keys;
+                    var conns = new HttpConnection[keys.Count];
+                    keys.CopyTo(conns, 0);
+                    connections.Clear();
+                    for (int i = conns.Length - 1; i >= 0; i--)
+                        conns[i].Close(true);
+                }
+            }
+        }
+
+        internal AuthenticationSchemes SelectAuthenticationScheme(HttpListenerContext context)
+        {
+            if (AuthenticationSchemeSelectorDelegate != null)
+                return AuthenticationSchemeSelectorDelegate(context.Request);
+            else
+                return auth_schemes;
+        }
+
+        public void Start()
+        {
+            CheckDisposed();
+            if (listening)
+                return;
+
+            EndPointManager.AddListener(_logger, this);
+            listening = true;
+        }
+
+        public void Stop()
+        {
+            CheckDisposed();
+            listening = false;
+            Close(false);
+        }
+
+        void IDisposable.Dispose()
+        {
+            if (disposed)
+                return;
+
+            Close(true); //TODO: Should we force here or not?
+            disposed = true;
+        }
+
+        internal void CheckDisposed()
+        {
+            if (disposed)
+                throw new ObjectDisposedException(GetType().ToString());
+        }
+
+        internal void RegisterContext(HttpListenerContext context)
+        {
+            if (OnContext != null && IsListening)
+            {
+                OnContext(context);
+            }
+
+            lock (registry)
+                registry[context] = context;
+        }
+
+        internal void UnregisterContext(HttpListenerContext context)
+        {
+            lock (registry)
+                registry.Remove(context);
+        }
+
+        internal void AddConnection(HttpConnection cnc)
+        {
+            lock (connections)
+            {
+                connections[cnc] = cnc;
+            }
+        }
+
+        internal void RemoveConnection(HttpConnection cnc)
+        {
+            lock (connections)
+            {
+                connections.Remove(cnc);
+            }
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpListenerBasicIdentity.cs b/SocketHttpListener.Portable/Net/HttpListenerBasicIdentity.cs
new file mode 100644
index 000000000..faa26693d
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpListenerBasicIdentity.cs
@@ -0,0 +1,70 @@
+using System.Security.Principal;
+
+namespace SocketHttpListener.Net
+{
+    public class HttpListenerBasicIdentity : GenericIdentity
+    {
+        string password;
+
+        public HttpListenerBasicIdentity(string username, string password)
+            : base(username, "Basic")
+        {
+            this.password = password;
+        }
+
+        public virtual string Password
+        {
+            get { return password; }
+        }
+    }
+
+    public class GenericIdentity : IIdentity
+    {
+        private string m_name;
+        private string m_type;
+
+        public GenericIdentity(string name)
+        {
+            if (name == null)
+                throw new System.ArgumentNullException("name");
+
+            m_name = name;
+            m_type = "";
+        }
+
+        public GenericIdentity(string name, string type)
+        {
+            if (name == null)
+                throw new System.ArgumentNullException("name");
+            if (type == null)
+                throw new System.ArgumentNullException("type");
+
+            m_name = name;
+            m_type = type;
+        }
+
+        public virtual string Name
+        {
+            get
+            {
+                return m_name;
+            }
+        }
+
+        public virtual string AuthenticationType
+        {
+            get
+            {
+                return m_type;
+            }
+        }
+
+        public virtual bool IsAuthenticated
+        {
+            get
+            {
+                return !m_name.Equals("");
+            }
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpListenerContext.cs b/SocketHttpListener.Portable/Net/HttpListenerContext.cs
new file mode 100644
index 000000000..84c6a8c19
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpListenerContext.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Net;
+using System.Security.Principal;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Net.WebSockets;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    public sealed class HttpListenerContext
+    {
+        HttpListenerRequest request;
+        HttpListenerResponse response;
+        IPrincipal user;
+        HttpConnection cnc;
+        string error;
+        int err_status = 400;
+        internal HttpListener Listener;
+        private readonly ILogger _logger;
+        private readonly ICryptoProvider _cryptoProvider;
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
+        private readonly ITextEncoding _textEncoding;
+
+        internal HttpListenerContext(HttpConnection cnc, ILogger logger, ICryptoProvider cryptoProvider, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        {
+            this.cnc = cnc;
+            _logger = logger;
+            _cryptoProvider = cryptoProvider;
+            _memoryStreamFactory = memoryStreamFactory;
+            _textEncoding = textEncoding;
+            request = new HttpListenerRequest(this, _textEncoding);
+            response = new HttpListenerResponse(this, _logger, _textEncoding);
+        }
+
+        internal int ErrorStatus
+        {
+            get { return err_status; }
+            set { err_status = value; }
+        }
+
+        internal string ErrorMessage
+        {
+            get { return error; }
+            set { error = value; }
+        }
+
+        internal bool HaveError
+        {
+            get { return (error != null); }
+        }
+
+        internal HttpConnection Connection
+        {
+            get { return cnc; }
+        }
+
+        public HttpListenerRequest Request
+        {
+            get { return request; }
+        }
+
+        public HttpListenerResponse Response
+        {
+            get { return response; }
+        }
+
+        public IPrincipal User
+        {
+            get { return user; }
+        }
+
+        internal void ParseAuthentication(AuthenticationSchemes expectedSchemes)
+        {
+            if (expectedSchemes == AuthenticationSchemes.Anonymous)
+                return;
+
+            // TODO: Handle NTLM/Digest modes
+            string header = request.Headers["Authorization"];
+            if (header == null || header.Length < 2)
+                return;
+
+            string[] authenticationData = header.Split(new char[] { ' ' }, 2);
+            if (string.Equals(authenticationData[0], "basic", StringComparison.OrdinalIgnoreCase))
+            {
+                user = ParseBasicAuthentication(authenticationData[1]);
+            }
+            // TODO: throw if malformed -> 400 bad request
+        }
+
+        internal IPrincipal ParseBasicAuthentication(string authData)
+        {
+            try
+            {
+                // Basic AUTH Data is a formatted Base64 String
+                //string domain = null;
+                string user = null;
+                string password = null;
+                int pos = -1;
+                var authDataBytes = Convert.FromBase64String(authData);
+                string authString = _textEncoding.GetDefaultEncoding().GetString(authDataBytes, 0, authDataBytes.Length);
+
+                // The format is DOMAIN\username:password
+                // Domain is optional
+
+                pos = authString.IndexOf(':');
+
+                // parse the password off the end
+                password = authString.Substring(pos + 1);
+
+                // discard the password
+                authString = authString.Substring(0, pos);
+
+                // check if there is a domain
+                pos = authString.IndexOf('\\');
+
+                if (pos > 0)
+                {
+                    //domain = authString.Substring (0, pos);
+                    user = authString.Substring(pos);
+                }
+                else
+                {
+                    user = authString;
+                }
+
+                HttpListenerBasicIdentity identity = new HttpListenerBasicIdentity(user, password);
+                // TODO: What are the roles MS sets
+                return new GenericPrincipal(identity, new string[0]);
+            }
+            catch (Exception)
+            {
+                // Invalid auth data is swallowed silently
+                return null;
+            }
+        }
+
+        public HttpListenerWebSocketContext AcceptWebSocket(string protocol)
+        {
+            if (protocol != null)
+            {
+                if (protocol.Length == 0)
+                    throw new ArgumentException("An empty string.", "protocol");
+
+                if (!protocol.IsToken())
+                    throw new ArgumentException("Contains an invalid character.", "protocol");
+            }
+
+            return new HttpListenerWebSocketContext(this, protocol, _cryptoProvider, _memoryStreamFactory);
+        }
+    }
+
+    public class GenericPrincipal : IPrincipal
+    {
+        private IIdentity m_identity;
+        private string[] m_roles;
+
+        public GenericPrincipal(IIdentity identity, string[] roles)
+        {
+            if (identity == null)
+                throw new ArgumentNullException("identity");
+
+            m_identity = identity;
+            if (roles != null)
+            {
+                m_roles = new string[roles.Length];
+                for (int i = 0; i < roles.Length; ++i)
+                {
+                    m_roles[i] = roles[i];
+                }
+            }
+            else
+            {
+                m_roles = null;
+            }
+        }
+
+        public virtual IIdentity Identity
+        {
+            get
+            {
+                return m_identity;
+            }
+        }
+
+        public virtual bool IsInRole(string role)
+        {
+            if (role == null || m_roles == null)
+                return false;
+
+            for (int i = 0; i < m_roles.Length; ++i)
+            {
+                if (m_roles[i] != null && String.Compare(m_roles[i], role, StringComparison.OrdinalIgnoreCase) == 0)
+                    return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpListenerPrefixCollection.cs b/SocketHttpListener.Portable/Net/HttpListenerPrefixCollection.cs
new file mode 100644
index 000000000..0b05539ee
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpListenerPrefixCollection.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using MediaBrowser.Model.Logging;
+
+namespace SocketHttpListener.Net
+{
+    public class HttpListenerPrefixCollection : ICollection<string>, IEnumerable<string>, IEnumerable
+    {
+        List<string> prefixes = new List<string>();
+        HttpListener listener;
+
+        private ILogger _logger;
+
+        internal HttpListenerPrefixCollection(ILogger logger, HttpListener listener)
+        {
+            _logger = logger;
+            this.listener = listener;
+        }
+
+        public int Count
+        {
+            get { return prefixes.Count; }
+        }
+
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        public bool IsSynchronized
+        {
+            get { return false; }
+        }
+
+        public void Add(string uriPrefix)
+        {
+            listener.CheckDisposed();
+            ListenerPrefix.CheckUri(uriPrefix);
+            if (prefixes.Contains(uriPrefix))
+                return;
+
+            prefixes.Add(uriPrefix);
+            if (listener.IsListening)
+                EndPointManager.AddPrefix(_logger, uriPrefix, listener);
+        }
+
+        public void Clear()
+        {
+            listener.CheckDisposed();
+            prefixes.Clear();
+            if (listener.IsListening)
+                EndPointManager.RemoveListener(_logger, listener);
+        }
+
+        public bool Contains(string uriPrefix)
+        {
+            listener.CheckDisposed();
+            return prefixes.Contains(uriPrefix);
+        }
+
+        public void CopyTo(string[] array, int offset)
+        {
+            listener.CheckDisposed();
+            prefixes.CopyTo(array, offset);
+        }
+
+        public void CopyTo(Array array, int offset)
+        {
+            listener.CheckDisposed();
+            ((ICollection)prefixes).CopyTo(array, offset);
+        }
+
+        public IEnumerator<string> GetEnumerator()
+        {
+            return prefixes.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return prefixes.GetEnumerator();
+        }
+
+        public bool Remove(string uriPrefix)
+        {
+            listener.CheckDisposed();
+            if (uriPrefix == null)
+                throw new ArgumentNullException("uriPrefix");
+
+            bool result = prefixes.Remove(uriPrefix);
+            if (result && listener.IsListening)
+                EndPointManager.RemovePrefix(_logger, uriPrefix, listener);
+
+            return result;
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpListenerRequest.cs b/SocketHttpListener.Portable/Net/HttpListenerRequest.cs
new file mode 100644
index 000000000..63d5e510d
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpListenerRequest.cs
@@ -0,0 +1,654 @@
+using System;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    public sealed class HttpListenerRequest
+    {
+        string[] accept_types;
+        Encoding content_encoding;
+        long content_length;
+        bool cl_set;
+        CookieCollection cookies;
+        WebHeaderCollection headers;
+        string method;
+        Stream input_stream;
+        Version version;
+        QueryParamCollection query_string; // check if null is ok, check if read-only, check case-sensitiveness
+        string raw_url;
+        Uri url;
+        Uri referrer;
+        string[] user_languages;
+        HttpListenerContext context;
+        bool is_chunked;
+        bool ka_set;
+        bool keep_alive;
+
+        private readonly ITextEncoding _textEncoding;
+
+        internal HttpListenerRequest(HttpListenerContext context, ITextEncoding textEncoding)
+        {
+            this.context = context;
+            _textEncoding = textEncoding;
+            headers = new WebHeaderCollection();
+            version = HttpVersion.Version10;
+        }
+
+        static char[] separators = new char[] { ' ' };
+
+        internal void SetRequestLine(string req)
+        {
+            string[] parts = req.Split(separators, 3);
+            if (parts.Length != 3)
+            {
+                context.ErrorMessage = "Invalid request line (parts).";
+                return;
+            }
+
+            method = parts[0];
+            foreach (char c in method)
+            {
+                int ic = (int)c;
+
+                if ((ic >= 'A' && ic <= 'Z') ||
+                    (ic > 32 && c < 127 && c != '(' && c != ')' && c != '<' &&
+                     c != '<' && c != '>' && c != '@' && c != ',' && c != ';' &&
+                     c != ':' && c != '\\' && c != '"' && c != '/' && c != '[' &&
+                     c != ']' && c != '?' && c != '=' && c != '{' && c != '}'))
+                    continue;
+
+                context.ErrorMessage = "(Invalid verb)";
+                return;
+            }
+
+            raw_url = parts[1];
+            if (parts[2].Length != 8 || !parts[2].StartsWith("HTTP/"))
+            {
+                context.ErrorMessage = "Invalid request line (version).";
+                return;
+            }
+
+            try
+            {
+                version = new Version(parts[2].Substring(5));
+                if (version.Major < 1)
+                    throw new Exception();
+            }
+            catch
+            {
+                context.ErrorMessage = "Invalid request line (version).";
+                return;
+            }
+        }
+
+        void CreateQueryString(string query)
+        {
+            if (query == null || query.Length == 0)
+            {
+                query_string = new QueryParamCollection();
+                return;
+            }
+
+            query_string = new QueryParamCollection();
+            if (query[0] == '?')
+                query = query.Substring(1);
+            string[] components = query.Split('&');
+            foreach (string kv in components)
+            {
+                int pos = kv.IndexOf('=');
+                if (pos == -1)
+                {
+                    query_string.Add(null, WebUtility.UrlDecode(kv));
+                }
+                else
+                {
+                    string key = WebUtility.UrlDecode(kv.Substring(0, pos));
+                    string val = WebUtility.UrlDecode(kv.Substring(pos + 1));
+
+                    query_string.Add(key, val);
+                }
+            }
+        }
+
+        internal void FinishInitialization()
+        {
+            string host = UserHostName;
+            if (version > HttpVersion.Version10 && (host == null || host.Length == 0))
+            {
+                context.ErrorMessage = "Invalid host name";
+                return;
+            }
+
+            string path;
+            Uri raw_uri = null;
+            if (MaybeUri(raw_url.ToLowerInvariant()) && Uri.TryCreate(raw_url, UriKind.Absolute, out raw_uri))
+                path = raw_uri.PathAndQuery;
+            else
+                path = raw_url;
+
+            if ((host == null || host.Length == 0))
+                host = UserHostAddress;
+
+            if (raw_uri != null)
+                host = raw_uri.Host;
+
+            int colon = host.LastIndexOf(':');
+            if (colon >= 0)
+                host = host.Substring(0, colon);
+
+            string base_uri = String.Format("{0}://{1}:{2}",
+                (IsSecureConnection) ? (IsWebSocketRequest ? "wss" : "https") : (IsWebSocketRequest ? "ws" : "http"),
+                                host, LocalEndPoint.Port);
+
+            if (!Uri.TryCreate(base_uri + path, UriKind.Absolute, out url))
+            {
+                context.ErrorMessage = WebUtility.HtmlEncode("Invalid url: " + base_uri + path);
+                return; return;
+            }
+
+            CreateQueryString(url.Query);
+
+            if (version >= HttpVersion.Version11)
+            {
+                string t_encoding = Headers["Transfer-Encoding"];
+                is_chunked = (t_encoding != null && String.Compare(t_encoding, "chunked", StringComparison.OrdinalIgnoreCase) == 0);
+                // 'identity' is not valid!
+                if (t_encoding != null && !is_chunked)
+                {
+                    context.Connection.SendError(null, 501);
+                    return;
+                }
+            }
+
+            if (!is_chunked && !cl_set)
+            {
+                if (String.Compare(method, "POST", StringComparison.OrdinalIgnoreCase) == 0 ||
+                    String.Compare(method, "PUT", StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    context.Connection.SendError(null, 411);
+                    return;
+                }
+            }
+
+            if (String.Compare(Headers["Expect"], "100-continue", StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                ResponseStream output = context.Connection.GetResponseStream();
+                
+                var _100continue = _textEncoding.GetASCIIEncoding().GetBytes("HTTP/1.1 100 Continue\r\n\r\n");
+
+                output.InternalWrite(_100continue, 0, _100continue.Length);
+            }
+        }
+
+        static bool MaybeUri(string s)
+        {
+            int p = s.IndexOf(':');
+            if (p == -1)
+                return false;
+
+            if (p >= 10)
+                return false;
+
+            return IsPredefinedScheme(s.Substring(0, p));
+        }
+
+        //
+        // Using a simple block of if's is twice as slow as the compiler generated
+        // switch statement.   But using this tuned code is faster than the
+        // compiler generated code, with a million loops on x86-64:
+        //
+        // With "http": .10 vs .51 (first check)
+        // with "https": .16 vs .51 (second check)
+        // with "foo": .22 vs .31 (never found)
+        // with "mailto": .12 vs .51  (last check)
+        //
+        //
+        static bool IsPredefinedScheme(string scheme)
+        {
+            if (scheme == null || scheme.Length < 3)
+                return false;
+
+            char c = scheme[0];
+            if (c == 'h')
+                return (scheme == "http" || scheme == "https");
+            if (c == 'f')
+                return (scheme == "file" || scheme == "ftp");
+
+            if (c == 'n')
+            {
+                c = scheme[1];
+                if (c == 'e')
+                    return (scheme == "news" || scheme == "net.pipe" || scheme == "net.tcp");
+                if (scheme == "nntp")
+                    return true;
+                return false;
+            }
+            if ((c == 'g' && scheme == "gopher") || (c == 'm' && scheme == "mailto"))
+                return true;
+
+            return false;
+        }
+
+        internal static string Unquote(String str)
+        {
+            int start = str.IndexOf('\"');
+            int end = str.LastIndexOf('\"');
+            if (start >= 0 && end >= 0)
+                str = str.Substring(start + 1, end - 1);
+            return str.Trim();
+        }
+
+        internal void AddHeader(string header)
+        {
+            int colon = header.IndexOf(':');
+            if (colon == -1 || colon == 0)
+            {
+                context.ErrorMessage = "Bad Request";
+                context.ErrorStatus = 400;
+                return;
+            }
+
+            string name = header.Substring(0, colon).Trim();
+            string val = header.Substring(colon + 1).Trim();
+            string lower = name.ToLowerInvariant();
+            headers.SetInternal(name, val);
+            switch (lower)
+            {
+                case "accept-language":
+                    user_languages = val.Split(','); // yes, only split with a ','
+                    break;
+                case "accept":
+                    accept_types = val.Split(','); // yes, only split with a ','
+                    break;
+                case "content-length":
+                    try
+                    {
+                        //TODO: max. content_length?
+                        content_length = Int64.Parse(val.Trim());
+                        if (content_length < 0)
+                            context.ErrorMessage = "Invalid Content-Length.";
+                        cl_set = true;
+                    }
+                    catch
+                    {
+                        context.ErrorMessage = "Invalid Content-Length.";
+                    }
+
+                    break;
+                case "content-type":
+                    {
+                        var contents = val.Split(';');
+                        foreach (var content in contents)
+                        {
+                            var tmp = content.Trim();
+                            if (tmp.StartsWith("charset"))
+                            {
+                                var charset = tmp.GetValue("=");
+                                if (charset != null && charset.Length > 0)
+                                {
+                                    try
+                                    {
+
+                                        // Support upnp/dlna devices - CONTENT-TYPE: text/xml ; charset="utf-8"\r\n
+                                        charset = charset.Trim('"');
+                                        var index = charset.IndexOf('"');
+                                        if (index != -1) charset = charset.Substring(0, index);
+
+                                        content_encoding = Encoding.GetEncoding(charset);
+                                    }
+                                    catch
+                                    {
+                                        context.ErrorMessage = "Invalid Content-Type header: " + charset;
+                                    }
+                                }
+
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                case "referer":
+                    try
+                    {
+                        referrer = new Uri(val);
+                    }
+                    catch
+                    {
+                        referrer = new Uri("http://someone.is.screwing.with.the.headers.com/");
+                    }
+                    break;
+                case "cookie":
+                    if (cookies == null)
+                        cookies = new CookieCollection();
+
+                    string[] cookieStrings = val.Split(new char[] { ',', ';' });
+                    Cookie current = null;
+                    int version = 0;
+                    foreach (string cookieString in cookieStrings)
+                    {
+                        string str = cookieString.Trim();
+                        if (str.Length == 0)
+                            continue;
+                        if (str.StartsWith("$Version"))
+                        {
+                            version = Int32.Parse(Unquote(str.Substring(str.IndexOf('=') + 1)));
+                        }
+                        else if (str.StartsWith("$Path"))
+                        {
+                            if (current != null)
+                                current.Path = str.Substring(str.IndexOf('=') + 1).Trim();
+                        }
+                        else if (str.StartsWith("$Domain"))
+                        {
+                            if (current != null)
+                                current.Domain = str.Substring(str.IndexOf('=') + 1).Trim();
+                        }
+                        else if (str.StartsWith("$Port"))
+                        {
+                            if (current != null)
+                                current.Port = str.Substring(str.IndexOf('=') + 1).Trim();
+                        }
+                        else
+                        {
+                            if (current != null)
+                            {
+                                cookies.Add(current);
+                            }
+                            current = new Cookie();
+                            int idx = str.IndexOf('=');
+                            if (idx > 0)
+                            {
+                                current.Name = str.Substring(0, idx).Trim();
+                                current.Value = str.Substring(idx + 1).Trim();
+                            }
+                            else
+                            {
+                                current.Name = str.Trim();
+                                current.Value = String.Empty;
+                            }
+                            current.Version = version;
+                        }
+                    }
+                    if (current != null)
+                    {
+                        cookies.Add(current);
+                    }
+                    break;
+            }
+        }
+
+        // returns true is the stream could be reused.
+        internal bool FlushInput()
+        {
+            if (!HasEntityBody)
+                return true;
+
+            int length = 2048;
+            if (content_length > 0)
+                length = (int)Math.Min(content_length, (long)length);
+
+            byte[] bytes = new byte[length];
+            while (true)
+            {
+                // TODO: test if MS has a timeout when doing this
+                try
+                {
+                    var task = InputStream.ReadAsync(bytes, 0, length);
+                    var result = Task.WaitAll(new [] { task }, 1000);
+                    if (!result)
+                    {
+                        return false;
+                    }
+                    if (task.Result <= 0)
+                    {
+                        return true;
+                    }
+                }
+                catch (ObjectDisposedException e)
+                {
+                    input_stream = null;
+                    return true;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        public string[] AcceptTypes
+        {
+            get { return accept_types; }
+        }
+
+        public int ClientCertificateError
+        {
+            get
+            {
+                HttpConnection cnc = context.Connection;
+                //if (cnc.ClientCertificate == null)
+                //    throw new InvalidOperationException("No client certificate");
+                //int[] errors = cnc.ClientCertificateErrors;
+                //if (errors != null && errors.Length > 0)
+                //    return errors[0];
+                return 0;
+            }
+        }
+
+        public Encoding ContentEncoding
+        {
+            get
+            {
+                if (content_encoding == null)
+                    content_encoding = _textEncoding.GetDefaultEncoding();
+                return content_encoding;
+            }
+        }
+
+        public long ContentLength64
+        {
+            get { return content_length; }
+        }
+
+        public string ContentType
+        {
+            get { return headers["content-type"]; }
+        }
+
+        public CookieCollection Cookies
+        {
+            get
+            {
+                // TODO: check if the collection is read-only
+                if (cookies == null)
+                    cookies = new CookieCollection();
+                return cookies;
+            }
+        }
+
+        public bool HasEntityBody
+        {
+            get { return (content_length > 0 || is_chunked); }
+        }
+
+        public QueryParamCollection Headers
+        {
+            get { return headers; }
+        }
+
+        public string HttpMethod
+        {
+            get { return method; }
+        }
+
+        public Stream InputStream
+        {
+            get
+            {
+                if (input_stream == null)
+                {
+                    if (is_chunked || content_length > 0)
+                        input_stream = context.Connection.GetRequestStream(is_chunked, content_length);
+                    else
+                        input_stream = Stream.Null;
+                }
+
+                return input_stream;
+            }
+        }
+
+        public bool IsAuthenticated
+        {
+            get { return false; }
+        }
+
+        public bool IsLocal
+        {
+            get { return RemoteEndPoint.IpAddress.Equals(IpAddressInfo.Loopback) || RemoteEndPoint.IpAddress.Equals(IpAddressInfo.IPv6Loopback) || LocalEndPoint.IpAddress.Equals(RemoteEndPoint.IpAddress); }
+        }
+
+        public bool IsSecureConnection
+        {
+            get { return context.Connection.IsSecure; }
+        }
+
+        public bool KeepAlive
+        {
+            get
+            {
+                if (ka_set)
+                    return keep_alive;
+
+                ka_set = true;
+                // 1. Connection header
+                // 2. Protocol (1.1 == keep-alive by default)
+                // 3. Keep-Alive header
+                string cnc = headers["Connection"];
+                if (!String.IsNullOrEmpty(cnc))
+                {
+                    keep_alive = (0 == String.Compare(cnc, "keep-alive", StringComparison.OrdinalIgnoreCase));
+                }
+                else if (version == HttpVersion.Version11)
+                {
+                    keep_alive = true;
+                }
+                else
+                {
+                    cnc = headers["keep-alive"];
+                    if (!String.IsNullOrEmpty(cnc))
+                        keep_alive = (0 != String.Compare(cnc, "closed", StringComparison.OrdinalIgnoreCase));
+                }
+                return keep_alive;
+            }
+        }
+
+        public IpEndPointInfo LocalEndPoint
+        {
+            get { return context.Connection.LocalEndPoint; }
+        }
+
+        public Version ProtocolVersion
+        {
+            get { return version; }
+        }
+
+        public QueryParamCollection QueryString
+        {
+            get { return query_string; }
+        }
+
+        public string RawUrl
+        {
+            get { return raw_url; }
+        }
+
+        public IpEndPointInfo RemoteEndPoint
+        {
+            get { return context.Connection.RemoteEndPoint; }
+        }
+
+        public Guid RequestTraceIdentifier
+        {
+            get { return Guid.Empty; }
+        }
+
+        public Uri Url
+        {
+            get { return url; }
+        }
+
+        public Uri UrlReferrer
+        {
+            get { return referrer; }
+        }
+
+        public string UserAgent
+        {
+            get { return headers["user-agent"]; }
+        }
+
+        public string UserHostAddress
+        {
+            get { return LocalEndPoint.ToString(); }
+        }
+
+        public string UserHostName
+        {
+            get { return headers["host"]; }
+        }
+
+        public string[] UserLanguages
+        {
+            get { return user_languages; }
+        }
+
+        public string ServiceName
+        {
+            get
+            {
+                return null;
+            }
+        }
+
+        private bool _websocketRequestWasSet;
+        private bool _websocketRequest;
+
+        /// <summary>
+        /// Gets a value indicating whether the request is a WebSocket connection request.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the request is a WebSocket connection request; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsWebSocketRequest
+        {
+            get
+            {
+                if (!_websocketRequestWasSet)
+                {
+                    _websocketRequest = method == "GET" &&
+                                        version > HttpVersion.Version10 &&
+                                        headers.Contains("Upgrade", "websocket") &&
+                                        headers.Contains("Connection", "Upgrade");
+
+                    _websocketRequestWasSet = true;
+                }
+
+                return _websocketRequest;
+            }
+        }
+
+        public Task<ICertificate> GetClientCertificateAsync()
+        {
+            return Task.FromResult<ICertificate>(null);
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpListenerResponse.cs b/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
new file mode 100644
index 000000000..0bc827b5a
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
@@ -0,0 +1,517 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    public sealed class HttpListenerResponse : IDisposable
+    {
+        bool disposed;
+        Encoding content_encoding;
+        long content_length;
+        bool cl_set;
+        string content_type;
+        CookieCollection cookies;
+        WebHeaderCollection headers = new WebHeaderCollection();
+        bool keep_alive = true;
+        ResponseStream output_stream;
+        Version version = HttpVersion.Version11;
+        string location;
+        int status_code = 200;
+        string status_description = "OK";
+        bool chunked;
+        HttpListenerContext context;
+
+        internal bool HeadersSent;
+        internal object headers_lock = new object();
+
+        bool force_close_chunked;
+
+        private readonly ILogger _logger;
+        private readonly ITextEncoding _textEncoding;
+
+        internal HttpListenerResponse(HttpListenerContext context, ILogger logger, ITextEncoding textEncoding)
+        {
+            this.context = context;
+            _logger = logger;
+            _textEncoding = textEncoding;
+        }
+
+        internal bool CloseConnection
+        {
+            get
+            {
+                return headers["Connection"] == "close";
+            }
+        }
+
+        internal bool ForceCloseChunked
+        {
+            get { return force_close_chunked; }
+        }
+
+        public Encoding ContentEncoding
+        {
+            get
+            {
+                if (content_encoding == null)
+                    content_encoding = _textEncoding.GetDefaultEncoding();
+                return content_encoding;
+            }
+            set
+            {
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                content_encoding = value;
+            }
+        }
+
+        public long ContentLength64
+        {
+            get { return content_length; }
+            set
+            {
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                if (HeadersSent)
+                    throw new InvalidOperationException("Cannot be changed after headers are sent.");
+
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException("Must be >= 0", "value");
+
+                cl_set = true;
+                content_length = value;
+            }
+        }
+
+        public string ContentType
+        {
+            get { return content_type; }
+            set
+            {
+                // TODO: is null ok?
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                content_type = value;
+            }
+        }
+
+        // RFC 2109, 2965 + the netscape specification at http://wp.netscape.com/newsref/std/cookie_spec.html
+        public CookieCollection Cookies
+        {
+            get
+            {
+                if (cookies == null)
+                    cookies = new CookieCollection();
+                return cookies;
+            }
+            set { cookies = value; } // null allowed?
+        }
+
+        public WebHeaderCollection Headers
+        {
+            get { return headers; }
+            set
+            {
+                /**
+                 *	"If you attempt to set a Content-Length, Keep-Alive, Transfer-Encoding, or
+                 *	WWW-Authenticate header using the Headers property, an exception will be
+                 *	thrown. Use the KeepAlive or ContentLength64 properties to set these headers.
+                 *	You cannot set the Transfer-Encoding or WWW-Authenticate headers manually."
+                */
+                // TODO: check if this is marked readonly after headers are sent.
+                headers = value;
+            }
+        }
+
+        public bool KeepAlive
+        {
+            get { return keep_alive; }
+            set
+            {
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                keep_alive = value;
+            }
+        }
+
+        public Stream OutputStream
+        {
+            get
+            {
+                if (output_stream == null)
+                    output_stream = context.Connection.GetResponseStream();
+                return output_stream;
+            }
+        }
+
+        public Version ProtocolVersion
+        {
+            get { return version; }
+            set
+            {
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                if (value == null)
+                    throw new ArgumentNullException("value");
+
+                if (value.Major != 1 || (value.Minor != 0 && value.Minor != 1))
+                    throw new ArgumentException("Must be 1.0 or 1.1", "value");
+
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                version = value;
+            }
+        }
+
+        public string RedirectLocation
+        {
+            get { return location; }
+            set
+            {
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                location = value;
+            }
+        }
+
+        public bool SendChunked
+        {
+            get { return chunked; }
+            set
+            {
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                chunked = value;
+            }
+        }
+
+        public int StatusCode
+        {
+            get { return status_code; }
+            set
+            {
+                if (disposed)
+                    throw new ObjectDisposedException(GetType().ToString());
+
+                if (value < 100 || value > 999)
+                    throw new ProtocolViolationException("StatusCode must be between 100 and 999.");
+                status_code = value;
+                status_description = GetStatusDescription(value);
+            }
+        }
+
+        internal static string GetStatusDescription(int code)
+        {
+            switch (code)
+            {
+                case 100: return "Continue";
+                case 101: return "Switching Protocols";
+                case 102: return "Processing";
+                case 200: return "OK";
+                case 201: return "Created";
+                case 202: return "Accepted";
+                case 203: return "Non-Authoritative Information";
+                case 204: return "No Content";
+                case 205: return "Reset Content";
+                case 206: return "Partial Content";
+                case 207: return "Multi-Status";
+                case 300: return "Multiple Choices";
+                case 301: return "Moved Permanently";
+                case 302: return "Found";
+                case 303: return "See Other";
+                case 304: return "Not Modified";
+                case 305: return "Use Proxy";
+                case 307: return "Temporary Redirect";
+                case 400: return "Bad Request";
+                case 401: return "Unauthorized";
+                case 402: return "Payment Required";
+                case 403: return "Forbidden";
+                case 404: return "Not Found";
+                case 405: return "Method Not Allowed";
+                case 406: return "Not Acceptable";
+                case 407: return "Proxy Authentication Required";
+                case 408: return "Request Timeout";
+                case 409: return "Conflict";
+                case 410: return "Gone";
+                case 411: return "Length Required";
+                case 412: return "Precondition Failed";
+                case 413: return "Request Entity Too Large";
+                case 414: return "Request-Uri Too Long";
+                case 415: return "Unsupported Media Type";
+                case 416: return "Requested Range Not Satisfiable";
+                case 417: return "Expectation Failed";
+                case 422: return "Unprocessable Entity";
+                case 423: return "Locked";
+                case 424: return "Failed Dependency";
+                case 500: return "Internal Server Error";
+                case 501: return "Not Implemented";
+                case 502: return "Bad Gateway";
+                case 503: return "Service Unavailable";
+                case 504: return "Gateway Timeout";
+                case 505: return "Http Version Not Supported";
+                case 507: return "Insufficient Storage";
+            }
+            return "";
+        }
+
+        public string StatusDescription
+        {
+            get { return status_description; }
+            set
+            {
+                status_description = value;
+            }
+        }
+
+        void IDisposable.Dispose()
+        {
+            Close(true); //TODO: Abort or Close?
+        }
+
+        public void Abort()
+        {
+            if (disposed)
+                return;
+
+            Close(true);
+        }
+
+        public void AddHeader(string name, string value)
+        {
+            if (name == null)
+                throw new ArgumentNullException("name");
+
+            if (name == "")
+                throw new ArgumentException("'name' cannot be empty", "name");
+
+            //TODO: check for forbidden headers and invalid characters
+            if (value.Length > 65535)
+                throw new ArgumentOutOfRangeException("value");
+
+            headers.Set(name, value);
+        }
+
+        public void AppendCookie(Cookie cookie)
+        {
+            if (cookie == null)
+                throw new ArgumentNullException("cookie");
+
+            Cookies.Add(cookie);
+        }
+
+        public void AppendHeader(string name, string value)
+        {
+            if (name == null)
+                throw new ArgumentNullException("name");
+
+            if (name == "")
+                throw new ArgumentException("'name' cannot be empty", "name");
+
+            if (value.Length > 65535)
+                throw new ArgumentOutOfRangeException("value");
+
+            headers.Add(name, value);
+        }
+
+        void Close(bool force)
+        {
+            if (force)
+            {
+                _logger.Debug("HttpListenerResponse force closing HttpConnection");
+            }
+            disposed = true;
+            context.Connection.Close(force);
+        }
+
+        public void Close()
+        {
+            if (disposed)
+                return;
+
+            Close(false);
+        }
+
+        public void Close(byte[] responseEntity, bool willBlock)
+        {
+            if (disposed)
+                return;
+
+            if (responseEntity == null)
+                throw new ArgumentNullException("responseEntity");
+
+            //TODO: if willBlock -> BeginWrite + Close ?
+            ContentLength64 = responseEntity.Length;
+            OutputStream.Write(responseEntity, 0, (int)content_length);
+            Close(false);
+        }
+
+        public void Redirect(string url)
+        {
+            StatusCode = 302; // Found
+            location = url;
+        }
+
+        bool FindCookie(Cookie cookie)
+        {
+            string name = cookie.Name;
+            string domain = cookie.Domain;
+            string path = cookie.Path;
+            foreach (Cookie c in cookies)
+            {
+                if (name != c.Name)
+                    continue;
+                if (domain != c.Domain)
+                    continue;
+                if (path == c.Path)
+                    return true;
+            }
+
+            return false;
+        }
+
+        internal void SendHeaders(bool closing, MemoryStream ms)
+        {
+            Encoding encoding = content_encoding;
+            if (encoding == null)
+                encoding = _textEncoding.GetDefaultEncoding();
+
+            if (content_type != null)
+            {
+                if (content_encoding != null && content_type.IndexOf("charset=", StringComparison.Ordinal) == -1)
+                {
+                    string enc_name = content_encoding.WebName;
+                    headers.SetInternal("Content-Type", content_type + "; charset=" + enc_name);
+                }
+                else
+                {
+                    headers.SetInternal("Content-Type", content_type);
+                }
+            }
+
+            if (headers["Server"] == null)
+                headers.SetInternal("Server", "Mono-HTTPAPI/1.0");
+
+            CultureInfo inv = CultureInfo.InvariantCulture;
+            if (headers["Date"] == null)
+                headers.SetInternal("Date", DateTime.UtcNow.ToString("r", inv));
+
+            if (!chunked)
+            {
+                if (!cl_set && closing)
+                {
+                    cl_set = true;
+                    content_length = 0;
+                }
+
+                if (cl_set)
+                    headers.SetInternal("Content-Length", content_length.ToString(inv));
+            }
+
+            Version v = context.Request.ProtocolVersion;
+            if (!cl_set && !chunked && v >= HttpVersion.Version11)
+                chunked = true;
+
+            /* Apache forces closing the connection for these status codes:
+             *	HttpStatusCode.BadRequest 		400
+             *	HttpStatusCode.RequestTimeout 		408
+             *	HttpStatusCode.LengthRequired 		411
+             *	HttpStatusCode.RequestEntityTooLarge 	413
+             *	HttpStatusCode.RequestUriTooLong 	414
+             *	HttpStatusCode.InternalServerError 	500
+             *	HttpStatusCode.ServiceUnavailable 	503
+             */
+            bool conn_close = (status_code == 400 || status_code == 408 || status_code == 411 ||
+                    status_code == 413 || status_code == 414 || status_code == 500 ||
+                    status_code == 503);
+
+            if (conn_close == false)
+                conn_close = !context.Request.KeepAlive;
+
+            // They sent both KeepAlive: true and Connection: close!?
+            if (!keep_alive || conn_close)
+            {
+                headers.SetInternal("Connection", "close");
+                conn_close = true;
+            }
+
+            if (chunked)
+                headers.SetInternal("Transfer-Encoding", "chunked");
+
+            //int reuses = context.Connection.Reuses;
+            //if (reuses >= 100)
+            //{
+            //    _logger.Debug("HttpListenerResponse - keep alive has exceeded 100 uses and will be closed.");
+
+            //    force_close_chunked = true;
+            //    if (!conn_close)
+            //    {
+            //        headers.SetInternal("Connection", "close");
+            //        conn_close = true;
+            //    }
+            //}
+
+            if (!conn_close)
+            {
+                if (context.Request.ProtocolVersion <= HttpVersion.Version10)
+                    headers.SetInternal("Connection", "keep-alive");
+            }
+
+            if (location != null)
+                headers.SetInternal("Location", location);
+
+            if (cookies != null)
+            {
+                foreach (Cookie cookie in cookies)
+                    headers.SetInternal("Set-Cookie", cookie.ToString());
+            }
+
+            using (StreamWriter writer = new StreamWriter(ms, encoding, 256, true))
+            {
+                writer.Write("HTTP/{0} {1} {2}\r\n", version, status_code, status_description);
+                string headers_str = headers.ToStringMultiValue();
+                writer.Write(headers_str);
+                writer.Flush();
+            }
+
+            int preamble = encoding.GetPreamble().Length;
+            if (output_stream == null)
+                output_stream = context.Connection.GetResponseStream();
+
+            /* Assumes that the ms was at position 0 */
+            ms.Position = preamble;
+            HeadersSent = true;
+        }
+
+        public void SetCookie(Cookie cookie)
+        {
+            if (cookie == null)
+                throw new ArgumentNullException("cookie");
+
+            if (cookies != null)
+            {
+                if (FindCookie(cookie))
+                    throw new ArgumentException("The cookie already exists.");
+            }
+            else
+            {
+                cookies = new CookieCollection();
+            }
+
+            cookies.Add(cookie);
+        }
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/Net/HttpStatusCode.cs b/SocketHttpListener.Portable/Net/HttpStatusCode.cs
new file mode 100644
index 000000000..93da82ba0
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpStatusCode.cs
@@ -0,0 +1,321 @@
+namespace SocketHttpListener.Net
+{
+  /// <summary>
+  /// Contains the values of the HTTP status codes.
+  /// </summary>
+  /// <remarks>
+  /// The HttpStatusCode enumeration contains the values of the HTTP status codes defined in
+  /// <see href="http://tools.ietf.org/html/rfc2616#section-10">RFC 2616</see> for HTTP 1.1.
+  /// </remarks>
+  public enum HttpStatusCode
+  {
+    /// <summary>
+    /// Equivalent to status code 100.
+    /// Indicates that the client should continue with its request.
+    /// </summary>
+    Continue = 100,
+    /// <summary>
+    /// Equivalent to status code 101.
+    /// Indicates that the server is switching the HTTP version or protocol on the connection.
+    /// </summary>
+    SwitchingProtocols = 101,
+    /// <summary>
+    /// Equivalent to status code 200.
+    /// Indicates that the client's request has succeeded.
+    /// </summary>
+    OK = 200,
+    /// <summary>
+    /// Equivalent to status code 201.
+    /// Indicates that the client's request has been fulfilled and resulted in a new resource being
+    /// created.
+    /// </summary>
+    Created = 201,
+    /// <summary>
+    /// Equivalent to status code 202.
+    /// Indicates that the client's request has been accepted for processing, but the processing
+    /// hasn't been completed.
+    /// </summary>
+    Accepted = 202,
+    /// <summary>
+    /// Equivalent to status code 203.
+    /// Indicates that the returned metainformation is from a local or a third-party copy instead of
+    /// the origin server.
+    /// </summary>
+    NonAuthoritativeInformation = 203,
+    /// <summary>
+    /// Equivalent to status code 204.
+    /// Indicates that the server has fulfilled the client's request but doesn't need to return
+    /// an entity-body.
+    /// </summary>
+    NoContent = 204,
+    /// <summary>
+    /// Equivalent to status code 205.
+    /// Indicates that the server has fulfilled the client's request, and the user agent should
+    /// reset the document view which caused the request to be sent.
+    /// </summary>
+    ResetContent = 205,
+    /// <summary>
+    /// Equivalent to status code 206.
+    /// Indicates that the server has fulfilled the partial GET request for the resource.
+    /// </summary>
+    PartialContent = 206,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 300.
+    ///   Indicates that the requested resource corresponds to any of multiple representations.
+    ///   </para>
+    ///   <para>
+    ///   MultipleChoices is a synonym for Ambiguous.
+    ///   </para>
+    /// </summary>
+    MultipleChoices = 300,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 300.
+    ///   Indicates that the requested resource corresponds to any of multiple representations.
+    ///   </para>
+    ///   <para>
+    ///   Ambiguous is a synonym for MultipleChoices.
+    ///   </para>
+    /// </summary>
+    Ambiguous = 300,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 301.
+    ///   Indicates that the requested resource has been assigned a new permanent URI and
+    ///   any future references to this resource should use one of the returned URIs.
+    ///   </para>
+    ///   <para>
+    ///   MovedPermanently is a synonym for Moved.
+    ///   </para>
+    /// </summary>
+    MovedPermanently = 301,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 301.
+    ///   Indicates that the requested resource has been assigned a new permanent URI and
+    ///   any future references to this resource should use one of the returned URIs.
+    ///   </para>
+    ///   <para>
+    ///   Moved is a synonym for MovedPermanently.
+    ///   </para>
+    /// </summary>
+    Moved = 301,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 302.
+    ///   Indicates that the requested resource is located temporarily under a different URI.
+    ///   </para>
+    ///   <para>
+    ///   Found is a synonym for Redirect.
+    ///   </para>
+    /// </summary>
+    Found = 302,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 302.
+    ///   Indicates that the requested resource is located temporarily under a different URI.
+    ///   </para>
+    ///   <para>
+    ///   Redirect is a synonym for Found.
+    ///   </para>
+    /// </summary>
+    Redirect = 302,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 303.
+    ///   Indicates that the response to the request can be found under a different URI and
+    ///   should be retrieved using a GET method on that resource.
+    ///   </para>
+    ///   <para>
+    ///   SeeOther is a synonym for RedirectMethod.
+    ///   </para>
+    /// </summary>
+    SeeOther = 303,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 303.
+    ///   Indicates that the response to the request can be found under a different URI and
+    ///   should be retrieved using a GET method on that resource.
+    ///   </para>
+    ///   <para>
+    ///   RedirectMethod is a synonym for SeeOther.
+    ///   </para>
+    /// </summary>
+    RedirectMethod = 303,
+    /// <summary>
+    /// Equivalent to status code 304.
+    /// Indicates that the client has performed a conditional GET request and access is allowed,
+    /// but the document hasn't been modified.
+    /// </summary>
+    NotModified = 304,
+    /// <summary>
+    /// Equivalent to status code 305.
+    /// Indicates that the requested resource must be accessed through the proxy given by
+    /// the Location field.
+    /// </summary>
+    UseProxy = 305,
+    /// <summary>
+    /// Equivalent to status code 306.
+    /// This status code was used in a previous version of the specification, is no longer used,
+    /// and is reserved for future use.
+    /// </summary>
+    Unused = 306,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 307.
+    ///   Indicates that the requested resource is located temporarily under a different URI.
+    ///   </para>
+    ///   <para>
+    ///   TemporaryRedirect is a synonym for RedirectKeepVerb.
+    ///   </para>
+    /// </summary>
+    TemporaryRedirect = 307,
+    /// <summary>
+    ///   <para>
+    ///   Equivalent to status code 307.
+    ///   Indicates that the requested resource is located temporarily under a different URI.
+    ///   </para>
+    ///   <para>
+    ///   RedirectKeepVerb is a synonym for TemporaryRedirect.
+    ///   </para>
+    /// </summary>
+    RedirectKeepVerb = 307,
+    /// <summary>
+    /// Equivalent to status code 400.
+    /// Indicates that the client's request couldn't be understood by the server due to
+    /// malformed syntax.
+    /// </summary>
+    BadRequest = 400,
+    /// <summary>
+    /// Equivalent to status code 401.
+    /// Indicates that the client's request requires user authentication.
+    /// </summary>
+    Unauthorized = 401,
+    /// <summary>
+    /// Equivalent to status code 402.
+    /// This status code is reserved for future use.
+    /// </summary>
+    PaymentRequired = 402,
+    /// <summary>
+    /// Equivalent to status code 403.
+    /// Indicates that the server understood the client's request but is refusing to fulfill it.
+    /// </summary>
+    Forbidden = 403,
+    /// <summary>
+    /// Equivalent to status code 404.
+    /// Indicates that the server hasn't found anything matching the request URI.
+    /// </summary>
+    NotFound = 404,
+    /// <summary>
+    /// Equivalent to status code 405.
+    /// Indicates that the method specified in the request line isn't allowed for the resource
+    /// identified by the request URI.
+    /// </summary>
+    MethodNotAllowed = 405,
+    /// <summary>
+    /// Equivalent to status code 406.
+    /// Indicates that the server doesn't have the appropriate resource to respond to the Accept
+    /// headers in the client's request.
+    /// </summary>
+    NotAcceptable = 406,
+    /// <summary>
+    /// Equivalent to status code 407.
+    /// Indicates that the client must first authenticate itself with the proxy.
+    /// </summary>
+    ProxyAuthenticationRequired = 407,
+    /// <summary>
+    /// Equivalent to status code 408.
+    /// Indicates that the client didn't produce a request within the time that the server was
+    /// prepared to wait.
+    /// </summary>
+    RequestTimeout = 408,
+    /// <summary>
+    /// Equivalent to status code 409.
+    /// Indicates that the client's request couldn't be completed due to a conflict on the server.
+    /// </summary>
+    Conflict = 409,
+    /// <summary>
+    /// Equivalent to status code 410.
+    /// Indicates that the requested resource is no longer available at the server and
+    /// no forwarding address is known.
+    /// </summary>
+    Gone = 410,
+    /// <summary>
+    /// Equivalent to status code 411.
+    /// Indicates that the server refuses to accept the client's request without a defined
+    /// Content-Length.
+    /// </summary>
+    LengthRequired = 411,
+    /// <summary>
+    /// Equivalent to status code 412.
+    /// Indicates that the precondition given in one or more of the request headers evaluated to
+    /// false when it was tested on the server.
+    /// </summary>
+    PreconditionFailed = 412,
+    /// <summary>
+    /// Equivalent to status code 413.
+    /// Indicates that the entity of the client's request is larger than the server is willing or
+    /// able to process.
+    /// </summary>
+    RequestEntityTooLarge = 413,
+    /// <summary>
+    /// Equivalent to status code 414.
+    /// Indicates that the request URI is longer than the server is willing to interpret.
+    /// </summary>
+    RequestUriTooLong = 414,
+    /// <summary>
+    /// Equivalent to status code 415.
+    /// Indicates that the entity of the client's request is in a format not supported by
+    /// the requested resource for the requested method.
+    /// </summary>
+    UnsupportedMediaType = 415,
+    /// <summary>
+    /// Equivalent to status code 416.
+    /// Indicates that none of the range specifier values in a Range request header overlap
+    /// the current extent of the selected resource.
+    /// </summary>
+    RequestedRangeNotSatisfiable = 416,
+    /// <summary>
+    /// Equivalent to status code 417.
+    /// Indicates that the expectation given in an Expect request header couldn't be met by
+    /// the server.
+    /// </summary>
+    ExpectationFailed = 417,
+    /// <summary>
+    /// Equivalent to status code 500.
+    /// Indicates that the server encountered an unexpected condition which prevented it from
+    /// fulfilling the client's request.
+    /// </summary>
+    InternalServerError = 500,
+    /// <summary>
+    /// Equivalent to status code 501.
+    /// Indicates that the server doesn't support the functionality required to fulfill the client's
+    /// request.
+    /// </summary>
+    NotImplemented = 501,
+    /// <summary>
+    /// Equivalent to status code 502.
+    /// Indicates that a gateway or proxy server received an invalid response from the upstream
+    /// server.
+    /// </summary>
+    BadGateway = 502,
+    /// <summary>
+    /// Equivalent to status code 503.
+    /// Indicates that the server is currently unable to handle the client's request due to
+    /// a temporary overloading or maintenance of the server.
+    /// </summary>
+    ServiceUnavailable = 503,
+    /// <summary>
+    /// Equivalent to status code 504.
+    /// Indicates that a gateway or proxy server didn't receive a timely response from the upstream
+    /// server or some other auxiliary server.
+    /// </summary>
+    GatewayTimeout = 504,
+    /// <summary>
+    /// Equivalent to status code 505.
+    /// Indicates that the server doesn't support the HTTP version used in the client's request.
+    /// </summary>
+    HttpVersionNotSupported = 505,
+  }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpStreamAsyncResult.cs b/SocketHttpListener.Portable/Net/HttpStreamAsyncResult.cs
new file mode 100644
index 000000000..518c45acb
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpStreamAsyncResult.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Threading;
+
+namespace SocketHttpListener.Net
+{
+    class HttpStreamAsyncResult : IAsyncResult
+    {
+        object locker = new object();
+        ManualResetEvent handle;
+        bool completed;
+
+        internal byte[] Buffer;
+        internal int Offset;
+        internal int Count;
+        internal AsyncCallback Callback;
+        internal object State;
+        internal int SynchRead;
+        internal Exception Error;
+
+        public void Complete(Exception e)
+        {
+            Error = e;
+            Complete();
+        }
+
+        public void Complete()
+        {
+            lock (locker)
+            {
+                if (completed)
+                    return;
+
+                completed = true;
+                if (handle != null)
+                    handle.Set();
+
+                if (Callback != null)
+                    Callback.BeginInvoke(this, null, null);
+            }
+        }
+
+        public object AsyncState
+        {
+            get { return State; }
+        }
+
+        public WaitHandle AsyncWaitHandle
+        {
+            get
+            {
+                lock (locker)
+                {
+                    if (handle == null)
+                        handle = new ManualResetEvent(completed);
+                }
+
+                return handle;
+            }
+        }
+
+        public bool CompletedSynchronously
+        {
+            get { return (SynchRead == Count); }
+        }
+
+        public bool IsCompleted
+        {
+            get
+            {
+                lock (locker)
+                {
+                    return completed;
+                }
+            }
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/HttpVersion.cs b/SocketHttpListener.Portable/Net/HttpVersion.cs
new file mode 100644
index 000000000..c0839b46d
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/HttpVersion.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace SocketHttpListener.Net
+{
+    // <remarks>
+    // </remarks>
+    public class HttpVersion
+    {
+
+        public static readonly Version Version10 = new Version(1, 0);
+        public static readonly Version Version11 = new Version(1, 1);
+
+        // pretty useless..
+        public HttpVersion() { }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/ListenerPrefix.cs b/SocketHttpListener.Portable/Net/ListenerPrefix.cs
new file mode 100644
index 000000000..2c314da50
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/ListenerPrefix.cs
@@ -0,0 +1,148 @@
+using System;
+using System.Net;
+using MediaBrowser.Model.Net;
+
+namespace SocketHttpListener.Net
+{
+    sealed class ListenerPrefix
+    {
+        string original;
+        string host;
+        ushort port;
+        string path;
+        bool secure;
+        IpAddressInfo[] addresses;
+        public HttpListener Listener;
+
+        public ListenerPrefix(string prefix)
+        {
+            this.original = prefix;
+            Parse(prefix);
+        }
+
+        public override string ToString()
+        {
+            return original;
+        }
+
+        public IpAddressInfo[] Addresses
+        {
+            get { return addresses; }
+            set { addresses = value; }
+        }
+        public bool Secure
+        {
+            get { return secure; }
+        }
+
+        public string Host
+        {
+            get { return host; }
+        }
+
+        public int Port
+        {
+            get { return (int)port; }
+        }
+
+        public string Path
+        {
+            get { return path; }
+        }
+
+        // Equals and GetHashCode are required to detect duplicates in HttpListenerPrefixCollection.
+        public override bool Equals(object o)
+        {
+            ListenerPrefix other = o as ListenerPrefix;
+            if (other == null)
+                return false;
+
+            return (original == other.original);
+        }
+
+        public override int GetHashCode()
+        {
+            return original.GetHashCode();
+        }
+
+        void Parse(string uri)
+        {
+            ushort default_port = 80;
+            if (uri.StartsWith("https://"))
+            {
+                default_port = 443;
+                secure = true;
+            }
+
+            int length = uri.Length;
+            int start_host = uri.IndexOf(':') + 3;
+            if (start_host >= length)
+                throw new ArgumentException("No host specified.");
+
+            int colon = uri.IndexOf(':', start_host, length - start_host);
+            int root;
+            if (colon > 0)
+            {
+                host = uri.Substring(start_host, colon - start_host);
+                root = uri.IndexOf('/', colon, length - colon);
+                port = (ushort)Int32.Parse(uri.Substring(colon + 1, root - colon - 1));
+                path = uri.Substring(root);
+            }
+            else
+            {
+                root = uri.IndexOf('/', start_host, length - start_host);
+                host = uri.Substring(start_host, root - start_host);
+                port = default_port;
+                path = uri.Substring(root);
+            }
+            if (path.Length != 1)
+                path = path.Substring(0, path.Length - 1);
+        }
+
+        public static void CheckUri(string uri)
+        {
+            if (uri == null)
+                throw new ArgumentNullException("uriPrefix");
+
+            if (!uri.StartsWith("http://") && !uri.StartsWith("https://"))
+                throw new ArgumentException("Only 'http' and 'https' schemes are supported.");
+
+            int length = uri.Length;
+            int start_host = uri.IndexOf(':') + 3;
+            if (start_host >= length)
+                throw new ArgumentException("No host specified.");
+
+            int colon = uri.IndexOf(':', start_host, length - start_host);
+            if (start_host == colon)
+                throw new ArgumentException("No host specified.");
+
+            int root;
+            if (colon > 0)
+            {
+                root = uri.IndexOf('/', colon, length - colon);
+                if (root == -1)
+                    throw new ArgumentException("No path specified.");
+
+                try
+                {
+                    int p = Int32.Parse(uri.Substring(colon + 1, root - colon - 1));
+                    if (p <= 0 || p >= 65536)
+                        throw new Exception();
+                }
+                catch
+                {
+                    throw new ArgumentException("Invalid port.");
+                }
+            }
+            else
+            {
+                root = uri.IndexOf('/', start_host, length - start_host);
+                if (root == -1)
+                    throw new ArgumentException("No path specified.");
+            }
+
+            if (uri[uri.Length - 1] != '/')
+                throw new ArgumentException("The prefix must end with '/'");
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/RequestStream.cs b/SocketHttpListener.Portable/Net/RequestStream.cs
new file mode 100644
index 000000000..58030500d
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/RequestStream.cs
@@ -0,0 +1,231 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SocketHttpListener.Net
+{
+    class RequestStream : Stream
+    {
+        byte[] buffer;
+        int offset;
+        int length;
+        long remaining_body;
+        bool disposed;
+        Stream stream;
+
+        internal RequestStream(Stream stream, byte[] buffer, int offset, int length)
+            : this(stream, buffer, offset, length, -1)
+        {
+        }
+
+        internal RequestStream(Stream stream, byte[] buffer, int offset, int length, long contentlength)
+        {
+            this.stream = stream;
+            this.buffer = buffer;
+            this.offset = offset;
+            this.length = length;
+            this.remaining_body = contentlength;
+        }
+
+        public override bool CanRead
+        {
+            get { return true; }
+        }
+
+        public override bool CanSeek
+        {
+            get { return false; }
+        }
+
+        public override bool CanWrite
+        {
+            get { return false; }
+        }
+
+        public override long Length
+        {
+            get { throw new NotSupportedException(); }
+        }
+
+        public override long Position
+        {
+            get { throw new NotSupportedException(); }
+            set { throw new NotSupportedException(); }
+        }
+
+
+        protected override void Dispose(bool disposing)
+        {
+            disposed = true;
+        }
+
+        public override void Flush()
+        {
+        }
+
+
+        // Returns 0 if we can keep reading from the base stream,
+        // > 0 if we read something from the buffer.
+        // -1 if we had a content length set and we finished reading that many bytes.
+        int FillFromBuffer(byte[] buffer, int off, int count)
+        {
+            if (buffer == null)
+                throw new ArgumentNullException("buffer");
+            if (off < 0)
+                throw new ArgumentOutOfRangeException("offset", "< 0");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "< 0");
+            int len = buffer.Length;
+            if (off > len)
+                throw new ArgumentException("destination offset is beyond array size");
+            if (off > len - count)
+                throw new ArgumentException("Reading would overrun buffer");
+
+            if (this.remaining_body == 0)
+                return -1;
+
+            if (this.length == 0)
+                return 0;
+
+            int size = Math.Min(this.length, count);
+            if (this.remaining_body > 0)
+                size = (int)Math.Min(size, this.remaining_body);
+
+            if (this.offset > this.buffer.Length - size)
+            {
+                size = Math.Min(size, this.buffer.Length - this.offset);
+            }
+            if (size == 0)
+                return 0;
+
+            Buffer.BlockCopy(this.buffer, this.offset, buffer, off, size);
+            this.offset += size;
+            this.length -= size;
+            if (this.remaining_body > 0)
+                remaining_body -= size;
+            return size;
+        }
+
+        public override int Read([In, Out] byte[] buffer, int offset, int count)
+        {
+            if (disposed)
+                throw new ObjectDisposedException(typeof(RequestStream).ToString());
+
+            // Call FillFromBuffer to check for buffer boundaries even when remaining_body is 0
+            int nread = FillFromBuffer(buffer, offset, count);
+            if (nread == -1)
+            { // No more bytes available (Content-Length)
+                return 0;
+            }
+            else if (nread > 0)
+            {
+                return nread;
+            }
+
+            nread = stream.Read(buffer, offset, count);
+            if (nread > 0 && remaining_body > 0)
+                remaining_body -= nread;
+            return nread;
+        }
+
+        public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            if (disposed)
+                throw new ObjectDisposedException(typeof(RequestStream).ToString());
+
+            int nread = FillFromBuffer(buffer, offset, count);
+            if (nread > 0 || nread == -1)
+            {
+                return Math.Max(0, nread);
+            }
+
+            // Avoid reading past the end of the request to allow
+            // for HTTP pipelining
+            if (remaining_body >= 0 && count > remaining_body)
+                count = (int)Math.Min(Int32.MaxValue, remaining_body);
+
+            nread = await stream.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
+            if (remaining_body > 0 && nread > 0)
+                remaining_body -= nread;
+            return nread;
+        }
+
+        //public override IAsyncResult BeginRead(byte[] buffer, int offset, int count,
+        //                    AsyncCallback cback, object state)
+        //{
+        //    if (disposed)
+        //        throw new ObjectDisposedException(typeof(RequestStream).ToString());
+
+        //    int nread = FillFromBuffer(buffer, offset, count);
+        //    if (nread > 0 || nread == -1)
+        //    {
+        //        HttpStreamAsyncResult ares = new HttpStreamAsyncResult();
+        //        ares.Buffer = buffer;
+        //        ares.Offset = offset;
+        //        ares.Count = count;
+        //        ares.Callback = cback;
+        //        ares.State = state;
+        //        ares.SynchRead = Math.Max(0, nread);
+        //        ares.Complete();
+        //        return ares;
+        //    }
+
+        //    // Avoid reading past the end of the request to allow
+        //    // for HTTP pipelining
+        //    if (remaining_body >= 0 && count > remaining_body)
+        //        count = (int)Math.Min(Int32.MaxValue, remaining_body);
+        //    return stream.BeginRead(buffer, offset, count, cback, state);
+        //}
+
+        //public override int EndRead(IAsyncResult ares)
+        //{
+        //    if (disposed)
+        //        throw new ObjectDisposedException(typeof(RequestStream).ToString());
+
+        //    if (ares == null)
+        //        throw new ArgumentNullException("async_result");
+
+        //    if (ares is HttpStreamAsyncResult)
+        //    {
+        //        HttpStreamAsyncResult r = (HttpStreamAsyncResult)ares;
+        //        if (!ares.IsCompleted)
+        //            ares.AsyncWaitHandle.WaitOne();
+        //        return r.SynchRead;
+        //    }
+
+        //    // Close on exception?
+        //    int nread = stream.EndRead(ares);
+        //    if (remaining_body > 0 && nread > 0)
+        //        remaining_body -= nread;
+        //    return nread;
+        //}
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            throw new NotSupportedException();
+        }
+
+        //public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count,
+        //                    AsyncCallback cback, object state)
+        //{
+        //    throw new NotSupportedException();
+        //}
+
+        //public override void EndWrite(IAsyncResult async_result)
+        //{
+        //    throw new NotSupportedException();
+        //}
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/ResponseStream.cs b/SocketHttpListener.Portable/Net/ResponseStream.cs
new file mode 100644
index 000000000..6ecbf9742
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/ResponseStream.cs
@@ -0,0 +1,316 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Text;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net
+{
+    // FIXME: Does this buffer the response until Close?
+    // Update: we send a single packet for the first non-chunked Write
+    // What happens when we set content-length to X and write X-1 bytes then close?
+    // what if we don't set content-length at all?
+    class ResponseStream : Stream
+    {
+        HttpListenerResponse response;
+        bool ignore_errors;
+        bool disposed;
+        bool trailer_sent;
+        Stream stream;
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
+        private readonly ITextEncoding _textEncoding;
+
+        internal ResponseStream(Stream stream, HttpListenerResponse response, bool ignore_errors, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        {
+            this.response = response;
+            this.ignore_errors = ignore_errors;
+            _memoryStreamFactory = memoryStreamFactory;
+            _textEncoding = textEncoding;
+            this.stream = stream;
+        }
+
+        public override bool CanRead
+        {
+            get { return false; }
+        }
+
+        public override bool CanSeek
+        {
+            get { return false; }
+        }
+
+        public override bool CanWrite
+        {
+            get { return true; }
+        }
+
+        public override long Length
+        {
+            get { throw new NotSupportedException(); }
+        }
+
+        public override long Position
+        {
+            get { throw new NotSupportedException(); }
+            set { throw new NotSupportedException(); }
+        }
+
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposed == false)
+            {
+                disposed = true;
+                byte[] bytes = null;
+                MemoryStream ms = GetHeaders(true);
+                bool chunked = response.SendChunked;
+                if (stream.CanWrite)
+                {
+                    try
+                    {
+                        if (ms != null)
+                        {
+                            long start = ms.Position;
+                            if (chunked && !trailer_sent)
+                            {
+                                bytes = GetChunkSizeBytes(0, true);
+                                ms.Position = ms.Length;
+                                ms.Write(bytes, 0, bytes.Length);
+                            }
+                            byte[] msBuffer;
+                            _memoryStreamFactory.TryGetBuffer(ms, out msBuffer);
+                            InternalWrite(msBuffer, (int)start, (int)(ms.Length - start));
+                            trailer_sent = true;
+                        }
+                        else if (chunked && !trailer_sent)
+                        {
+                            bytes = GetChunkSizeBytes(0, true);
+                            InternalWrite(bytes, 0, bytes.Length);
+                            trailer_sent = true;
+                        }
+                    }
+                    catch (IOException ex)
+                    {
+                        // Ignore error due to connection reset by peer
+                    }
+                }
+                response.Close();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        MemoryStream GetHeaders(bool closing)
+        {
+            // SendHeaders works on shared headers
+            lock (response.headers_lock)
+            {
+                if (response.HeadersSent)
+                    return null;
+                MemoryStream ms = _memoryStreamFactory.CreateNew();
+                response.SendHeaders(closing, ms);
+                return ms;
+            }
+        }
+
+        public override void Flush()
+        {
+        }
+
+        static byte[] crlf = new byte[] { 13, 10 };
+        byte[] GetChunkSizeBytes(int size, bool final)
+        {
+            string str = String.Format("{0:x}\r\n{1}", size, final ? "\r\n" : "");
+            return _textEncoding.GetASCIIEncoding().GetBytes(str);
+        }
+
+        internal void InternalWrite(byte[] buffer, int offset, int count)
+        {
+            if (ignore_errors)
+            {
+                try
+                {
+                    stream.Write(buffer, offset, count);
+                }
+                catch { }
+            }
+            else
+            {
+                stream.Write(buffer, offset, count);
+            }
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            if (disposed)
+                throw new ObjectDisposedException(GetType().ToString());
+
+            byte[] bytes = null;
+            MemoryStream ms = GetHeaders(false);
+            bool chunked = response.SendChunked;
+            if (ms != null)
+            {
+                long start = ms.Position; // After the possible preamble for the encoding
+                ms.Position = ms.Length;
+                if (chunked)
+                {
+                    bytes = GetChunkSizeBytes(count, false);
+                    ms.Write(bytes, 0, bytes.Length);
+                }
+
+                int new_count = Math.Min(count, 16384 - (int)ms.Position + (int)start);
+                ms.Write(buffer, offset, new_count);
+                count -= new_count;
+                offset += new_count;
+                byte[] msBuffer;
+                _memoryStreamFactory.TryGetBuffer(ms, out msBuffer);
+                InternalWrite(msBuffer, (int)start, (int)(ms.Length - start));
+                ms.SetLength(0);
+                ms.Capacity = 0; // 'dispose' the buffer in ms.
+            }
+            else if (chunked)
+            {
+                bytes = GetChunkSizeBytes(count, false);
+                InternalWrite(bytes, 0, bytes.Length);
+            }
+
+            if (count > 0)
+                InternalWrite(buffer, offset, count);
+            if (chunked)
+                InternalWrite(crlf, 0, 2);
+        }
+
+        public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            if (disposed)
+                throw new ObjectDisposedException(GetType().ToString());
+
+            byte[] bytes = null;
+            MemoryStream ms = GetHeaders(false);
+            bool chunked = response.SendChunked;
+            if (ms != null)
+            {
+                long start = ms.Position;
+                ms.Position = ms.Length;
+                if (chunked)
+                {
+                    bytes = GetChunkSizeBytes(count, false);
+                    ms.Write(bytes, 0, bytes.Length);
+                }
+                ms.Write(buffer, offset, count);
+                byte[] msBuffer;
+                _memoryStreamFactory.TryGetBuffer(ms, out msBuffer);
+                buffer = msBuffer;
+                offset = (int)start;
+                count = (int)(ms.Position - start);
+            }
+            else if (chunked)
+            {
+                bytes = GetChunkSizeBytes(count, false);
+                InternalWrite(bytes, 0, bytes.Length);
+            }
+
+            try
+            {
+                if (count > 0)
+                {
+                    await stream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
+                }
+
+                if (response.SendChunked)
+                    stream.Write(crlf, 0, 2);
+            }
+            catch
+            {
+                if (!ignore_errors)
+                {
+                    throw;
+                }
+            }
+        }
+
+        //public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count,
+        //                    AsyncCallback cback, object state)
+        //{
+        //    if (disposed)
+        //        throw new ObjectDisposedException(GetType().ToString());
+
+        //    byte[] bytes = null;
+        //    MemoryStream ms = GetHeaders(false);
+        //    bool chunked = response.SendChunked;
+        //    if (ms != null)
+        //    {
+        //        long start = ms.Position;
+        //        ms.Position = ms.Length;
+        //        if (chunked)
+        //        {
+        //            bytes = GetChunkSizeBytes(count, false);
+        //            ms.Write(bytes, 0, bytes.Length);
+        //        }
+        //        ms.Write(buffer, offset, count);
+        //        buffer = ms.ToArray();
+        //        offset = (int)start;
+        //        count = (int)(ms.Position - start);
+        //    }
+        //    else if (chunked)
+        //    {
+        //        bytes = GetChunkSizeBytes(count, false);
+        //        InternalWrite(bytes, 0, bytes.Length);
+        //    }
+
+        //    return stream.BeginWrite(buffer, offset, count, cback, state);
+        //}
+
+        //public override void EndWrite(IAsyncResult ares)
+        //{
+        //    if (disposed)
+        //        throw new ObjectDisposedException(GetType().ToString());
+
+        //    if (ignore_errors)
+        //    {
+        //        try
+        //        {
+        //            stream.EndWrite(ares);
+        //            if (response.SendChunked)
+        //                stream.Write(crlf, 0, 2);
+        //        }
+        //        catch { }
+        //    }
+        //    else {
+        //        stream.EndWrite(ares);
+        //        if (response.SendChunked)
+        //            stream.Write(crlf, 0, 2);
+        //    }
+        //}
+
+        public override int Read([In, Out] byte[] buffer, int offset, int count)
+        {
+            throw new NotSupportedException();
+        }
+
+        //public override IAsyncResult BeginRead(byte[] buffer, int offset, int count,
+        //                    AsyncCallback cback, object state)
+        //{
+        //    throw new NotSupportedException();
+        //}
+
+        //public override int EndRead(IAsyncResult ares)
+        //{
+        //    throw new NotSupportedException();
+        //}
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/WebHeaderCollection.cs b/SocketHttpListener.Portable/Net/WebHeaderCollection.cs
new file mode 100644
index 000000000..d20f99b9b
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/WebHeaderCollection.cs
@@ -0,0 +1,391 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Net;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+using System.Text;
+using MediaBrowser.Model.Services;
+
+namespace SocketHttpListener.Net
+{
+    [ComVisible(true)]
+    public class WebHeaderCollection : QueryParamCollection
+    {
+        [Flags]
+        internal enum HeaderInfo
+        {
+            Request = 1,
+            Response = 1 << 1,
+            MultiValue = 1 << 10
+        }
+
+        static readonly bool[] allowed_chars = {
+			false, false, false, false, false, false, false, false, false, false, false, false, false, false,
+			false, false, false, false, false, false, false, false, false, false, false, false, false, false,
+			false, false, false, false, false, true, false, true, true, true, true, false, false, false, true,
+			true, false, true, true, false, true, true, true, true, true, true, true, true, true, true, false,
+			false, false, false, false, false, false, true, true, true, true, true, true, true, true, true,
+			true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+			false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true,
+			true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+			false, true, false
+		};
+
+        static readonly Dictionary<string, HeaderInfo> headers;
+        HeaderInfo? headerRestriction;
+        HeaderInfo? headerConsistency;
+
+        static WebHeaderCollection()
+        {
+            headers = new Dictionary<string, HeaderInfo>(StringComparer.OrdinalIgnoreCase) {
+				{ "Allow", HeaderInfo.MultiValue },
+				{ "Accept", HeaderInfo.Request | HeaderInfo.MultiValue },
+				{ "Accept-Charset", HeaderInfo.MultiValue },
+				{ "Accept-Encoding", HeaderInfo.MultiValue },
+				{ "Accept-Language", HeaderInfo.MultiValue },
+				{ "Accept-Ranges", HeaderInfo.MultiValue },
+				{ "Age", HeaderInfo.Response },
+				{ "Authorization", HeaderInfo.MultiValue },
+				{ "Cache-Control", HeaderInfo.MultiValue },
+				{ "Cookie", HeaderInfo.MultiValue },
+				{ "Connection", HeaderInfo.Request | HeaderInfo.MultiValue },
+				{ "Content-Encoding", HeaderInfo.MultiValue },
+				{ "Content-Length", HeaderInfo.Request | HeaderInfo.Response },
+				{ "Content-Type", HeaderInfo.Request },
+				{ "Content-Language", HeaderInfo.MultiValue },
+				{ "Date", HeaderInfo.Request },
+				{ "Expect", HeaderInfo.Request | HeaderInfo.MultiValue},
+				{ "Host", HeaderInfo.Request },
+				{ "If-Match", HeaderInfo.MultiValue },
+				{ "If-Modified-Since", HeaderInfo.Request },
+				{ "If-None-Match", HeaderInfo.MultiValue },
+				{ "Keep-Alive", HeaderInfo.Response },
+				{ "Pragma", HeaderInfo.MultiValue },
+				{ "Proxy-Authenticate", HeaderInfo.MultiValue },
+				{ "Proxy-Authorization", HeaderInfo.MultiValue },
+				{ "Proxy-Connection", HeaderInfo.Request | HeaderInfo.MultiValue },
+				{ "Range", HeaderInfo.Request | HeaderInfo.MultiValue },
+				{ "Referer", HeaderInfo.Request },
+				{ "Set-Cookie", HeaderInfo.MultiValue },
+				{ "Set-Cookie2", HeaderInfo.MultiValue },
+				{ "Server", HeaderInfo.Response },
+				{ "TE", HeaderInfo.MultiValue },
+				{ "Trailer", HeaderInfo.MultiValue },
+				{ "Transfer-Encoding", HeaderInfo.Request | HeaderInfo.Response | HeaderInfo.MultiValue },
+				{ "Translate", HeaderInfo.Request | HeaderInfo.Response },
+				{ "Upgrade", HeaderInfo.MultiValue },
+				{ "User-Agent", HeaderInfo.Request },
+				{ "Vary", HeaderInfo.MultiValue },
+				{ "Via", HeaderInfo.MultiValue },
+				{ "Warning", HeaderInfo.MultiValue },
+				{ "WWW-Authenticate", HeaderInfo.Response | HeaderInfo. MultiValue },
+				{ "SecWebSocketAccept",  HeaderInfo.Response },
+				{ "SecWebSocketExtensions", HeaderInfo.Request | HeaderInfo.Response | HeaderInfo. MultiValue },
+				{ "SecWebSocketKey", HeaderInfo.Request },
+				{ "Sec-WebSocket-Protocol", HeaderInfo.Request | HeaderInfo.Response | HeaderInfo. MultiValue },
+				{ "SecWebSocketVersion", HeaderInfo.Response | HeaderInfo. MultiValue }
+			};
+        }
+
+        // Methods
+
+        public void Add(string header)
+        {
+            if (header == null)
+                throw new ArgumentNullException("header");
+            int pos = header.IndexOf(':');
+            if (pos == -1)
+                throw new ArgumentException("no colon found", "header");
+
+            this.Add(header.Substring(0, pos), header.Substring(pos + 1));
+        }
+
+        public override void Add(string name, string value)
+        {
+            if (name == null)
+                throw new ArgumentNullException("name");
+
+            ThrowIfRestricted(name);
+            this.AddWithoutValidate(name, value);
+        }
+
+        protected void AddWithoutValidate(string headerName, string headerValue)
+        {
+            if (!IsHeaderName(headerName))
+                throw new ArgumentException("invalid header name: " + headerName, "headerName");
+            if (headerValue == null)
+                headerValue = String.Empty;
+            else
+                headerValue = headerValue.Trim();
+            if (!IsHeaderValue(headerValue))
+                throw new ArgumentException("invalid header value: " + headerValue, "headerValue");
+
+            AddValue(headerName, headerValue);
+        }
+
+        internal void AddValue(string headerName, string headerValue)
+        {
+            base.Add(headerName, headerValue);
+        }
+
+        internal string[] GetValues_internal(string header, bool split)
+        {
+            if (header == null)
+                throw new ArgumentNullException("header");
+
+            string[] values = base.GetValues(header);
+            if (values == null || values.Length == 0)
+                return null;
+
+            if (split && IsMultiValue(header))
+            {
+                List<string> separated = null;
+                foreach (var value in values)
+                {
+                    if (value.IndexOf(',') < 0)
+                    {
+                        if (separated != null)
+                            separated.Add(value);
+
+                        continue;
+                    }
+
+                    if (separated == null)
+                    {
+                        separated = new List<string>(values.Length + 1);
+                        foreach (var v in values)
+                        {
+                            if (v == value)
+                                break;
+
+                            separated.Add(v);
+                        }
+                    }
+
+                    var slices = value.Split(',');
+                    var slices_length = slices.Length;
+                    if (value[value.Length - 1] == ',')
+                        --slices_length;
+
+                    for (int i = 0; i < slices_length; ++i)
+                    {
+                        separated.Add(slices[i].Trim());
+                    }
+                }
+
+                if (separated != null)
+                    return separated.ToArray();
+            }
+
+            return values;
+        }
+
+        public override string[] GetValues(string header)
+        {
+            return GetValues_internal(header, true);
+        }
+
+        public override string[] GetValues(int index)
+        {
+            string[] values = base.GetValues(index);
+
+            if (values == null || values.Length == 0)
+            {
+                return null;
+            }
+
+            return values;
+        }
+
+        public static bool IsRestricted(string headerName)
+        {
+            return IsRestricted(headerName, false);
+        }
+
+        public static bool IsRestricted(string headerName, bool response)
+        {
+            if (headerName == null)
+                throw new ArgumentNullException("headerName");
+
+            if (headerName.Length == 0)
+                throw new ArgumentException("empty string", "headerName");
+
+            if (!IsHeaderName(headerName))
+                throw new ArgumentException("Invalid character in header");
+
+            HeaderInfo info;
+            if (!headers.TryGetValue(headerName, out info))
+                return false;
+
+            var flag = response ? HeaderInfo.Response : HeaderInfo.Request;
+            return (info & flag) != 0;
+        }
+
+        public override void Set(string name, string value)
+        {
+            if (name == null)
+                throw new ArgumentNullException("name");
+            if (!IsHeaderName(name))
+                throw new ArgumentException("invalid header name");
+            if (value == null)
+                value = String.Empty;
+            else
+                value = value.Trim();
+            if (!IsHeaderValue(value))
+                throw new ArgumentException("invalid header value");
+
+            ThrowIfRestricted(name);
+            base.Set(name, value);
+        }
+
+        internal string ToStringMultiValue()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            int count = base.Count;
+            for (int i = 0; i < count; i++)
+            {
+                string key = GetKey(i);
+                if (IsMultiValue(key))
+                {
+                    foreach (string v in GetValues(i))
+                    {
+                        sb.Append(key)
+                          .Append(": ")
+                          .Append(v)
+                          .Append("\r\n");
+                    }
+                }
+                else
+                {
+                    sb.Append(key)
+                      .Append(": ")
+                      .Append(Get(i))
+                      .Append("\r\n");
+                }
+            }
+            return sb.Append("\r\n").ToString();
+        }
+
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            int count = base.Count;
+            for (int i = 0; i < count; i++)
+                sb.Append(GetKey(i))
+                  .Append(": ")
+                  .Append(Get(i))
+                  .Append("\r\n");
+
+            return sb.Append("\r\n").ToString();
+        }
+
+
+        // Internal Methods
+
+        // With this we don't check for invalid characters in header. See bug #55994.
+        internal void SetInternal(string header)
+        {
+            int pos = header.IndexOf(':');
+            if (pos == -1)
+                throw new ArgumentException("no colon found", "header");
+
+            SetInternal(header.Substring(0, pos), header.Substring(pos + 1));
+        }
+
+        internal void SetInternal(string name, string value)
+        {
+            if (value == null)
+                value = String.Empty;
+            else
+                value = value.Trim();
+            if (!IsHeaderValue(value))
+                throw new ArgumentException("invalid header value");
+
+            if (IsMultiValue(name))
+            {
+                base.Add(name, value);
+            }
+            else
+            {
+                base.Remove(name);
+                base.Set(name, value);
+            }
+        }
+
+        // Private Methods
+
+        public override int Remove(string name)
+        {
+            ThrowIfRestricted(name);
+            return base.Remove(name);
+        }
+
+        protected void ThrowIfRestricted(string headerName)
+        {
+            if (!headerRestriction.HasValue)
+                return;
+
+            HeaderInfo info;
+            if (!headers.TryGetValue(headerName, out info))
+                return;
+
+            if ((info & headerRestriction.Value) != 0)
+                throw new ArgumentException("This header must be modified with the appropriate property.");
+        }
+
+        internal static bool IsMultiValue(string headerName)
+        {
+            if (headerName == null)
+                return false;
+
+            HeaderInfo info;
+            return headers.TryGetValue(headerName, out info) && (info & HeaderInfo.MultiValue) != 0;
+        }
+
+        internal static bool IsHeaderValue(string value)
+        {
+            // TEXT any 8 bit value except CTL's (0-31 and 127)
+            //      but including \r\n space and \t
+            //      after a newline at least one space or \t must follow
+            //      certain header fields allow comments ()
+
+            int len = value.Length;
+            for (int i = 0; i < len; i++)
+            {
+                char c = value[i];
+                if (c == 127)
+                    return false;
+                if (c < 0x20 && (c != '\r' && c != '\n' && c != '\t'))
+                    return false;
+                if (c == '\n' && ++i < len)
+                {
+                    c = value[i];
+                    if (c != ' ' && c != '\t')
+                        return false;
+                }
+            }
+
+            return true;
+        }
+
+        internal static bool IsHeaderName(string name)
+        {
+            if (name == null || name.Length == 0)
+                return false;
+
+            int len = name.Length;
+            for (int i = 0; i < len; i++)
+            {
+                char c = name[i];
+                if (c > 126 || !allowed_chars[c])
+                    return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/WebSockets/HttpListenerWebSocketContext.cs b/SocketHttpListener.Portable/Net/WebSockets/HttpListenerWebSocketContext.cs
new file mode 100644
index 000000000..426e15ecd
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/WebSockets/HttpListenerWebSocketContext.cs
@@ -0,0 +1,347 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Net;
+using System.Security.Principal;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Services;
+using SocketHttpListener.Primitives;
+
+namespace SocketHttpListener.Net.WebSockets
+{
+    /// <summary>
+    /// Provides the properties used to access the information in a WebSocket connection request
+    /// received by the <see cref="HttpListener"/>.
+    /// </summary>
+    /// <remarks>
+    /// </remarks>
+    public class HttpListenerWebSocketContext : WebSocketContext
+    {
+        #region Private Fields
+
+        private HttpListenerContext _context;
+        private WebSocket _websocket;
+
+        #endregion
+
+        #region Internal Constructors
+
+        internal HttpListenerWebSocketContext(
+          HttpListenerContext context, string protocol, ICryptoProvider cryptoProvider, IMemoryStreamFactory memoryStreamFactory)
+        {
+            _context = context;
+            _websocket = new WebSocket(this, protocol, cryptoProvider, memoryStreamFactory);
+        }
+
+        #endregion
+
+        #region Internal Properties
+
+        internal Stream Stream
+        {
+            get
+            {
+                return _context.Connection.Stream;
+            }
+        }
+
+        #endregion
+
+        #region Public Properties
+
+        /// <summary>
+        /// Gets the HTTP cookies included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="System.Net.CookieCollection"/> that contains the cookies.
+        /// </value>
+        public override CookieCollection CookieCollection
+        {
+            get
+            {
+                return _context.Request.Cookies;
+            }
+        }
+
+        /// <summary>
+        /// Gets the HTTP headers included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="QueryParamCollection"/> that contains the headers.
+        /// </value>
+        public override QueryParamCollection Headers
+        {
+            get
+            {
+                return _context.Request.Headers;
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the Host header included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Host header.
+        /// </value>
+        public override string Host
+        {
+            get
+            {
+                return _context.Request.Headers["Host"];
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the client is authenticated.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the client is authenticated; otherwise, <c>false</c>.
+        /// </value>
+        public override bool IsAuthenticated
+        {
+            get
+            {
+                return _context.Request.IsAuthenticated;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the client connected from the local computer.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the client connected from the local computer; otherwise, <c>false</c>.
+        /// </value>
+        public override bool IsLocal
+        {
+            get
+            {
+                return _context.Request.IsLocal;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the WebSocket connection is secured.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the connection is secured; otherwise, <c>false</c>.
+        /// </value>
+        public override bool IsSecureConnection
+        {
+            get
+            {
+                return _context.Connection.IsSecure;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the request is a WebSocket connection request.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the request is a WebSocket connection request; otherwise, <c>false</c>.
+        /// </value>
+        public override bool IsWebSocketRequest
+        {
+            get
+            {
+                return _context.Request.IsWebSocketRequest;
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the Origin header included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Origin header.
+        /// </value>
+        public override string Origin
+        {
+            get
+            {
+                return _context.Request.Headers["Origin"];
+            }
+        }
+
+        /// <summary>
+        /// Gets the query string included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="QueryParamCollection"/> that contains the query string parameters.
+        /// </value>
+        public override QueryParamCollection QueryString
+        {
+            get
+            {
+                return _context.Request.QueryString;
+            }
+        }
+
+        /// <summary>
+        /// Gets the URI requested by the client.
+        /// </summary>
+        /// <value>
+        /// A <see cref="Uri"/> that represents the requested URI.
+        /// </value>
+        public override Uri RequestUri
+        {
+            get
+            {
+                return _context.Request.Url;
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the Sec-WebSocket-Key header included in the request.
+        /// </summary>
+        /// <remarks>
+        /// This property provides a part of the information used by the server to prove that it
+        /// received a valid WebSocket connection request.
+        /// </remarks>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Sec-WebSocket-Key header.
+        /// </value>
+        public override string SecWebSocketKey
+        {
+            get
+            {
+                return _context.Request.Headers["Sec-WebSocket-Key"];
+            }
+        }
+
+        /// <summary>
+        /// Gets the values of the Sec-WebSocket-Protocol header included in the request.
+        /// </summary>
+        /// <remarks>
+        /// This property represents the subprotocols requested by the client.
+        /// </remarks>
+        /// <value>
+        /// An <see cref="T:System.Collections.Generic.IEnumerable{string}"/> instance that provides
+        /// an enumerator which supports the iteration over the values of the Sec-WebSocket-Protocol
+        /// header.
+        /// </value>
+        public override IEnumerable<string> SecWebSocketProtocols
+        {
+            get
+            {
+                var protocols = _context.Request.Headers["Sec-WebSocket-Protocol"];
+                if (protocols != null)
+                    foreach (var protocol in protocols.Split(','))
+                        yield return protocol.Trim();
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the Sec-WebSocket-Version header included in the request.
+        /// </summary>
+        /// <remarks>
+        /// This property represents the WebSocket protocol version.
+        /// </remarks>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Sec-WebSocket-Version header.
+        /// </value>
+        public override string SecWebSocketVersion
+        {
+            get
+            {
+                return _context.Request.Headers["Sec-WebSocket-Version"];
+            }
+        }
+
+        /// <summary>
+        /// Gets the server endpoint as an IP address and a port number.
+        /// </summary>
+        /// <value>
+        /// </value>
+        public override IpEndPointInfo ServerEndPoint
+        {
+            get
+            {
+                return _context.Connection.LocalEndPoint;
+            }
+        }
+
+        /// <summary>
+        /// Gets the client information (identity, authentication, and security roles).
+        /// </summary>
+        /// <value>
+        /// A <see cref="IPrincipal"/> that represents the client information.
+        /// </value>
+        public override IPrincipal User
+        {
+            get
+            {
+                return _context.User;
+            }
+        }
+
+        /// <summary>
+        /// Gets the client endpoint as an IP address and a port number.
+        /// </summary>
+        /// <value>
+        /// </value>
+        public override IpEndPointInfo UserEndPoint
+        {
+            get
+            {
+                return _context.Connection.RemoteEndPoint;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="SocketHttpListener.WebSocket"/> instance used for two-way communication
+        /// between client and server.
+        /// </summary>
+        /// <value>
+        /// A <see cref="SocketHttpListener.WebSocket"/>.
+        /// </value>
+        public override WebSocket WebSocket
+        {
+            get
+            {
+                return _websocket;
+            }
+        }
+
+        #endregion
+
+        #region Internal Methods
+
+        internal void Close()
+        {
+            try
+            {
+                _context.Connection.Close(true);
+            }
+            catch
+            {
+                // catch errors sending the closing handshake
+            }
+        }
+
+        internal void Close(HttpStatusCode code)
+        {
+            _context.Response.Close(code);
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Returns a <see cref="string"/> that represents the current
+        /// <see cref="HttpListenerWebSocketContext"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string"/> that represents the current
+        /// <see cref="HttpListenerWebSocketContext"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            return _context.Request.ToString();
+        }
+
+        #endregion
+    }
+}
diff --git a/SocketHttpListener.Portable/Net/WebSockets/WebSocketContext.cs b/SocketHttpListener.Portable/Net/WebSockets/WebSocketContext.cs
new file mode 100644
index 000000000..3ffa6e639
--- /dev/null
+++ b/SocketHttpListener.Portable/Net/WebSockets/WebSocketContext.cs
@@ -0,0 +1,183 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Net;
+using System.Security.Principal;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Services;
+
+namespace SocketHttpListener.Net.WebSockets
+{
+    /// <summary>
+    /// Exposes the properties used to access the information in a WebSocket connection request.
+    /// </summary>
+    /// <remarks>
+    /// The WebSocketContext class is an abstract class.
+    /// </remarks>
+    public abstract class WebSocketContext
+    {
+        #region Protected Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WebSocketContext"/> class.
+        /// </summary>
+        protected WebSocketContext()
+        {
+        }
+
+        #endregion
+
+        #region Public Properties
+
+        /// <summary>
+        /// Gets the HTTP cookies included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="System.Net.CookieCollection"/> that contains the cookies.
+        /// </value>
+        public abstract CookieCollection CookieCollection { get; }
+
+        /// <summary>
+        /// Gets the HTTP headers included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="QueryParamCollection"/> that contains the headers.
+        /// </value>
+        public abstract QueryParamCollection Headers { get; }
+
+        /// <summary>
+        /// Gets the value of the Host header included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Host header.
+        /// </value>
+        public abstract string Host { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the client is authenticated.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the client is authenticated; otherwise, <c>false</c>.
+        /// </value>
+        public abstract bool IsAuthenticated { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the client connected from the local computer.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the client connected from the local computer; otherwise, <c>false</c>.
+        /// </value>
+        public abstract bool IsLocal { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the WebSocket connection is secured.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the connection is secured; otherwise, <c>false</c>.
+        /// </value>
+        public abstract bool IsSecureConnection { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the request is a WebSocket connection request.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the request is a WebSocket connection request; otherwise, <c>false</c>.
+        /// </value>
+        public abstract bool IsWebSocketRequest { get; }
+
+        /// <summary>
+        /// Gets the value of the Origin header included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Origin header.
+        /// </value>
+        public abstract string Origin { get; }
+
+        /// <summary>
+        /// Gets the query string included in the request.
+        /// </summary>
+        /// <value>
+        /// A <see cref="QueryParamCollection"/> that contains the query string parameters.
+        /// </value>
+        public abstract QueryParamCollection QueryString { get; }
+
+        /// <summary>
+        /// Gets the URI requested by the client.
+        /// </summary>
+        /// <value>
+        /// A <see cref="Uri"/> that represents the requested URI.
+        /// </value>
+        public abstract Uri RequestUri { get; }
+
+        /// <summary>
+        /// Gets the value of the Sec-WebSocket-Key header included in the request.
+        /// </summary>
+        /// <remarks>
+        /// This property provides a part of the information used by the server to prove that it
+        /// received a valid WebSocket connection request.
+        /// </remarks>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Sec-WebSocket-Key header.
+        /// </value>
+        public abstract string SecWebSocketKey { get; }
+
+        /// <summary>
+        /// Gets the values of the Sec-WebSocket-Protocol header included in the request.
+        /// </summary>
+        /// <remarks>
+        /// This property represents the subprotocols requested by the client.
+        /// </remarks>
+        /// <value>
+        /// An <see cref="T:System.Collections.Generic.IEnumerable{string}"/> instance that provides
+        /// an enumerator which supports the iteration over the values of the Sec-WebSocket-Protocol
+        /// header.
+        /// </value>
+        public abstract IEnumerable<string> SecWebSocketProtocols { get; }
+
+        /// <summary>
+        /// Gets the value of the Sec-WebSocket-Version header included in the request.
+        /// </summary>
+        /// <remarks>
+        /// This property represents the WebSocket protocol version.
+        /// </remarks>
+        /// <value>
+        /// A <see cref="string"/> that represents the value of the Sec-WebSocket-Version header.
+        /// </value>
+        public abstract string SecWebSocketVersion { get; }
+
+        /// <summary>
+        /// Gets the server endpoint as an IP address and a port number.
+        /// </summary>
+        /// <value>
+        /// A <see cref="System.Net.IPEndPoint"/> that represents the server endpoint.
+        /// </value>
+        public abstract IpEndPointInfo ServerEndPoint { get; }
+
+        /// <summary>
+        /// Gets the client information (identity, authentication, and security roles).
+        /// </summary>
+        /// <value>
+        /// A <see cref="IPrincipal"/> that represents the client information.
+        /// </value>
+        public abstract IPrincipal User { get; }
+
+        /// <summary>
+        /// Gets the client endpoint as an IP address and a port number.
+        /// </summary>
+        /// <value>
+        /// A <see cref="System.Net.IPEndPoint"/> that represents the client endpoint.
+        /// </value>
+        public abstract IpEndPointInfo UserEndPoint { get; }
+
+        /// <summary>
+        /// Gets the <see cref="SocketHttpListener.WebSocket"/> instance used for two-way communication
+        /// between client and server.
+        /// </summary>
+        /// <value>
+        /// A <see cref="SocketHttpListener.WebSocket"/>.
+        /// </value>
+        public abstract WebSocket WebSocket { get; }
+
+        #endregion
+    }
+}
diff --git a/SocketHttpListener.Portable/Opcode.cs b/SocketHttpListener.Portable/Opcode.cs
new file mode 100644
index 000000000..62b7d8585
--- /dev/null
+++ b/SocketHttpListener.Portable/Opcode.cs
@@ -0,0 +1,43 @@
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the values of the opcode that indicates the type of a WebSocket frame.
+  /// </summary>
+  /// <remarks>
+  /// The values of the opcode are defined in
+  /// <see href="http://tools.ietf.org/html/rfc6455#section-5.2">Section 5.2</see> of RFC 6455.
+  /// </remarks>
+  public enum Opcode : byte
+  {
+    /// <summary>
+    /// Equivalent to numeric value 0.
+    /// Indicates a continuation frame.
+    /// </summary>
+    Cont = 0x0,
+    /// <summary>
+    /// Equivalent to numeric value 1.
+    /// Indicates a text frame.
+    /// </summary>
+    Text = 0x1,
+    /// <summary>
+    /// Equivalent to numeric value 2.
+    /// Indicates a binary frame.
+    /// </summary>
+    Binary = 0x2,
+    /// <summary>
+    /// Equivalent to numeric value 8.
+    /// Indicates a connection close frame.
+    /// </summary>
+    Close = 0x8,
+    /// <summary>
+    /// Equivalent to numeric value 9.
+    /// Indicates a ping frame.
+    /// </summary>
+    Ping = 0x9,
+    /// <summary>
+    /// Equivalent to numeric value 10.
+    /// Indicates a pong frame.
+    /// </summary>
+    Pong = 0xa
+  }
+}
diff --git a/SocketHttpListener.Portable/PayloadData.cs b/SocketHttpListener.Portable/PayloadData.cs
new file mode 100644
index 000000000..a6318da2b
--- /dev/null
+++ b/SocketHttpListener.Portable/PayloadData.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SocketHttpListener
+{
+  internal class PayloadData : IEnumerable<byte>
+  {
+    #region Private Fields
+
+    private byte [] _applicationData;
+    private byte [] _extensionData;
+    private bool    _masked;
+
+    #endregion
+
+    #region Public Const Fields
+
+    public const ulong MaxLength = long.MaxValue;
+
+    #endregion
+
+    #region Public Constructors
+
+    public PayloadData ()
+      : this (new byte [0], new byte [0], false)
+    {
+    }
+
+    public PayloadData (byte [] applicationData)
+      : this (new byte [0], applicationData, false)
+    {
+    }
+
+    public PayloadData (string applicationData)
+      : this (new byte [0], Encoding.UTF8.GetBytes (applicationData), false)
+    {
+    }
+
+    public PayloadData (byte [] applicationData, bool masked)
+      : this (new byte [0], applicationData, masked)
+    {
+    }
+
+    public PayloadData (byte [] extensionData, byte [] applicationData, bool masked)
+    {
+      _extensionData = extensionData;
+      _applicationData = applicationData;
+      _masked = masked;
+    }
+
+    #endregion
+
+    #region Internal Properties
+
+    internal bool ContainsReservedCloseStatusCode {
+      get {
+        return _applicationData.Length > 1 &&
+               _applicationData.SubArray (0, 2).ToUInt16 (ByteOrder.Big).IsReserved ();
+      }
+    }
+
+    #endregion
+
+    #region Public Properties
+
+    public byte [] ApplicationData {
+      get {
+        return _applicationData;
+      }
+    }
+
+    public byte [] ExtensionData {
+      get {
+        return _extensionData;
+      }
+    }
+
+    public bool IsMasked {
+      get {
+        return _masked;
+      }
+    }
+
+    public ulong Length {
+      get {
+        return (ulong) (_extensionData.Length + _applicationData.Length);
+      }
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private static void mask (byte [] src, byte [] key)
+    {
+      for (long i = 0; i < src.Length; i++)
+        src [i] = (byte) (src [i] ^ key [i % 4]);
+    }
+
+    #endregion
+
+    #region Public Methods
+
+    public IEnumerator<byte> GetEnumerator ()
+    {
+      foreach (byte b in _extensionData)
+        yield return b;
+
+      foreach (byte b in _applicationData)
+        yield return b;
+    }
+
+    public void Mask (byte [] maskingKey)
+    {
+      if (_extensionData.Length > 0)
+        mask (_extensionData, maskingKey);
+
+      if (_applicationData.Length > 0)
+        mask (_applicationData, maskingKey);
+
+      _masked = !_masked;
+    }
+
+    public byte [] ToByteArray ()
+    {
+      return _extensionData.Length > 0
+             ? new List<byte> (this).ToArray ()
+             : _applicationData;
+    }
+
+    public override string ToString ()
+    {
+      return BitConverter.ToString (ToByteArray ());
+    }
+
+    #endregion
+
+    #region Explicitly Implemented Interface Members
+
+    IEnumerator IEnumerable.GetEnumerator ()
+    {
+      return GetEnumerator ();
+    }
+
+    #endregion
+  }
+}
diff --git a/SocketHttpListener.Portable/Primitives/HttpListenerException.cs b/SocketHttpListener.Portable/Primitives/HttpListenerException.cs
new file mode 100644
index 000000000..7b383fd23
--- /dev/null
+++ b/SocketHttpListener.Portable/Primitives/HttpListenerException.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SocketHttpListener.Primitives
+{
+    public class HttpListenerException : Exception
+    {
+        public HttpListenerException(int statusCode, string message)
+            : base(message)
+        {
+            
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Primitives/ICertificate.cs b/SocketHttpListener.Portable/Primitives/ICertificate.cs
new file mode 100644
index 000000000..1289da13d
--- /dev/null
+++ b/SocketHttpListener.Portable/Primitives/ICertificate.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SocketHttpListener.Primitives
+{
+    public interface ICertificate
+    {
+    }
+}
diff --git a/SocketHttpListener.Portable/Primitives/IStreamFactory.cs b/SocketHttpListener.Portable/Primitives/IStreamFactory.cs
new file mode 100644
index 000000000..f189b95b4
--- /dev/null
+++ b/SocketHttpListener.Portable/Primitives/IStreamFactory.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Net;
+
+namespace SocketHttpListener.Primitives
+{
+    public interface IStreamFactory
+    {
+        Stream CreateNetworkStream(ISocket socket, bool ownsSocket);
+        Stream CreateSslStream(Stream innerStream, bool leaveInnerStreamOpen);
+
+        Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate);
+    }
+}
diff --git a/SocketHttpListener.Portable/Primitives/ITextEncoding.cs b/SocketHttpListener.Portable/Primitives/ITextEncoding.cs
new file mode 100644
index 000000000..b10145687
--- /dev/null
+++ b/SocketHttpListener.Portable/Primitives/ITextEncoding.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Text;
+
+namespace SocketHttpListener.Primitives
+{
+    public static class TextEncodingExtensions
+    {
+        public static Encoding GetDefaultEncoding(this ITextEncoding encoding)
+        {
+            return Encoding.UTF8;
+        }
+    }
+}
diff --git a/SocketHttpListener.Portable/Properties/AssemblyInfo.cs b/SocketHttpListener.Portable/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..870426460
--- /dev/null
+++ b/SocketHttpListener.Portable/Properties/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SocketHttpListener.Portable")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SocketHttpListener.Portable")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SocketHttpListener.Portable/Rsv.cs b/SocketHttpListener.Portable/Rsv.cs
new file mode 100644
index 000000000..668059b8a
--- /dev/null
+++ b/SocketHttpListener.Portable/Rsv.cs
@@ -0,0 +1,8 @@
+namespace SocketHttpListener
+{
+  internal enum Rsv : byte
+  {
+    Off = 0x0,
+    On = 0x1
+  }
+}
diff --git a/SocketHttpListener.Portable/SocketHttpListener.Portable.csproj b/SocketHttpListener.Portable/SocketHttpListener.Portable.csproj
new file mode 100644
index 000000000..f7b3a643c
--- /dev/null
+++ b/SocketHttpListener.Portable/SocketHttpListener.Portable.csproj
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SocketHttpListener.Portable</RootNamespace>
+    <AssemblyName>SocketHttpListener.Portable</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="ByteOrder.cs" />
+    <Compile Include="CloseEventArgs.cs" />
+    <Compile Include="CloseStatusCode.cs" />
+    <Compile Include="CompressionMethod.cs" />
+    <Compile Include="ErrorEventArgs.cs" />
+    <Compile Include="Ext.cs" />
+    <Compile Include="Fin.cs" />
+    <Compile Include="HttpBase.cs" />
+    <Compile Include="HttpResponse.cs" />
+    <Compile Include="Mask.cs" />
+    <Compile Include="MessageEventArgs.cs" />
+    <Compile Include="Net\AuthenticationSchemeSelector.cs" />
+    <Compile Include="Net\ChunkedInputStream.cs" />
+    <Compile Include="Net\ChunkStream.cs" />
+    <Compile Include="Net\CookieHelper.cs" />
+    <Compile Include="Net\EndPointListener.cs" />
+    <Compile Include="Net\EndPointManager.cs" />
+    <Compile Include="Net\HttpConnection.cs" />
+    <Compile Include="Net\HttpListener.cs" />
+    <Compile Include="Net\HttpListenerBasicIdentity.cs" />
+    <Compile Include="Net\HttpListenerContext.cs" />
+    <Compile Include="Net\HttpListenerPrefixCollection.cs" />
+    <Compile Include="Net\HttpListenerRequest.cs" />
+    <Compile Include="Net\HttpListenerResponse.cs" />
+    <Compile Include="Net\HttpStatusCode.cs" />
+    <Compile Include="Net\HttpStreamAsyncResult.cs" />
+    <Compile Include="Net\HttpVersion.cs" />
+    <Compile Include="Net\ListenerPrefix.cs" />
+    <Compile Include="Net\RequestStream.cs" />
+    <Compile Include="Net\ResponseStream.cs" />
+    <Compile Include="Net\WebHeaderCollection.cs" />
+    <Compile Include="Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="Net\WebSockets\WebSocketContext.cs" />
+    <Compile Include="Opcode.cs" />
+    <Compile Include="PayloadData.cs" />
+    <Compile Include="Primitives\HttpListenerException.cs" />
+    <Compile Include="Primitives\ICertificate.cs" />
+    <Compile Include="Primitives\IStreamFactory.cs" />
+    <Compile Include="Primitives\ITextEncoding.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Rsv.cs" />
+    <Compile Include="WebSocket.cs" />
+    <Compile Include="WebSocketException.cs" />
+    <Compile Include="WebSocketFrame.cs" />
+    <Compile Include="WebSocketState.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
+      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
+      <Name>MediaBrowser.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>if $(ConfigurationName) == Release (
+xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i
+)</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/SocketHttpListener.Portable.nuget.targets b/SocketHttpListener.Portable/SocketHttpListener.Portable.nuget.targets
new file mode 100644
index 000000000..e69ce0e64
--- /dev/null
+++ b/SocketHttpListener.Portable/SocketHttpListener.Portable.nuget.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
+    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/WebSocket.cs b/SocketHttpListener.Portable/WebSocket.cs
new file mode 100644
index 000000000..889880387
--- /dev/null
+++ b/SocketHttpListener.Portable/WebSocket.cs
@@ -0,0 +1,898 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.IO;
+using SocketHttpListener.Net.WebSockets;
+using SocketHttpListener.Primitives;
+using HttpStatusCode = SocketHttpListener.Net.HttpStatusCode;
+
+namespace SocketHttpListener
+{
+    /// <summary>
+    /// Implements the WebSocket interface.
+    /// </summary>
+    /// <remarks>
+    /// The WebSocket class provides a set of methods and properties for two-way communication using
+    /// the WebSocket protocol (<see href="http://tools.ietf.org/html/rfc6455">RFC 6455</see>).
+    /// </remarks>
+    public class WebSocket : IDisposable
+    {
+        #region Private Fields
+
+        private string _base64Key;
+        private Action _closeContext;
+        private CompressionMethod _compression;
+        private WebSocketContext _context;
+        private CookieCollection _cookies;
+        private string _extensions;
+        private AutoResetEvent _exitReceiving;
+        private object _forConn;
+        private object _forEvent;
+        private object _forMessageEventQueue;
+        private object _forSend;
+        private const string _guid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+        private Func<WebSocketContext, string>
+                                        _handshakeRequestChecker;
+        private Queue<MessageEventArgs> _messageEventQueue;
+        private uint _nonceCount;
+        private string _origin;
+        private bool _preAuth;
+        private string _protocol;
+        private string[] _protocols;
+        private Uri _proxyUri;
+        private volatile WebSocketState _readyState;
+        private AutoResetEvent _receivePong;
+        private bool _secure;
+        private Stream _stream;
+        private Uri _uri;
+        private const string _version = "13";
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
+
+        private readonly ICryptoProvider _cryptoProvider;
+
+        #endregion
+
+        #region Internal Fields
+
+        internal const int FragmentLength = 1016; // Max value is int.MaxValue - 14.
+
+        #endregion
+
+        #region Internal Constructors
+
+        // As server
+        internal WebSocket(HttpListenerWebSocketContext context, string protocol, ICryptoProvider cryptoProvider, IMemoryStreamFactory memoryStreamFactory)
+        {
+            _context = context;
+            _protocol = protocol;
+            _cryptoProvider = cryptoProvider;
+            _memoryStreamFactory = memoryStreamFactory;
+
+            _closeContext = context.Close;
+            _secure = context.IsSecureConnection;
+            _stream = context.Stream;
+
+            init();
+        }
+
+        #endregion
+
+        // As server
+        internal Func<WebSocketContext, string> CustomHandshakeRequestChecker
+        {
+            get
+            {
+                return _handshakeRequestChecker ?? (context => null);
+            }
+
+            set
+            {
+                _handshakeRequestChecker = value;
+            }
+        }
+
+        internal bool IsConnected
+        {
+            get
+            {
+                return _readyState == WebSocketState.Open || _readyState == WebSocketState.Closing;
+            }
+        }
+
+        /// <summary>
+        /// Gets the state of the WebSocket connection.
+        /// </summary>
+        /// <value>
+        /// One of the <see cref="WebSocketState"/> enum values, indicates the state of the WebSocket
+        /// connection. The default value is <see cref="WebSocketState.Connecting"/>.
+        /// </value>
+        public WebSocketState ReadyState
+        {
+            get
+            {
+                return _readyState;
+            }
+        }
+
+        #region Public Events
+
+        /// <summary>
+        /// Occurs when the WebSocket connection has been closed.
+        /// </summary>
+        public event EventHandler<CloseEventArgs> OnClose;
+
+        /// <summary>
+        /// Occurs when the <see cref="WebSocket"/> gets an error.
+        /// </summary>
+        public event EventHandler<ErrorEventArgs> OnError;
+
+        /// <summary>
+        /// Occurs when the <see cref="WebSocket"/> receives a message.
+        /// </summary>
+        public event EventHandler<MessageEventArgs> OnMessage;
+
+        /// <summary>
+        /// Occurs when the WebSocket connection has been established.
+        /// </summary>
+        public event EventHandler OnOpen;
+
+        #endregion
+
+        #region Private Methods
+
+        // As server
+        private bool acceptHandshake()
+        {
+            var msg = checkIfValidHandshakeRequest(_context);
+            if (msg != null)
+            {
+                error("An error has occurred while connecting: " + msg);
+                Close(HttpStatusCode.BadRequest);
+
+                return false;
+            }
+
+            if (_protocol != null &&
+                !_context.SecWebSocketProtocols.Contains(protocol => protocol == _protocol))
+                _protocol = null;
+
+            ////var extensions = _context.Headers["Sec-WebSocket-Extensions"];
+            ////if (extensions != null && extensions.Length > 0)
+            ////    processSecWebSocketExtensionsHeader(extensions);
+
+            return sendHttpResponse(createHandshakeResponse());
+        }
+
+        // As server
+        private string checkIfValidHandshakeRequest(WebSocketContext context)
+        {
+            var headers = context.Headers;
+            return context.RequestUri == null
+                   ? "Invalid request url."
+                   : !context.IsWebSocketRequest
+                     ? "Not WebSocket connection request."
+                     : !validateSecWebSocketKeyHeader(headers["Sec-WebSocket-Key"])
+                       ? "Invalid Sec-WebSocket-Key header."
+                       : !validateSecWebSocketVersionClientHeader(headers["Sec-WebSocket-Version"])
+                         ? "Invalid Sec-WebSocket-Version header."
+                         : CustomHandshakeRequestChecker(context);
+        }
+
+        private void close(CloseStatusCode code, string reason, bool wait)
+        {
+            close(new PayloadData(((ushort)code).Append(reason)), !code.IsReserved(), wait);
+        }
+
+        private void close(PayloadData payload, bool send, bool wait)
+        {
+            lock (_forConn)
+            {
+                if (_readyState == WebSocketState.Closing || _readyState == WebSocketState.Closed)
+                {
+                    return;
+                }
+
+                _readyState = WebSocketState.Closing;
+            }
+
+            var e = new CloseEventArgs(payload);
+            e.WasClean =
+              closeHandshake(
+                  send ? WebSocketFrame.CreateCloseFrame(Mask.Unmask, payload).ToByteArray() : null,
+                  wait ? 1000 : 0,
+                  closeServerResources);
+
+            _readyState = WebSocketState.Closed;
+            try
+            {
+                OnClose.Emit(this, e);
+            }
+            catch (Exception ex)
+            {
+                error("An exception has occurred while OnClose.", ex);
+            }
+        }
+
+        private bool closeHandshake(byte[] frameAsBytes, int millisecondsTimeout, Action release)
+        {
+            var sent = frameAsBytes != null && writeBytes(frameAsBytes);
+            var received =
+              millisecondsTimeout == 0 ||
+              (sent && _exitReceiving != null && _exitReceiving.WaitOne(millisecondsTimeout));
+
+            release();
+            if (_receivePong != null)
+            {
+                _receivePong.Dispose();
+                _receivePong = null;
+            }
+
+            if (_exitReceiving != null)
+            {
+                _exitReceiving.Dispose();
+                _exitReceiving = null;
+            }
+
+            var result = sent && received;
+
+            return result;
+        }
+
+        // As server
+        private void closeServerResources()
+        {
+            if (_closeContext == null)
+                return;
+
+            _closeContext();
+            _closeContext = null;
+            _stream = null;
+            _context = null;
+        }
+
+        private bool concatenateFragmentsInto(Stream dest)
+        {
+            while (true)
+            {
+                var frame = WebSocketFrame.Read(_stream, true);
+                if (frame.IsFinal)
+                {
+                    /* FINAL */
+
+                    // CONT
+                    if (frame.IsContinuation)
+                    {
+                        dest.WriteBytes(frame.PayloadData.ApplicationData);
+                        break;
+                    }
+
+                    // PING
+                    if (frame.IsPing)
+                    {
+                        processPingFrame(frame);
+                        continue;
+                    }
+
+                    // PONG
+                    if (frame.IsPong)
+                    {
+                        processPongFrame(frame);
+                        continue;
+                    }
+
+                    // CLOSE
+                    if (frame.IsClose)
+                        return processCloseFrame(frame);
+                }
+                else
+                {
+                    /* MORE */
+
+                    // CONT
+                    if (frame.IsContinuation)
+                    {
+                        dest.WriteBytes(frame.PayloadData.ApplicationData);
+                        continue;
+                    }
+                }
+
+                // ?
+                return processUnsupportedFrame(
+                  frame,
+                  CloseStatusCode.IncorrectData,
+                  "An incorrect data has been received while receiving fragmented data.");
+            }
+
+            return true;
+        }
+
+        // As server
+        private HttpResponse createHandshakeCloseResponse(HttpStatusCode code)
+        {
+            var res = HttpResponse.CreateCloseResponse(code);
+            res.Headers["Sec-WebSocket-Version"] = _version;
+
+            return res;
+        }
+
+        // As server
+        private HttpResponse createHandshakeResponse()
+        {
+            var res = HttpResponse.CreateWebSocketResponse();
+
+            var headers = res.Headers;
+            headers["Sec-WebSocket-Accept"] = CreateResponseKey(_base64Key);
+
+            if (_protocol != null)
+                headers["Sec-WebSocket-Protocol"] = _protocol;
+
+            if (_extensions != null)
+                headers["Sec-WebSocket-Extensions"] = _extensions;
+
+            if (_cookies.Count > 0)
+                res.SetCookies(_cookies);
+
+            return res;
+        }
+
+        private MessageEventArgs dequeueFromMessageEventQueue()
+        {
+            lock (_forMessageEventQueue)
+                return _messageEventQueue.Count > 0
+                       ? _messageEventQueue.Dequeue()
+                       : null;
+        }
+
+        private void enqueueToMessageEventQueue(MessageEventArgs e)
+        {
+            lock (_forMessageEventQueue)
+                _messageEventQueue.Enqueue(e);
+        }
+
+        private void error(string message, Exception exception)
+        {
+            try
+            {
+                if (exception != null)
+                {
+                    message += ". Exception.Message: " + exception.Message;
+                }
+                OnError.Emit(this, new ErrorEventArgs(message));
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        private void error(string message)
+        {
+            try
+            {
+                OnError.Emit(this, new ErrorEventArgs(message));
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        private void init()
+        {
+            _compression = CompressionMethod.None;
+            _cookies = new CookieCollection();
+            _forConn = new object();
+            _forEvent = new object();
+            _forSend = new object();
+            _messageEventQueue = new Queue<MessageEventArgs>();
+            _forMessageEventQueue = ((ICollection)_messageEventQueue).SyncRoot;
+            _readyState = WebSocketState.Connecting;
+        }
+
+        private void open()
+        {
+            try
+            {
+                startReceiving();
+
+                lock (_forEvent)
+                {
+                    try
+                    {
+                        OnOpen.Emit(this, EventArgs.Empty);
+                    }
+                    catch (Exception ex)
+                    {
+                        processException(ex, "An exception has occurred while OnOpen.");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                processException(ex, "An exception has occurred while opening.");
+            }
+        }
+
+        private bool processCloseFrame(WebSocketFrame frame)
+        {
+            var payload = frame.PayloadData;
+            close(payload, !payload.ContainsReservedCloseStatusCode, false);
+
+            return false;
+        }
+
+        private bool processDataFrame(WebSocketFrame frame)
+        {
+            var e = frame.IsCompressed
+                    ? new MessageEventArgs(
+                        frame.Opcode, frame.PayloadData.ApplicationData.Decompress(_compression))
+                    : new MessageEventArgs(frame.Opcode, frame.PayloadData);
+
+            enqueueToMessageEventQueue(e);
+            return true;
+        }
+
+        private void processException(Exception exception, string message)
+        {
+            var code = CloseStatusCode.Abnormal;
+            var reason = message;
+            if (exception is WebSocketException)
+            {
+                var wsex = (WebSocketException)exception;
+                code = wsex.Code;
+                reason = wsex.Message;
+            }
+
+            error(message ?? code.GetMessage(), exception);
+            if (_readyState == WebSocketState.Connecting)
+                Close(HttpStatusCode.BadRequest);
+            else
+                close(code, reason ?? code.GetMessage(), false);
+        }
+
+        private bool processFragmentedFrame(WebSocketFrame frame)
+        {
+            return frame.IsContinuation // Not first fragment
+                   ? true
+                   : processFragments(frame);
+        }
+
+        private bool processFragments(WebSocketFrame first)
+        {
+            using (var buff = _memoryStreamFactory.CreateNew())
+            {
+                buff.WriteBytes(first.PayloadData.ApplicationData);
+                if (!concatenateFragmentsInto(buff))
+                    return false;
+
+                byte[] data;
+                if (_compression != CompressionMethod.None)
+                {
+                    data = buff.DecompressToArray(_compression);
+                }
+                else
+                {
+                    data = buff.ToArray();
+                }
+
+                enqueueToMessageEventQueue(new MessageEventArgs(first.Opcode, data));
+                return true;
+            }
+        }
+
+        private bool processPingFrame(WebSocketFrame frame)
+        {
+            var mask = Mask.Unmask;
+
+            return true;
+        }
+
+        private bool processPongFrame(WebSocketFrame frame)
+        {
+            _receivePong.Set();
+
+            return true;
+        }
+
+        private bool processUnsupportedFrame(WebSocketFrame frame, CloseStatusCode code, string reason)
+        {
+            processException(new WebSocketException(code, reason), null);
+
+            return false;
+        }
+
+        private bool processWebSocketFrame(WebSocketFrame frame)
+        {
+            return frame.IsCompressed && _compression == CompressionMethod.None
+                   ? processUnsupportedFrame(
+                       frame,
+                       CloseStatusCode.IncorrectData,
+                       "A compressed data has been received without available decompression method.")
+                   : frame.IsFragmented
+                     ? processFragmentedFrame(frame)
+                     : frame.IsData
+                       ? processDataFrame(frame)
+                       : frame.IsPing
+                         ? processPingFrame(frame)
+                         : frame.IsPong
+                           ? processPongFrame(frame)
+                           : frame.IsClose
+                             ? processCloseFrame(frame)
+                             : processUnsupportedFrame(frame, CloseStatusCode.PolicyViolation, null);
+        }
+
+        private bool send(Opcode opcode, Stream stream)
+        {
+            lock (_forSend)
+            {
+                var src = stream;
+                var compressed = false;
+                var sent = false;
+                try
+                {
+                    if (_compression != CompressionMethod.None)
+                    {
+                        stream = stream.Compress(_compression);
+                        compressed = true;
+                    }
+
+                    sent = send(opcode, Mask.Unmask, stream, compressed);
+                    if (!sent)
+                        error("Sending a data has been interrupted.");
+                }
+                catch (Exception ex)
+                {
+                    error("An exception has occurred while sending a data.", ex);
+                }
+                finally
+                {
+                    if (compressed)
+                        stream.Dispose();
+
+                    src.Dispose();
+                }
+
+                return sent;
+            }
+        }
+
+        private bool send(Opcode opcode, Mask mask, Stream stream, bool compressed)
+        {
+            var len = stream.Length;
+
+            /* Not fragmented */
+
+            if (len == 0)
+                return send(Fin.Final, opcode, mask, new byte[0], compressed);
+
+            var quo = len / FragmentLength;
+            var rem = (int)(len % FragmentLength);
+
+            byte[] buff = null;
+            if (quo == 0)
+            {
+                buff = new byte[rem];
+                return stream.Read(buff, 0, rem) == rem &&
+                       send(Fin.Final, opcode, mask, buff, compressed);
+            }
+
+            buff = new byte[FragmentLength];
+            if (quo == 1 && rem == 0)
+                return stream.Read(buff, 0, FragmentLength) == FragmentLength &&
+                       send(Fin.Final, opcode, mask, buff, compressed);
+
+            /* Send fragmented */
+
+            // Begin
+            if (stream.Read(buff, 0, FragmentLength) != FragmentLength ||
+                !send(Fin.More, opcode, mask, buff, compressed))
+                return false;
+
+            var n = rem == 0 ? quo - 2 : quo - 1;
+            for (long i = 0; i < n; i++)
+                if (stream.Read(buff, 0, FragmentLength) != FragmentLength ||
+                    !send(Fin.More, Opcode.Cont, mask, buff, compressed))
+                    return false;
+
+            // End
+            if (rem == 0)
+                rem = FragmentLength;
+            else
+                buff = new byte[rem];
+
+            return stream.Read(buff, 0, rem) == rem &&
+                   send(Fin.Final, Opcode.Cont, mask, buff, compressed);
+        }
+
+        private bool send(Fin fin, Opcode opcode, Mask mask, byte[] data, bool compressed)
+        {
+            lock (_forConn)
+            {
+                if (_readyState != WebSocketState.Open)
+                {
+                    return false;
+                }
+
+                return writeBytes(
+                  WebSocketFrame.CreateWebSocketFrame(fin, opcode, mask, data, compressed).ToByteArray());
+            }
+        }
+
+        private void sendAsync(Opcode opcode, Stream stream, Action<bool> completed)
+        {
+            Func<Opcode, Stream, bool> sender = send;
+            sender.BeginInvoke(
+              opcode,
+              stream,
+              ar =>
+              {
+                  try
+                  {
+                      var sent = sender.EndInvoke(ar);
+                      if (completed != null)
+                          completed(sent);
+                  }
+                  catch (Exception ex)
+                  {
+                      error("An exception has occurred while callback.", ex);
+                  }
+              },
+              null);
+        }
+
+        // As server
+        private bool sendHttpResponse(HttpResponse response)
+        {
+            return writeBytes(response.ToByteArray());
+        }
+
+        private void startReceiving()
+        {
+            if (_messageEventQueue.Count > 0)
+                _messageEventQueue.Clear();
+
+            _exitReceiving = new AutoResetEvent(false);
+            _receivePong = new AutoResetEvent(false);
+
+            Action receive = null;
+            receive = () => WebSocketFrame.ReadAsync(
+              _stream,
+              true,
+              frame =>
+              {
+                  if (processWebSocketFrame(frame) && _readyState != WebSocketState.Closed)
+                  {
+                      receive();
+
+                      if (!frame.IsData)
+                          return;
+
+                      lock (_forEvent)
+                      {
+                          try
+                          {
+                              var e = dequeueFromMessageEventQueue();
+                              if (e != null && _readyState == WebSocketState.Open)
+                                  OnMessage.Emit(this, e);
+                          }
+                          catch (Exception ex)
+                          {
+                              processException(ex, "An exception has occurred while OnMessage.");
+                          }
+                      }
+                  }
+                  else if (_exitReceiving != null)
+                  {
+                      _exitReceiving.Set();
+                  }
+              },
+              ex => processException(ex, "An exception has occurred while receiving a message."));
+
+            receive();
+        }
+
+        // As server
+        private bool validateSecWebSocketKeyHeader(string value)
+        {
+            if (value == null || value.Length == 0)
+                return false;
+
+            _base64Key = value;
+            return true;
+        }
+
+        // As server
+        private bool validateSecWebSocketVersionClientHeader(string value)
+        {
+            return true;
+            //return value != null && value == _version;
+        }
+
+        private bool writeBytes(byte[] data)
+        {
+            try
+            {
+                _stream.Write(data, 0, data.Length);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
+
+        #endregion
+
+        #region Internal Methods
+
+        // As server
+        internal void Close(HttpResponse response)
+        {
+            _readyState = WebSocketState.Closing;
+
+            sendHttpResponse(response);
+            closeServerResources();
+
+            _readyState = WebSocketState.Closed;
+        }
+
+        // As server
+        internal void Close(HttpStatusCode code)
+        {
+            Close(createHandshakeCloseResponse(code));
+        }
+
+        // As server
+        public void ConnectAsServer()
+        {
+            try
+            {
+                if (acceptHandshake())
+                {
+                    _readyState = WebSocketState.Open;
+                    open();
+                }
+            }
+            catch (Exception ex)
+            {
+                processException(ex, "An exception has occurred while connecting.");
+            }
+        }
+
+        private string CreateResponseKey(string base64Key)
+        {
+            var buff = new StringBuilder(base64Key, 64);
+            buff.Append(_guid);
+            var src = _cryptoProvider.ComputeSHA1(Encoding.UTF8.GetBytes(buff.ToString()));
+
+            return Convert.ToBase64String(src);
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Closes the WebSocket connection, and releases all associated resources.
+        /// </summary>
+        public void Close()
+        {
+            var msg = _readyState.CheckIfClosable();
+            if (msg != null)
+            {
+                error(msg);
+
+                return;
+            }
+
+            var send = _readyState == WebSocketState.Open;
+            close(new PayloadData(), send, send);
+        }
+
+        /// <summary>
+        /// Closes the WebSocket connection with the specified <see cref="CloseStatusCode"/>
+        /// and <see cref="string"/>, and releases all associated resources.
+        /// </summary>
+        /// <remarks>
+        /// This method emits a <see cref="OnError"/> event if the size
+        /// of <paramref name="reason"/> is greater than 123 bytes.
+        /// </remarks>
+        /// <param name="code">
+        /// One of the <see cref="CloseStatusCode"/> enum values, represents the status code
+        /// indicating the reason for the close.
+        /// </param>
+        /// <param name="reason">
+        /// A <see cref="string"/> that represents the reason for the close.
+        /// </param>
+        public void Close(CloseStatusCode code, string reason)
+        {
+            byte[] data = null;
+            var msg = _readyState.CheckIfClosable() ??
+                      (data = ((ushort)code).Append(reason)).CheckIfValidControlData("reason");
+
+            if (msg != null)
+            {
+                error(msg);
+
+                return;
+            }
+
+            var send = _readyState == WebSocketState.Open && !code.IsReserved();
+            close(new PayloadData(data), send, send);
+        }
+
+        /// <summary>
+        /// Sends a binary <paramref name="data"/> asynchronously using the WebSocket connection.
+        /// </summary>
+        /// <remarks>
+        /// This method doesn't wait for the send to be complete.
+        /// </remarks>
+        /// <param name="data">
+        /// An array of <see cref="byte"/> that represents the binary data to send.
+        /// </param>
+        /// <param name="completed">
+        /// An Action&lt;bool&gt; delegate that references the method(s) called when the send is
+        /// complete. A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
+        /// complete successfully; otherwise, <c>false</c>.
+        /// </param>
+        public void SendAsync(byte[] data, Action<bool> completed)
+        {
+            var msg = _readyState.CheckIfOpen() ?? data.CheckIfValidSendData();
+            if (msg != null)
+            {
+                error(msg);
+
+                return;
+            }
+
+            sendAsync(Opcode.Binary, _memoryStreamFactory.CreateNew(data), completed);
+        }
+
+        /// <summary>
+        /// Sends a text <paramref name="data"/> asynchronously using the WebSocket connection.
+        /// </summary>
+        /// <remarks>
+        /// This method doesn't wait for the send to be complete.
+        /// </remarks>
+        /// <param name="data">
+        /// A <see cref="string"/> that represents the text data to send.
+        /// </param>
+        /// <param name="completed">
+        /// An Action&lt;bool&gt; delegate that references the method(s) called when the send is
+        /// complete. A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
+        /// complete successfully; otherwise, <c>false</c>.
+        /// </param>
+        public void SendAsync(string data, Action<bool> completed)
+        {
+            var msg = _readyState.CheckIfOpen() ?? data.CheckIfValidSendData();
+            if (msg != null)
+            {
+                error(msg);
+
+                return;
+            }
+
+            sendAsync(Opcode.Text, _memoryStreamFactory.CreateNew(Encoding.UTF8.GetBytes(data)), completed);
+        }
+
+        #endregion
+
+        #region Explicit Interface Implementation
+
+        /// <summary>
+        /// Closes the WebSocket connection, and releases all associated resources.
+        /// </summary>
+        /// <remarks>
+        /// This method closes the WebSocket connection with <see cref="CloseStatusCode.Away"/>.
+        /// </remarks>
+        void IDisposable.Dispose()
+        {
+            Close(CloseStatusCode.Away, null);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/WebSocketException.cs b/SocketHttpListener.Portable/WebSocketException.cs
new file mode 100644
index 000000000..260721317
--- /dev/null
+++ b/SocketHttpListener.Portable/WebSocketException.cs
@@ -0,0 +1,60 @@
+using System;
+
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// The exception that is thrown when a <see cref="WebSocket"/> gets a fatal error.
+  /// </summary>
+  public class WebSocketException : Exception
+  {
+    #region Internal Constructors
+
+    internal WebSocketException ()
+      : this (CloseStatusCode.Abnormal, null, null)
+    {
+    }
+
+    internal WebSocketException (string message)
+      : this (CloseStatusCode.Abnormal, message, null)
+    {
+    }
+
+    internal WebSocketException (CloseStatusCode code)
+      : this (code, null, null)
+    {
+    }
+
+    internal WebSocketException (string message, Exception innerException)
+      : this (CloseStatusCode.Abnormal, message, innerException)
+    {
+    }
+
+    internal WebSocketException (CloseStatusCode code, string message)
+      : this (code, message, null)
+    {
+    }
+
+    internal WebSocketException (CloseStatusCode code, string message, Exception innerException)
+      : base (message ?? code.GetMessage (), innerException)
+    {
+      Code = code;
+    }
+
+    #endregion
+
+    #region Public Properties
+
+    /// <summary>
+    /// Gets the status code indicating the cause for the exception.
+    /// </summary>
+    /// <value>
+    /// One of the <see cref="CloseStatusCode"/> enum values, represents the status code indicating
+    /// the cause for the exception.
+    /// </value>
+    public CloseStatusCode Code {
+      get; private set;
+    }
+
+    #endregion
+  }
+}
diff --git a/SocketHttpListener.Portable/WebSocketFrame.cs b/SocketHttpListener.Portable/WebSocketFrame.cs
new file mode 100644
index 000000000..44fa4a5dc
--- /dev/null
+++ b/SocketHttpListener.Portable/WebSocketFrame.cs
@@ -0,0 +1,578 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace SocketHttpListener
+{
+    internal class WebSocketFrame : IEnumerable<byte>
+    {
+        #region Private Fields
+
+        private byte[] _extPayloadLength;
+        private Fin _fin;
+        private Mask _mask;
+        private byte[] _maskingKey;
+        private Opcode _opcode;
+        private PayloadData _payloadData;
+        private byte _payloadLength;
+        private Rsv _rsv1;
+        private Rsv _rsv2;
+        private Rsv _rsv3;
+
+        #endregion
+
+        #region Internal Fields
+
+        internal static readonly byte[] EmptyUnmaskPingData;
+
+        #endregion
+
+        #region Static Constructor
+
+        static WebSocketFrame()
+        {
+            EmptyUnmaskPingData = CreatePingFrame(Mask.Unmask).ToByteArray();
+        }
+
+        #endregion
+
+        #region Private Constructors
+
+        private WebSocketFrame()
+        {
+        }
+
+        #endregion
+
+        #region Internal Constructors
+
+        internal WebSocketFrame(Opcode opcode, PayloadData payload)
+            : this(Fin.Final, opcode, Mask.Mask, payload, false)
+        {
+        }
+
+        internal WebSocketFrame(Opcode opcode, Mask mask, PayloadData payload)
+            : this(Fin.Final, opcode, mask, payload, false)
+        {
+        }
+
+        internal WebSocketFrame(Fin fin, Opcode opcode, Mask mask, PayloadData payload)
+            : this(fin, opcode, mask, payload, false)
+        {
+        }
+
+        internal WebSocketFrame(
+          Fin fin, Opcode opcode, Mask mask, PayloadData payload, bool compressed)
+        {
+            _fin = fin;
+            _rsv1 = isData(opcode) && compressed ? Rsv.On : Rsv.Off;
+            _rsv2 = Rsv.Off;
+            _rsv3 = Rsv.Off;
+            _opcode = opcode;
+            _mask = mask;
+
+            var len = payload.Length;
+            if (len < 126)
+            {
+                _payloadLength = (byte)len;
+                _extPayloadLength = new byte[0];
+            }
+            else if (len < 0x010000)
+            {
+                _payloadLength = (byte)126;
+                _extPayloadLength = ((ushort)len).ToByteArrayInternally(ByteOrder.Big);
+            }
+            else
+            {
+                _payloadLength = (byte)127;
+                _extPayloadLength = len.ToByteArrayInternally(ByteOrder.Big);
+            }
+
+            if (mask == Mask.Mask)
+            {
+                _maskingKey = createMaskingKey();
+                payload.Mask(_maskingKey);
+            }
+            else
+            {
+                _maskingKey = new byte[0];
+            }
+
+            _payloadData = payload;
+        }
+
+        #endregion
+
+        #region Public Properties
+
+        public byte[] ExtendedPayloadLength
+        {
+            get
+            {
+                return _extPayloadLength;
+            }
+        }
+
+        public Fin Fin
+        {
+            get
+            {
+                return _fin;
+            }
+        }
+
+        public bool IsBinary
+        {
+            get
+            {
+                return _opcode == Opcode.Binary;
+            }
+        }
+
+        public bool IsClose
+        {
+            get
+            {
+                return _opcode == Opcode.Close;
+            }
+        }
+
+        public bool IsCompressed
+        {
+            get
+            {
+                return _rsv1 == Rsv.On;
+            }
+        }
+
+        public bool IsContinuation
+        {
+            get
+            {
+                return _opcode == Opcode.Cont;
+            }
+        }
+
+        public bool IsControl
+        {
+            get
+            {
+                return _opcode == Opcode.Close || _opcode == Opcode.Ping || _opcode == Opcode.Pong;
+            }
+        }
+
+        public bool IsData
+        {
+            get
+            {
+                return _opcode == Opcode.Binary || _opcode == Opcode.Text;
+            }
+        }
+
+        public bool IsFinal
+        {
+            get
+            {
+                return _fin == Fin.Final;
+            }
+        }
+
+        public bool IsFragmented
+        {
+            get
+            {
+                return _fin == Fin.More || _opcode == Opcode.Cont;
+            }
+        }
+
+        public bool IsMasked
+        {
+            get
+            {
+                return _mask == Mask.Mask;
+            }
+        }
+
+        public bool IsPerMessageCompressed
+        {
+            get
+            {
+                return (_opcode == Opcode.Binary || _opcode == Opcode.Text) && _rsv1 == Rsv.On;
+            }
+        }
+
+        public bool IsPing
+        {
+            get
+            {
+                return _opcode == Opcode.Ping;
+            }
+        }
+
+        public bool IsPong
+        {
+            get
+            {
+                return _opcode == Opcode.Pong;
+            }
+        }
+
+        public bool IsText
+        {
+            get
+            {
+                return _opcode == Opcode.Text;
+            }
+        }
+
+        public ulong Length
+        {
+            get
+            {
+                return 2 + (ulong)(_extPayloadLength.Length + _maskingKey.Length) + _payloadData.Length;
+            }
+        }
+
+        public Mask Mask
+        {
+            get
+            {
+                return _mask;
+            }
+        }
+
+        public byte[] MaskingKey
+        {
+            get
+            {
+                return _maskingKey;
+            }
+        }
+
+        public Opcode Opcode
+        {
+            get
+            {
+                return _opcode;
+            }
+        }
+
+        public PayloadData PayloadData
+        {
+            get
+            {
+                return _payloadData;
+            }
+        }
+
+        public byte PayloadLength
+        {
+            get
+            {
+                return _payloadLength;
+            }
+        }
+
+        public Rsv Rsv1
+        {
+            get
+            {
+                return _rsv1;
+            }
+        }
+
+        public Rsv Rsv2
+        {
+            get
+            {
+                return _rsv2;
+            }
+        }
+
+        public Rsv Rsv3
+        {
+            get
+            {
+                return _rsv3;
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private byte[] createMaskingKey()
+        {
+            var key = new byte[4];
+            var rand = new Random();
+            rand.NextBytes(key);
+
+            return key;
+        }
+
+        private static bool isControl(Opcode opcode)
+        {
+            return opcode == Opcode.Close || opcode == Opcode.Ping || opcode == Opcode.Pong;
+        }
+
+        private static bool isData(Opcode opcode)
+        {
+            return opcode == Opcode.Text || opcode == Opcode.Binary;
+        }
+
+        private static WebSocketFrame read(byte[] header, Stream stream, bool unmask)
+        {
+            /* Header */
+
+            // FIN
+            var fin = (header[0] & 0x80) == 0x80 ? Fin.Final : Fin.More;
+            // RSV1
+            var rsv1 = (header[0] & 0x40) == 0x40 ? Rsv.On : Rsv.Off;
+            // RSV2
+            var rsv2 = (header[0] & 0x20) == 0x20 ? Rsv.On : Rsv.Off;
+            // RSV3
+            var rsv3 = (header[0] & 0x10) == 0x10 ? Rsv.On : Rsv.Off;
+            // Opcode
+            var opcode = (Opcode)(header[0] & 0x0f);
+            // MASK
+            var mask = (header[1] & 0x80) == 0x80 ? Mask.Mask : Mask.Unmask;
+            // Payload Length
+            var payloadLen = (byte)(header[1] & 0x7f);
+
+            // Check if correct frame.
+            var incorrect = isControl(opcode) && fin == Fin.More
+                            ? "A control frame is fragmented."
+                            : !isData(opcode) && rsv1 == Rsv.On
+                              ? "A non data frame is compressed."
+                              : null;
+
+            if (incorrect != null)
+                throw new WebSocketException(CloseStatusCode.IncorrectData, incorrect);
+
+            // Check if consistent frame.
+            if (isControl(opcode) && payloadLen > 125)
+                throw new WebSocketException(
+                  CloseStatusCode.InconsistentData,
+                  "The length of payload data of a control frame is greater than 125 bytes.");
+
+            var frame = new WebSocketFrame();
+            frame._fin = fin;
+            frame._rsv1 = rsv1;
+            frame._rsv2 = rsv2;
+            frame._rsv3 = rsv3;
+            frame._opcode = opcode;
+            frame._mask = mask;
+            frame._payloadLength = payloadLen;
+
+            /* Extended Payload Length */
+
+            var size = payloadLen < 126
+                       ? 0
+                       : payloadLen == 126
+                         ? 2
+                         : 8;
+
+            var extPayloadLen = size > 0 ? stream.ReadBytes(size) : new byte[0];
+            if (size > 0 && extPayloadLen.Length != size)
+                throw new WebSocketException(
+                  "The 'Extended Payload Length' of a frame cannot be read from the data source.");
+
+            frame._extPayloadLength = extPayloadLen;
+
+            /* Masking Key */
+
+            var masked = mask == Mask.Mask;
+            var maskingKey = masked ? stream.ReadBytes(4) : new byte[0];
+            if (masked && maskingKey.Length != 4)
+                throw new WebSocketException(
+                  "The 'Masking Key' of a frame cannot be read from the data source.");
+
+            frame._maskingKey = maskingKey;
+
+            /* Payload Data */
+
+            ulong len = payloadLen < 126
+                        ? payloadLen
+                        : payloadLen == 126
+                          ? extPayloadLen.ToUInt16(ByteOrder.Big)
+                          : extPayloadLen.ToUInt64(ByteOrder.Big);
+
+            byte[] data = null;
+            if (len > 0)
+            {
+                // Check if allowable payload data length.
+                if (payloadLen > 126 && len > PayloadData.MaxLength)
+                    throw new WebSocketException(
+                      CloseStatusCode.TooBig,
+                      "The length of 'Payload Data' of a frame is greater than the allowable length.");
+
+                data = payloadLen > 126
+                       ? stream.ReadBytes((long)len, 1024)
+                       : stream.ReadBytes((int)len);
+
+                //if (data.LongLength != (long)len)
+                //    throw new WebSocketException(
+                //      "The 'Payload Data' of a frame cannot be read from the data source.");
+            }
+            else
+            {
+                data = new byte[0];
+            }
+
+            var payload = new PayloadData(data, masked);
+            if (masked && unmask)
+            {
+                payload.Mask(maskingKey);
+                frame._mask = Mask.Unmask;
+                frame._maskingKey = new byte[0];
+            }
+
+            frame._payloadData = payload;
+            return frame;
+        }
+
+        #endregion
+
+        #region Internal Methods
+
+        internal static WebSocketFrame CreateCloseFrame(Mask mask, byte[] data)
+        {
+            return new WebSocketFrame(Opcode.Close, mask, new PayloadData(data));
+        }
+
+        internal static WebSocketFrame CreateCloseFrame(Mask mask, PayloadData payload)
+        {
+            return new WebSocketFrame(Opcode.Close, mask, payload);
+        }
+
+        internal static WebSocketFrame CreateCloseFrame(Mask mask, CloseStatusCode code, string reason)
+        {
+            return new WebSocketFrame(
+              Opcode.Close, mask, new PayloadData(((ushort)code).Append(reason)));
+        }
+
+        internal static WebSocketFrame CreatePingFrame(Mask mask)
+        {
+            return new WebSocketFrame(Opcode.Ping, mask, new PayloadData());
+        }
+
+        internal static WebSocketFrame CreatePingFrame(Mask mask, byte[] data)
+        {
+            return new WebSocketFrame(Opcode.Ping, mask, new PayloadData(data));
+        }
+
+        internal static WebSocketFrame CreatePongFrame(Mask mask, PayloadData payload)
+        {
+            return new WebSocketFrame(Opcode.Pong, mask, payload);
+        }
+
+        internal static WebSocketFrame CreateWebSocketFrame(
+          Fin fin, Opcode opcode, Mask mask, byte[] data, bool compressed)
+        {
+            return new WebSocketFrame(fin, opcode, mask, new PayloadData(data), compressed);
+        }
+
+        internal static WebSocketFrame Read(Stream stream)
+        {
+            return Read(stream, true);
+        }
+
+        internal static WebSocketFrame Read(Stream stream, bool unmask)
+        {
+            var header = stream.ReadBytes(2);
+            if (header.Length != 2)
+                throw new WebSocketException(
+                  "The header part of a frame cannot be read from the data source.");
+
+            return read(header, stream, unmask);
+        }
+
+        internal static async void ReadAsync(
+          Stream stream, bool unmask, Action<WebSocketFrame> completed, Action<Exception> error)
+        {
+            try
+            {
+                var header = await stream.ReadBytesAsync(2).ConfigureAwait(false);
+                if (header.Length != 2)
+                    throw new WebSocketException(
+                      "The header part of a frame cannot be read from the data source.");
+
+                var frame = read(header, stream, unmask);
+                if (completed != null)
+                    completed(frame);
+            }
+            catch (Exception ex)
+            {
+                if (error != null)
+                {
+                    error(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        public IEnumerator<byte> GetEnumerator()
+        {
+            foreach (var b in ToByteArray())
+                yield return b;
+        }
+
+        public void Print(bool dumped)
+        {
+            //Console.WriteLine(dumped ? dump(this) : print(this));
+        }
+
+        public byte[] ToByteArray()
+        {
+            using (var buff = new MemoryStream())
+            {
+                var header = (int)_fin;
+                header = (header << 1) + (int)_rsv1;
+                header = (header << 1) + (int)_rsv2;
+                header = (header << 1) + (int)_rsv3;
+                header = (header << 4) + (int)_opcode;
+                header = (header << 1) + (int)_mask;
+                header = (header << 7) + (int)_payloadLength;
+                buff.Write(((ushort)header).ToByteArrayInternally(ByteOrder.Big), 0, 2);
+
+                if (_payloadLength > 125)
+                    buff.Write(_extPayloadLength, 0, _extPayloadLength.Length);
+
+                if (_mask == Mask.Mask)
+                    buff.Write(_maskingKey, 0, _maskingKey.Length);
+
+                if (_payloadLength > 0)
+                {
+                    var payload = _payloadData.ToByteArray();
+                    if (_payloadLength < 127)
+                        buff.Write(payload, 0, payload.Length);
+                    else
+                        buff.WriteBytes(payload);
+                }
+
+                return buff.ToArray();
+            }
+        }
+
+        public override string ToString()
+        {
+            return BitConverter.ToString(ToByteArray());
+        }
+
+        #endregion
+
+        #region Explicitly Implemented Interface Members
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/WebSocketState.cs b/SocketHttpListener.Portable/WebSocketState.cs
new file mode 100644
index 000000000..73b3a49dd
--- /dev/null
+++ b/SocketHttpListener.Portable/WebSocketState.cs
@@ -0,0 +1,35 @@
+namespace SocketHttpListener
+{
+  /// <summary>
+  /// Contains the values of the state of the WebSocket connection.
+  /// </summary>
+  /// <remarks>
+  /// The values of the state are defined in
+  /// <see href="http://www.w3.org/TR/websockets/#dom-websocket-readystate">The WebSocket
+  /// API</see>.
+  /// </remarks>
+  public enum WebSocketState : ushort
+  {
+    /// <summary>
+    /// Equivalent to numeric value 0.
+    /// Indicates that the connection has not yet been established.
+    /// </summary>
+    Connecting = 0,
+    /// <summary>
+    /// Equivalent to numeric value 1.
+    /// Indicates that the connection is established and the communication is possible.
+    /// </summary>
+    Open = 1,
+    /// <summary>
+    /// Equivalent to numeric value 2.
+    /// Indicates that the connection is going through the closing handshake or
+    /// the <c>WebSocket.Close</c> method has been invoked.
+    /// </summary>
+    Closing = 2,
+    /// <summary>
+    /// Equivalent to numeric value 3.
+    /// Indicates that the connection has been closed or couldn't be opened.
+    /// </summary>
+    Closed = 3
+  }
+}
diff --git a/SocketHttpListener.Portable/packages.config b/SocketHttpListener.Portable/packages.config
new file mode 100644
index 000000000..2aae715b5
--- /dev/null
+++ b/SocketHttpListener.Portable/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MediaBrowser.Common" version="3.0.689" targetFramework="portable45-net45+win8" />
+  <package id="Patterns.Logging" version="1.0.0.6" targetFramework="portable45-net45+win8" />
+</packages>
\ No newline at end of file
diff --git a/SocketHttpListener.Portable/project.json b/SocketHttpListener.Portable/project.json
new file mode 100644
index 000000000..fbbe9eaf3
--- /dev/null
+++ b/SocketHttpListener.Portable/project.json
@@ -0,0 +1,17 @@
+{
+    "frameworks":{
+        "netstandard1.6":{
+           "dependencies":{
+                "NETStandard.Library":"1.6.0",
+            }
+        },
+        ".NETPortable,Version=v4.5,Profile=Profile7":{
+            "buildOptions": {
+                "define": [  ]
+            },
+            "frameworkAssemblies":{
+                
+            }
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From c035f2baa1f3537d298a6559d15bd7ca40188e5d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Nov 2016 01:58:50 -0500
Subject: update responses

---
 Emby.Server.Core/ApplicationHost.cs                |   8 +-
 .../HttpServer/HttpListenerHost.cs                 |  17 +-
 .../HttpServer/HttpResultFactory.cs                |  91 ++++------
 .../SocketSharp/WebSocketSharpResponse.cs          |   7 -
 .../HttpServer/StreamWriter.cs                     |  12 +-
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   1 +
 .../Playback/StaticRemoteStreamWriter.cs           |  12 +-
 MediaBrowser.Api/TestService.cs                    |  77 ++++++++
 MediaBrowser.Model/Services/IHttpResult.cs         |   5 -
 MediaBrowser.Model/Services/IRequest.cs            |  16 --
 ServiceStack/Host/ContentTypes.cs                  |  20 +--
 ServiceStack/Host/HttpResponseStreamWrapper.cs     |  95 ----------
 ServiceStack/Host/ServiceController.cs             |   3 -
 ServiceStack/HttpResponseExtensionsInternal.cs     |  90 ++--------
 ServiceStack/HttpResult.cs                         | 193 +--------------------
 ServiceStack/ServiceStack.csproj                   |   1 -
 .../Net/EndPointListener.cs                        |   3 +-
 SocketHttpListener.Portable/Net/HttpConnection.cs  |  10 +-
 SocketHttpListener.Portable/Net/HttpListener.cs    |  11 --
 .../Net/HttpListenerContext.cs                     |   1 -
 SocketHttpListener.Portable/Net/ResponseStream.cs  |  37 +---
 21 files changed, 174 insertions(+), 536 deletions(-)
 create mode 100644 MediaBrowser.Api/TestService.cs
 delete mode 100644 ServiceStack/Host/HttpResponseStreamWrapper.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 9e0aee325..0c0ef894e 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -554,7 +554,7 @@ namespace Emby.Server.Core
             ZipClient = new ZipClient(FileSystemManager);
             RegisterSingleInstance(ZipClient);
 
-            RegisterSingleInstance<IHttpResultFactory>(new HttpResultFactory(LogManager, FileSystemManager, JsonSerializer, XmlSerializer));
+            RegisterSingleInstance<IHttpResultFactory>(new HttpResultFactory(LogManager, FileSystemManager, JsonSerializer, MemoryStreamFactory));
 
             RegisterSingleInstance<IServerApplicationHost>(this);
             RegisterSingleInstance<IServerApplicationPaths>(ApplicationPaths);
@@ -614,6 +614,9 @@ namespace Emby.Server.Core
 
             RegisterSingleInstance<ISearchEngine>(() => new SearchEngine(LogManager, LibraryManager, UserManager));
 
+            CertificatePath = GetCertificatePath(true);
+            Certificate = GetCertificate(CertificatePath);
+
             HttpServer = HttpServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamFactory, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer, EnvironmentInfo, Certificate);
             HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading");
             RegisterSingleInstance(HttpServer, false);
@@ -995,9 +998,6 @@ namespace Emby.Server.Core
         /// </summary>
         private void StartServer()
         {
-            CertificatePath = GetCertificatePath(true);
-            Certificate = GetCertificate(CertificatePath);
-
             try
             {
                 ServerManager.Start(GetUrlPrefixes());
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 64f498b12..49c664eec 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -86,9 +86,7 @@ namespace Emby.Server.Implementations.HttpServer
 
         public string GlobalResponse { get; set; }
 
-        public override void Configure()
-        {
-            var mapExceptionToStatusCode = new Dictionary<Type, int>
+        readonly Dictionary<Type, int> _mapExceptionToStatusCode = new Dictionary<Type, int>
             {
                 {typeof (InvalidOperationException), 500},
                 {typeof (NotImplementedException), 500},
@@ -102,6 +100,8 @@ namespace Emby.Server.Implementations.HttpServer
                 {typeof (NotSupportedException), 500}
             };
 
+        public override void Configure()
+        {
             var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
             foreach (var filter in requestFilters)
             {
@@ -240,7 +240,12 @@ namespace Emby.Server.Implementations.HttpServer
                     return;
                 }
 
-                httpRes.StatusCode = 500;
+                int statusCode;
+                if (!_mapExceptionToStatusCode.TryGetValue(ex.GetType(), out statusCode))
+                {
+                    statusCode = 500;
+                }
+                httpRes.StatusCode = statusCode;
 
                 httpRes.ContentType = "text/html";
                 httpRes.Write(ex.Message);
@@ -518,6 +523,10 @@ namespace Emby.Server.Implementations.HttpServer
                 {
                     await handler.ProcessRequestAsync(httpReq, httpRes, operationName).ConfigureAwait(false);
                 }
+                else
+                {
+                    ErrorHandler(new FileNotFoundException(), httpReq);
+                }
             }
             catch (Exception ex)
             {
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index bbd556661..f65331ec7 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -34,19 +34,16 @@ namespace Emby.Server.Implementations.HttpServer
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
         private readonly IJsonSerializer _jsonSerializer;
-        private readonly IXmlSerializer _xmlSerializer;
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpResultFactory" /> class.
         /// </summary>
-        /// <param name="logManager">The log manager.</param>
-        /// <param name="fileSystem">The file system.</param>
-        /// <param name="jsonSerializer">The json serializer.</param>
-        public HttpResultFactory(ILogManager logManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer)
+        public HttpResultFactory(ILogManager logManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer, IMemoryStreamFactory memoryStreamFactory)
         {
             _fileSystem = fileSystem;
             _jsonSerializer = jsonSerializer;
-            _xmlSerializer = xmlSerializer;
+            _memoryStreamFactory = memoryStreamFactory;
             _logger = logManager.GetLogger("HttpResultFactory");
         }
 
@@ -59,17 +56,13 @@ namespace Emby.Server.Implementations.HttpServer
         /// <returns>System.Object.</returns>
         public object GetResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
         {
-            return GetHttpResult(content, contentType, responseHeaders);
+            return GetHttpResult(content, contentType, true, responseHeaders);
         }
 
         /// <summary>
         /// Gets the HTTP result.
         /// </summary>
-        /// <param name="content">The content.</param>
-        /// <param name="contentType">Type of the content.</param>
-        /// <param name="responseHeaders">The response headers.</param>
-        /// <returns>IHasHeaders.</returns>
-        private IHasHeaders GetHttpResult(object content, string contentType, IDictionary<string, string> responseHeaders = null)
+        private IHasHeaders GetHttpResult(object content, string contentType, bool addCachePrevention, IDictionary<string, string> responseHeaders = null)
         {
             IHasHeaders result;
 
@@ -98,7 +91,7 @@ namespace Emby.Server.Implementations.HttpServer
                     }
                     else
                     {
-                        result = new HttpResult(content, contentType);
+                        result = new HttpResult(content, contentType, HttpStatusCode.OK);
                     }
                 }
             }
@@ -107,7 +100,11 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            responseHeaders["Expires"] = "-1";
+            if (addCachePrevention)
+            {
+                responseHeaders["Expires"] = "-1";
+            }
+
             AddResponseHeaders(result, responseHeaders);
 
             return result;
@@ -184,8 +181,6 @@ namespace Emby.Server.Implementations.HttpServer
         /// <returns></returns>
         public object ToOptimizedResult<T>(IRequest request, T dto)
         {
-            request.Response.Dto = dto;
-
             var compressionType = GetCompressionType(request);
             if (compressionType == null)
             {
@@ -204,6 +199,7 @@ namespace Emby.Server.Implementations.HttpServer
                 }
             }
 
+            // Do not use the memoryStreamFactory here, they don't place nice with compression
             using (var ms = new MemoryStream())
             {
                 using (var compressionStream = GetCompressionStream(ms, compressionType))
@@ -213,12 +209,9 @@ namespace Emby.Server.Implementations.HttpServer
 
                     var compressedBytes = ms.ToArray();
 
-                    var httpResult = new HttpResult(compressedBytes, request.ResponseContentType)
-                    {
-                        Status = request.Response.StatusCode
-                    };
+                    var httpResult = new StreamWriter(compressedBytes, request.ResponseContentType, _logger);
 
-                    httpResult.Headers["Content-Length"] = compressedBytes.Length.ToString(UsCulture);
+                    //httpResult.Headers["Content-Length"] = compressedBytes.Length.ToString(UsCulture);
                     httpResult.Headers["Content-Encoding"] = compressionType;
 
                     return httpResult;
@@ -226,6 +219,16 @@ namespace Emby.Server.Implementations.HttpServer
             }
         }
 
+        private static Stream GetCompressionStream(Stream outputStream, string compressionType)
+        {
+            if (compressionType == "deflate")
+                return new DeflateStream(outputStream, CompressionMode.Compress, true);
+            if (compressionType == "gzip")
+                return new GZipStream(outputStream, CompressionMode.Compress, true);
+
+            throw new NotSupportedException(compressionType);
+        }
+
         public static string GetRealContentType(string contentType)
         {
             return contentType == null
@@ -233,7 +236,7 @@ namespace Emby.Server.Implementations.HttpServer
                        : contentType.Split(';')[0].ToLower().Trim();
         }
 
-        public static string SerializeToXmlString(object from)
+        private string SerializeToXmlString(object from)
         {
             using (var ms = new MemoryStream())
             {
@@ -253,16 +256,6 @@ namespace Emby.Server.Implementations.HttpServer
             }
         }
 
-        private static Stream GetCompressionStream(Stream outputStream, string compressionType)
-        {
-            if (compressionType == "deflate")
-                return new DeflateStream(outputStream, CompressionMode.Compress);
-            if (compressionType == "gzip")
-                return new GZipStream(outputStream, CompressionMode.Compress);
-
-            throw new NotSupportedException(compressionType);
-        }
-
         /// <summary>
         /// Gets the optimized result using cache.
         /// </summary>
@@ -358,23 +351,7 @@ namespace Emby.Server.Implementations.HttpServer
                 return hasHeaders;
             }
 
-            IHasHeaders httpResult;
-
-            var stream = result as Stream;
-
-            if (stream != null)
-            {
-                httpResult = new StreamWriter(stream, contentType, _logger);
-            }
-            else
-            {
-                // Otherwise wrap into an HttpResult
-                httpResult = new HttpResult(result, contentType ?? "text/html", HttpStatusCode.NotModified);
-            }
-
-            AddResponseHeaders(httpResult, responseHeaders);
-
-            return httpResult;
+            return GetHttpResult(result, contentType, false, responseHeaders);
         }
 
         /// <summary>
@@ -603,7 +580,7 @@ namespace Emby.Server.Implementations.HttpServer
                 {
                     stream.Dispose();
 
-                    return GetHttpResult(new byte[] { }, contentType);
+                    return GetHttpResult(new byte[] { }, contentType, true);
                 }
 
                 return new StreamWriter(stream, contentType, _logger)
@@ -630,13 +607,13 @@ namespace Emby.Server.Implementations.HttpServer
 
             if (isHeadRequest)
             {
-                return GetHttpResult(new byte[] { }, contentType);
+                return GetHttpResult(new byte[] { }, contentType, true);
             }
 
-            return GetHttpResult(contents, contentType, responseHeaders);
+            return GetHttpResult(contents, contentType, true, responseHeaders);
         }
 
-        public static byte[] Compress(string text, string compressionType)
+        private byte[] Compress(string text, string compressionType)
         {
             if (compressionType == "deflate")
                 return Deflate(text);
@@ -647,12 +624,12 @@ namespace Emby.Server.Implementations.HttpServer
             throw new NotSupportedException(compressionType);
         }
 
-        public static byte[] Deflate(string text)
+        private byte[] Deflate(string text)
         {
             return Deflate(Encoding.UTF8.GetBytes(text));
         }
 
-        public static byte[] Deflate(byte[] bytes)
+        private byte[] Deflate(byte[] bytes)
         {
             // In .NET FX incompat-ville, you can't access compressed bytes without closing DeflateStream
             // Which means we must use MemoryStream since you have to use ToArray() on a closed Stream
@@ -666,12 +643,12 @@ namespace Emby.Server.Implementations.HttpServer
             }
         }
 
-        public static byte[] GZip(string text)
+        private byte[] GZip(string text)
         {
             return GZip(Encoding.UTF8.GetBytes(text));
         }
 
-        public static byte[] GZip(byte[] buffer)
+        private byte[] GZip(byte[] buffer)
         {
             using (var ms = new MemoryStream())
             using (var zipStream = new GZipStream(ms, CompressionMode.Compress))
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
index de0b33fe3..9de86e9cc 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
@@ -77,8 +77,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             get { return _response.OutputStream; }
         }
 
-        public object Dto { get; set; }
-
         public void Write(string text)
         {
             var bOutput = System.Text.Encoding.UTF8.GetBytes(text);
@@ -120,11 +118,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             }
         }
 
-        public void End()
-        {
-            Close();
-        }
-
         public void Flush()
         {
             _response.OutputStream.Flush();
diff --git a/Emby.Server.Implementations/HttpServer/StreamWriter.cs b/Emby.Server.Implementations/HttpServer/StreamWriter.cs
index 15488abaa..33378949c 100644
--- a/Emby.Server.Implementations/HttpServer/StreamWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/StreamWriter.cs
@@ -25,6 +25,8 @@ namespace Emby.Server.Implementations.HttpServer
         /// <value>The source stream.</value>
         private Stream SourceStream { get; set; }
 
+        private byte[] SourceBytes { get; set; }
+
         /// <summary>
         /// The _options
         /// </summary>
@@ -40,7 +42,6 @@ namespace Emby.Server.Implementations.HttpServer
 
         public Action OnComplete { get; set; }
         public Action OnError { get; set; }
-        private readonly byte[] _bytes;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamWriter" /> class.
@@ -73,14 +74,13 @@ namespace Emby.Server.Implementations.HttpServer
         /// <param name="contentType">Type of the content.</param>
         /// <param name="logger">The logger.</param>
         public StreamWriter(byte[] source, string contentType, ILogger logger)
-            : this(new MemoryStream(source), contentType, logger)
         {
             if (string.IsNullOrEmpty(contentType))
             {
                 throw new ArgumentNullException("contentType");
             }
 
-            _bytes = source;
+            SourceBytes = source;
             Logger = logger;
 
             Headers["Content-Type"] = contentType;
@@ -92,9 +92,11 @@ namespace Emby.Server.Implementations.HttpServer
         {
             try
             {
-                if (_bytes != null)
+                var bytes = SourceBytes;
+
+                if (bytes != null)
                 {
-                    await responseStream.WriteAsync(_bytes, 0, _bytes.Length);
+                    await responseStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 }
                 else
                 {
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index df491ce85..c1a7347b5 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -142,6 +142,7 @@
     <Compile Include="System\ActivityLogWebSocketListener.cs" />
     <Compile Include="System\SystemService.cs" />
     <Compile Include="Movies\TrailersService.cs" />
+    <Compile Include="TestService.cs" />
     <Compile Include="TvShowsService.cs" />
     <Compile Include="UserLibrary\ArtistsService.cs" />
     <Compile Include="UserLibrary\BaseItemsByNameService.cs" />
diff --git a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
index c4a25a926..6bb3b6b80 100644
--- a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
+++ b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
@@ -1,6 +1,8 @@
 using MediaBrowser.Common.Net;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Playback
@@ -8,7 +10,7 @@ namespace MediaBrowser.Api.Playback
     /// <summary>
     /// Class StaticRemoteStreamWriter
     /// </summary>
-    public class StaticRemoteStreamWriter : IStreamWriter, IHasHeaders
+    public class StaticRemoteStreamWriter : IAsyncStreamWriter, IHasHeaders
     {
         /// <summary>
         /// The _input stream
@@ -34,15 +36,11 @@ namespace MediaBrowser.Api.Playback
             get { return _options; }
         }
 
-        /// <summary>
-        /// Writes to.
-        /// </summary>
-        /// <param name="responseStream">The response stream.</param>
-        public void WriteTo(Stream responseStream)
+        public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
         {
             using (_response)
             {
-                _response.Content.CopyTo(responseStream, 819200);
+                await _response.Content.CopyToAsync(responseStream, 81920, cancellationToken).ConfigureAwait(false);
             }
         }
     }
diff --git a/MediaBrowser.Api/TestService.cs b/MediaBrowser.Api/TestService.cs
new file mode 100644
index 000000000..5340b816c
--- /dev/null
+++ b/MediaBrowser.Api/TestService.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Services;
+
+namespace MediaBrowser.Api
+{
+    [Route("/Test/String", "GET")]
+    public class GetString
+    {
+    }
+
+    [Route("/Test/OptimizedString", "GET")]
+    public class GetOptimizedString
+    {
+    }
+
+    [Route("/Test/Bytes", "GET")]
+    public class GetBytes
+    {
+    }
+
+    [Route("/Test/OptimizedBytes", "GET")]
+    public class GetOptimizedBytes
+    {
+    }
+
+    [Route("/Test/Stream", "GET")]
+    public class GetStream
+    {
+    }
+
+    [Route("/Test/OptimizedStream", "GET")]
+    public class GetOptimizedStream
+    {
+    }
+
+    [Route("/Test/BytesWithContentType", "GET")]
+    public class GetBytesWithContentType
+    {
+    }
+
+    public class TestService : BaseApiService
+    {
+        public object Get(GetString request)
+        {
+            return "Welcome to Emby!";
+        }
+        public object Get(GetOptimizedString request)
+        {
+            return ToOptimizedResult("Welcome to Emby!");
+        }
+        public object Get(GetBytes request)
+        {
+            return Encoding.UTF8.GetBytes("Welcome to Emby!");
+        }
+        public object Get(GetOptimizedBytes request)
+        {
+            return ToOptimizedResult(Encoding.UTF8.GetBytes("Welcome to Emby!"));
+        }
+        public object Get(GetBytesWithContentType request)
+        {
+            return ApiEntryPoint.Instance.ResultFactory.GetResult(Encoding.UTF8.GetBytes("Welcome to Emby!"), "text/html");
+        }
+        public object Get(GetStream request)
+        {
+            return new MemoryStream(Encoding.UTF8.GetBytes("Welcome to Emby!"));
+        }
+        public object Get(GetOptimizedStream request)
+        {
+            return ToOptimizedResult(new MemoryStream(Encoding.UTF8.GetBytes("Welcome to Emby!")));
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
index 36ffeb284..fcb137c6b 100644
--- a/MediaBrowser.Model/Services/IHttpResult.cs
+++ b/MediaBrowser.Model/Services/IHttpResult.cs
@@ -19,11 +19,6 @@ namespace MediaBrowser.Model.Services
         /// </summary>
         HttpStatusCode StatusCode { get; set; }
 
-        /// <summary>
-        /// The HTTP Status Description
-        /// </summary>
-        string StatusDescription { get; set; }
-
         /// <summary>
         /// The HTTP Response ContentType
         /// </summary>
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 5a4d24007..455a69d37 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -136,34 +136,18 @@ namespace MediaBrowser.Model.Services
 
         Stream OutputStream { get; }
 
-        /// <summary>
-        /// The Response DTO
-        /// </summary>
-        object Dto { get; set; }
-
         /// <summary>
         /// Write once to the Response Stream then close it. 
         /// </summary>
         /// <param name="text"></param>
         void Write(string text);
 
-        /// <summary>
-        /// Buffer the Response OutputStream so it can be written in 1 batch
-        /// </summary>
-        bool UseBufferedStream { get; set; }
-
         /// <summary>
         /// Signal that this response has been handled and no more processing should be done.
         /// When used in a request or response filter, no more filters or processing is done on this request.
         /// </summary>
         void Close();
 
-        /// <summary>
-        /// Calls Response.End() on ASP.NET HttpResponse otherwise is an alias for Close().
-        /// Useful when you want to prevent ASP.NET to provide it's own custom error page.
-        /// </summary>
-        void End();
-
         /// <summary>
         /// Response.Flush() and OutputStream.Flush() seem to have different behaviour in ASP.NET
         /// </summary>
diff --git a/ServiceStack/Host/ContentTypes.cs b/ServiceStack/Host/ContentTypes.cs
index 22fdc3e50..58ba29801 100644
--- a/ServiceStack/Host/ContentTypes.cs
+++ b/ServiceStack/Host/ContentTypes.cs
@@ -13,37 +13,31 @@ namespace ServiceStack.Host
         public void SerializeToStream(IRequest req, object response, Stream responseStream)
         {
             var contentType = req.ResponseContentType;
-            var serializer = GetResponseSerializer(contentType);
-            if (serializer == null)
-                throw new NotSupportedException("ContentType not supported: " + contentType);
+            var serializer = GetStreamSerializer(contentType);
 
-            var httpRes = new HttpResponseStreamWrapper(responseStream, req)
-            {
-                Dto = req.Response.Dto
-            };
-            serializer(req, response, httpRes);
+            serializer(response, responseStream);
         }
 
-        public Action<IRequest, object, IResponse> GetResponseSerializer(string contentType)
+        public Action<object, IResponse> GetResponseSerializer(string contentType)
         {
             var serializer = GetStreamSerializer(contentType);
             if (serializer == null) return null;
 
-            return (httpReq, dto, httpRes) => serializer(httpReq, dto, httpRes.OutputStream);
+            return (dto, httpRes) => serializer(dto, httpRes.OutputStream);
         }
 
-        public Action<IRequest, object, Stream> GetStreamSerializer(string contentType)
+        public Action<object, Stream> GetStreamSerializer(string contentType)
         {
             switch (GetRealContentType(contentType))
             {
                 case "application/xml":
                 case "text/xml":
                 case "text/xml; charset=utf-8": //"text/xml; charset=utf-8" also matches xml
-                    return (r, o, s) => ServiceStackHost.Instance.SerializeToXml(o, s);
+                    return (o, s) => ServiceStackHost.Instance.SerializeToXml(o, s);
 
                 case "application/json":
                 case "text/json":
-                    return (r, o, s) => ServiceStackHost.Instance.SerializeToJson(o, s);
+                    return (o, s) => ServiceStackHost.Instance.SerializeToJson(o, s);
             }
 
             return null;
diff --git a/ServiceStack/Host/HttpResponseStreamWrapper.cs b/ServiceStack/Host/HttpResponseStreamWrapper.cs
deleted file mode 100644
index 33038da72..000000000
--- a/ServiceStack/Host/HttpResponseStreamWrapper.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using MediaBrowser.Model.Services;
-
-namespace ServiceStack.Host
-{
-    public class HttpResponseStreamWrapper : IHttpResponse
-    {
-        private static readonly UTF8Encoding UTF8EncodingWithoutBom = new UTF8Encoding(false);
-
-        public HttpResponseStreamWrapper(Stream stream, IRequest request)
-        {
-            this.OutputStream = stream;
-            this.Request = request;
-            this.Headers = new Dictionary<string, string>();
-            this.Items = new Dictionary<string, object>();
-        }
-
-        public Dictionary<string, string> Headers { get; set; }
-
-        public object OriginalResponse
-        {
-            get { return null; }
-        }
-
-        public IRequest Request { get; private set; }
-
-        public int StatusCode { set; get; }
-        public string StatusDescription { set; get; }
-        public string ContentType { get; set; }
-
-        public void AddHeader(string name, string value)
-        {
-            this.Headers[name] = value;
-        }
-
-        public string GetHeader(string name)
-        {
-            return this.Headers[name];
-        }
-
-        public void Redirect(string url)
-        {
-            this.Headers["Location"] = url;
-        }
-
-        public Stream OutputStream { get; private set; }
-
-        public object Dto { get; set; }
-
-        public void Write(string text)
-        {
-            var bytes = UTF8EncodingWithoutBom.GetBytes(text);
-            OutputStream.Write(bytes, 0, bytes.Length);
-        }
-
-        public bool UseBufferedStream { get; set; }
-
-        public void Close()
-        {
-            if (IsClosed) return;
-
-            OutputStream.Dispose();
-            IsClosed = true;
-        }
-
-        public void End()
-        {
-            Close();
-        }
-
-        public void Flush()
-        {
-            OutputStream.Flush();
-        }
-
-        public bool IsClosed { get; private set; }
-
-        public void SetContentLength(long contentLength) {}
-
-        public bool KeepAlive { get; set; }
-
-        public Dictionary<string, object> Items { get; private set; }
-
-        public void SetCookie(Cookie cookie)
-        {
-        }
-
-        public void ClearCookies()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/ServiceStack/Host/ServiceController.cs b/ServiceStack/Host/ServiceController.cs
index 703f06365..7eb1253b3 100644
--- a/ServiceStack/Host/ServiceController.cs
+++ b/ServiceStack/Host/ServiceController.cs
@@ -210,9 +210,6 @@ namespace ServiceStack.Host
             //Executes the service and returns the result
             var response = await ServiceExecGeneral.Execute(serviceType, req, service, requestDto, requestType.GetOperationName()).ConfigureAwait(false);
 
-            if (req.Response.Dto == null)
-                req.Response.Dto = response;
-
             return response;
         }
     }
diff --git a/ServiceStack/HttpResponseExtensionsInternal.cs b/ServiceStack/HttpResponseExtensionsInternal.cs
index 1195f63ca..88b82bdf6 100644
--- a/ServiceStack/HttpResponseExtensionsInternal.cs
+++ b/ServiceStack/HttpResponseExtensionsInternal.cs
@@ -33,8 +33,11 @@ namespace ServiceStack
             var stream = result as Stream;
             if (stream != null)
             {
-                WriteTo(stream, response.OutputStream);
-                return true;
+                using (stream)
+                {
+                    await stream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
+                    return true;
+                }
             }
 
             var bytes = result as byte[];
@@ -43,35 +46,13 @@ namespace ServiceStack
                 response.ContentType = "application/octet-stream";
                 response.SetContentLength(bytes.Length);
 
-                response.OutputStream.Write(bytes, 0, bytes.Length);
+                await response.OutputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return true;
             }
 
             return false;
         }
 
-        public static long WriteTo(Stream inStream, Stream outStream)
-        {
-            var memoryStream = inStream as MemoryStream;
-            if (memoryStream != null)
-            {
-                memoryStream.WriteTo(outStream);
-                return memoryStream.Position;
-            }
-
-            var data = new byte[4096];
-            long total = 0;
-            int bytesRead;
-
-            while ((bytesRead = inStream.Read(data, 0, data.Length)) > 0)
-            {
-                outStream.Write(data, 0, bytesRead);
-                total += bytesRead;
-            }
-
-            return total;
-        }
-
         /// <summary>
         /// End a ServiceStack Request with no content
         /// </summary>
@@ -85,7 +66,7 @@ namespace ServiceStack
             httpRes.SetContentLength(0);
         }
 
-        public static Task WriteToResponse(this IResponse httpRes, MediaBrowser.Model.Services.IRequest httpReq, object result)
+        public static Task WriteToResponse(this IResponse httpRes, IRequest httpReq, object result)
         {
             if (result == null)
             {
@@ -98,19 +79,10 @@ namespace ServiceStack
             {
                 httpResult.RequestContext = httpReq;
                 httpReq.ResponseContentType = httpResult.ContentType ?? httpReq.ResponseContentType;
-                var httpResSerializer = ContentTypes.Instance.GetResponseSerializer(httpReq.ResponseContentType);
-                return httpRes.WriteToResponse(httpResult, httpResSerializer, httpReq);
+                return httpRes.WriteToResponseInternal(httpResult, httpReq);
             }
 
-            var serializer = ContentTypes.Instance.GetResponseSerializer(httpReq.ResponseContentType);
-            return httpRes.WriteToResponse(result, serializer, httpReq);
-        }
-
-        private static object GetDto(object response)
-        {
-            if (response == null) return null;
-            var httpResult = response as IHttpResult;
-            return httpResult != null ? httpResult.Response : response;
+            return httpRes.WriteToResponseInternal(result, httpReq);
         }
 
         /// <summary>
@@ -119,17 +91,11 @@ namespace ServiceStack
         /// </summary>
         /// <param name="response">The response.</param>
         /// <param name="result">Whether or not it was implicity handled by ServiceStack's built-in handlers.</param>
-        /// <param name="defaultAction">The default action.</param>
         /// <param name="request">The serialization context.</param>
         /// <returns></returns>
-        public static async Task WriteToResponse(this IResponse response, object result, Action<IRequest, object, IResponse> defaultAction, MediaBrowser.Model.Services.IRequest request)
+        private static async Task WriteToResponseInternal(this IResponse response, object result, IRequest request)
         {
             var defaultContentType = request.ResponseContentType;
-            if (result == null)
-            {
-                response.EndRequestWithNoContent();
-                return;
-            }
 
             var httpResult = result as IHttpResult;
             if (httpResult != null)
@@ -137,10 +103,8 @@ namespace ServiceStack
                 if (httpResult.RequestContext == null)
                     httpResult.RequestContext = request;
 
-                response.Dto = response.Dto ?? GetDto(httpResult);
-
                 response.StatusCode = httpResult.Status;
-                response.StatusDescription = httpResult.StatusDescription ?? httpResult.StatusCode.ToString();
+                response.StatusDescription = httpResult.StatusCode.ToString();
                 if (string.IsNullOrEmpty(httpResult.ContentType))
                 {
                     httpResult.ContentType = defaultContentType;
@@ -159,21 +123,12 @@ namespace ServiceStack
                     }
                 }
             }
-            else
-            {
-                response.Dto = result;
-            }
 
-            /* Mono Error: Exception: Method not found: 'System.Web.HttpResponse.get_Headers' */
             var responseOptions = result as IHasHeaders;
             if (responseOptions != null)
             {
-                //Reserving options with keys in the format 'xx.xxx' (No Http headers contain a '.' so its a safe restriction)
-                const string reservedOptions = ".";
-
                 foreach (var responseHeaders in responseOptions.Headers)
                 {
-                    if (responseHeaders.Key.Contains(reservedOptions)) continue;
                     if (responseHeaders.Key == "Content-Length")
                     {
                         response.SetContentLength(long.Parse(responseHeaders.Value));
@@ -196,42 +151,25 @@ namespace ServiceStack
                 response.ContentType += "; charset=utf-8";
             }
 
-            var disposableResult = result as IDisposable;
             var writeToOutputStreamResult = await WriteToOutputStream(response, result).ConfigureAwait(false);
             if (writeToOutputStreamResult)
             {
                 response.Flush(); //required for Compression
-                if (disposableResult != null) disposableResult.Dispose();
                 return;
             }
 
-            if (httpResult != null)
-                result = httpResult.Response;
-
             var responseText = result as string;
             if (responseText != null)
             {
                 if (response.ContentType == null || response.ContentType == "text/html")
                     response.ContentType = defaultContentType;
-                response.Write(responseText);
 
+                response.Write(responseText);
                 return;
             }
 
-            if (defaultAction == null)
-            {
-                throw new ArgumentNullException("defaultAction", String.Format(
-                    "As result '{0}' is not a supported responseType, a defaultAction must be supplied",
-                    (result != null ? result.GetType().GetOperationName() : "")));
-            }
-
-
-            if (result != null)
-                defaultAction(request, result, response);
-
-            if (disposableResult != null)
-                disposableResult.Dispose();
+            var serializer = ContentTypes.Instance.GetResponseSerializer(defaultContentType);
+            serializer(result, response);
         }
-
     }
 }
diff --git a/ServiceStack/HttpResult.cs b/ServiceStack/HttpResult.cs
index 23a5cdffb..e25002b3e 100644
--- a/ServiceStack/HttpResult.cs
+++ b/ServiceStack/HttpResult.cs
@@ -13,31 +13,7 @@ namespace ServiceStack
     public class HttpResult
         : IHttpResult, IAsyncStreamWriter
     {
-        public HttpResult()
-            : this((object)null, null)
-        {
-        }
-
-        public HttpResult(object response)
-            : this(response, null)
-        {
-        }
-
-        public HttpResult(object response, string contentType)
-            : this(response, contentType, HttpStatusCode.OK)
-        {
-        }
-
-        public HttpResult(HttpStatusCode statusCode, string statusDescription)
-            : this()
-        {
-            StatusCode = statusCode;
-            StatusDescription = statusDescription;
-        }
-
-        public HttpResult(object response, HttpStatusCode statusCode)
-            : this(response, null, statusCode)
-        { }
+        public object Response { get; set; }
 
         public HttpResult(object response, string contentType, HttpStatusCode statusCode)
         {
@@ -49,102 +25,12 @@ namespace ServiceStack
             this.StatusCode = statusCode;
         }
 
-        public HttpResult(Stream responseStream, string contentType)
-            : this(null, contentType, HttpStatusCode.OK)
-        {
-            this.ResponseStream = responseStream;
-        }
-
-        public HttpResult(string responseText, string contentType)
-            : this(null, contentType, HttpStatusCode.OK)
-        {
-            this.ResponseText = responseText;
-        }
-
-        public HttpResult(byte[] responseBytes, string contentType)
-            : this(null, contentType, HttpStatusCode.OK)
-        {
-            this.ResponseStream = new MemoryStream(responseBytes);
-        }
-
-        public string ResponseText { get; private set; }
-
-        public Stream ResponseStream { get; private set; }
-
         public string ContentType { get; set; }
 
         public IDictionary<string, string> Headers { get; private set; }
 
         public List<Cookie> Cookies { get; private set; }
 
-        public string ETag { get; set; }
-
-        public TimeSpan? Age { get; set; }
-
-        public TimeSpan? MaxAge { get; set; }
-
-        public DateTime? Expires { get; set; }
-
-        public DateTime? LastModified { get; set; }
-
-        public Func<IDisposable> ResultScope { get; set; }
-
-        public string Location
-        {
-            set
-            {
-                if (StatusCode == HttpStatusCode.OK)
-                    StatusCode = HttpStatusCode.Redirect;
-
-                this.Headers["Location"] = value;
-            }
-        }
-
-        public void SetPermanentCookie(string name, string value)
-        {
-            SetCookie(name, value, DateTime.UtcNow.AddYears(20), null);
-        }
-
-        public void SetPermanentCookie(string name, string value, string path)
-        {
-            SetCookie(name, value, DateTime.UtcNow.AddYears(20), path);
-        }
-
-        public void SetSessionCookie(string name, string value)
-        {
-            SetSessionCookie(name, value, null);
-        }
-
-        public void SetSessionCookie(string name, string value, string path)
-        {
-            path = path ?? "/";
-            this.Headers["Set-Cookie"] = string.Format("{0}={1};path=" + path, name, value);
-        }
-
-        public void SetCookie(string name, string value, TimeSpan expiresIn, string path)
-        {
-            var expiresAt = DateTime.UtcNow.Add(expiresIn);
-            SetCookie(name, value, expiresAt, path);
-        }
-
-        public void SetCookie(string name, string value, DateTime expiresAt, string path, bool secure = false, bool httpOnly = false)
-        {
-            path = path ?? "/";
-            var cookie = string.Format("{0}={1};expires={2};path={3}", name, value, expiresAt.ToString("R"), path);
-            if (secure)
-                cookie += ";Secure";
-            if (httpOnly)
-                cookie += ";HttpOnly";
-
-            this.Headers["Set-Cookie"] = cookie;
-        }
-
-        public void DeleteCookie(string name)
-        {
-            var cookie = string.Format("{0}=;expires={1};path=/", name, DateTime.UtcNow.AddDays(-1).ToString("R"));
-            this.Headers["Set-Cookie"] = cookie;
-        }
-
         public int Status { get; set; }
 
         public HttpStatusCode StatusCode
@@ -153,75 +39,12 @@ namespace ServiceStack
             set { Status = (int)value; }
         }
 
-        public string StatusDescription { get; set; }
-
-        public object Response { get; set; }
-
-        public MediaBrowser.Model.Services.IRequest RequestContext { get; set; }
-
-        public string View { get; set; }
-
-        public string Template { get; set; }
-
-        public int PaddingLength { get; set; }
+        public IRequest RequestContext { get; set; }
 
         public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
-        {
-            try
-            {
-                await WriteToInternalAsync(responseStream, cancellationToken).ConfigureAwait(false);
-                responseStream.Flush();
-            }
-            finally
-            {
-                DisposeStream();
-            }
-        }
-
-        public static Task WriteTo(Stream inStream, Stream outStream, CancellationToken cancellationToken)
-        {
-            var memoryStream = inStream as MemoryStream;
-            if (memoryStream != null)
-            {
-                memoryStream.WriteTo(outStream);
-                return Task.FromResult(true);
-            }
-
-            return inStream.CopyToAsync(outStream, 81920, cancellationToken);
-        }
-
-        public async Task WriteToInternalAsync(Stream responseStream, CancellationToken cancellationToken)
         {
             var response = RequestContext != null ? RequestContext.Response : null;
 
-            if (this.ResponseStream != null)
-            {
-                if (response != null)
-                {
-                    var ms = ResponseStream as MemoryStream;
-                    if (ms != null)
-                    {
-                        response.SetContentLength(ms.Length);
-
-                        await ms.CopyToAsync(responseStream, 81920, cancellationToken).ConfigureAwait(false);
-                        return;
-                    }
-                }
-
-                await WriteTo(this.ResponseStream, responseStream, cancellationToken).ConfigureAwait(false);
-                return;
-            }
-
-            if (this.ResponseText != null)
-            {
-                var bytes = Encoding.UTF8.GetBytes(this.ResponseText);
-                if (response != null)
-                    response.SetContentLength(bytes.Length);
-
-                await responseStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
-                return;
-            }
-
             var bytesResponse = this.Response as byte[];
             if (bytesResponse != null)
             {
@@ -234,17 +57,5 @@ namespace ServiceStack
 
             ContentTypes.Instance.SerializeToStream(this.RequestContext, this.Response, responseStream);
         }
-
-        private void DisposeStream()
-        {
-            try
-            {
-                if (ResponseStream != null)
-                {
-                    this.ResponseStream.Dispose();
-                }
-            }
-            catch { /*ignore*/ }
-        }
     }
 }
diff --git a/ServiceStack/ServiceStack.csproj b/ServiceStack/ServiceStack.csproj
index 3402339a6..5413d4e55 100644
--- a/ServiceStack/ServiceStack.csproj
+++ b/ServiceStack/ServiceStack.csproj
@@ -73,7 +73,6 @@
     <Compile Include="Host\ContentTypes.cs" />
     <Compile Include="ReflectionExtensions.cs" />
     <Compile Include="StringMapTypeDeserializer.cs" />
-    <Compile Include="Host\HttpResponseStreamWrapper.cs" />
     <Compile Include="HttpResult.cs" />
     <Compile Include="ServiceStackHost.cs" />
     <Compile Include="ServiceStackHost.Runtime.cs" />
diff --git a/SocketHttpListener.Portable/Net/EndPointListener.cs b/SocketHttpListener.Portable/Net/EndPointListener.cs
index b50660ad0..52385e2ba 100644
--- a/SocketHttpListener.Portable/Net/EndPointListener.cs
+++ b/SocketHttpListener.Portable/Net/EndPointListener.cs
@@ -119,7 +119,6 @@ namespace SocketHttpListener.Net
             if (listener == null)
                 return false;
 
-            context.Listener = listener;
             context.Connection.Prefix = prefix;
             return true;
         }
@@ -129,7 +128,7 @@ namespace SocketHttpListener.Net
             if (context == null || context.Request == null)
                 return;
 
-            context.Listener.UnregisterContext(context);
+            listener.UnregisterContext(context);
         }
 
         HttpListener SearchListener(Uri uri, out ListenerPrefix prefix)
diff --git a/SocketHttpListener.Portable/Net/HttpConnection.cs b/SocketHttpListener.Portable/Net/HttpConnection.cs
index d31da4132..db34c4218 100644
--- a/SocketHttpListener.Portable/Net/HttpConnection.cs
+++ b/SocketHttpListener.Portable/Net/HttpConnection.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.IO;
@@ -210,12 +209,7 @@ namespace SocketHttpListener.Net
             // TODO: can we get this stream before reading the input?
             if (o_stream == null)
             {
-                HttpListener listener = context.Listener;
-
-                if (listener == null)
-                    return new ResponseStream(stream, context.Response, true, _memoryStreamFactory, _textEncoding);
-
-                o_stream = new ResponseStream(stream, context.Response, listener.IgnoreWriteExceptions, _memoryStreamFactory, _textEncoding);
+                o_stream = new ResponseStream(stream, context.Response, _memoryStreamFactory, _textEncoding);
             }
             return o_stream;
         }
@@ -257,7 +251,7 @@ namespace SocketHttpListener.Net
                     Close(true);
                     return;
                 }
-                HttpListener listener = context.Listener;
+                HttpListener listener = epl.Listener;
                 if (last_listener != listener)
                 {
                     RemoveConnection();
diff --git a/SocketHttpListener.Portable/Net/HttpListener.cs b/SocketHttpListener.Portable/Net/HttpListener.cs
index 83660100a..2b0f75d01 100644
--- a/SocketHttpListener.Portable/Net/HttpListener.cs
+++ b/SocketHttpListener.Portable/Net/HttpListener.cs
@@ -28,7 +28,6 @@ namespace SocketHttpListener.Net
         HttpListenerPrefixCollection prefixes;
         AuthenticationSchemeSelector auth_selector;
         string realm;
-        bool ignore_write_exceptions;
         bool unsafe_ntlm_auth;
         bool listening;
         bool disposed;
@@ -92,16 +91,6 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public bool IgnoreWriteExceptions
-        {
-            get { return ignore_write_exceptions; }
-            set
-            {
-                CheckDisposed();
-                ignore_write_exceptions = value;
-            }
-        }
-
         public bool IsListening
         {
             get { return listening; }
diff --git a/SocketHttpListener.Portable/Net/HttpListenerContext.cs b/SocketHttpListener.Portable/Net/HttpListenerContext.cs
index 84c6a8c19..182fd2d2a 100644
--- a/SocketHttpListener.Portable/Net/HttpListenerContext.cs
+++ b/SocketHttpListener.Portable/Net/HttpListenerContext.cs
@@ -18,7 +18,6 @@ namespace SocketHttpListener.Net
         HttpConnection cnc;
         string error;
         int err_status = 400;
-        internal HttpListener Listener;
         private readonly ILogger _logger;
         private readonly ICryptoProvider _cryptoProvider;
         private readonly IMemoryStreamFactory _memoryStreamFactory;
diff --git a/SocketHttpListener.Portable/Net/ResponseStream.cs b/SocketHttpListener.Portable/Net/ResponseStream.cs
index 6ecbf9742..07788ea41 100644
--- a/SocketHttpListener.Portable/Net/ResponseStream.cs
+++ b/SocketHttpListener.Portable/Net/ResponseStream.cs
@@ -17,17 +17,15 @@ namespace SocketHttpListener.Net
     class ResponseStream : Stream
     {
         HttpListenerResponse response;
-        bool ignore_errors;
         bool disposed;
         bool trailer_sent;
         Stream stream;
         private readonly IMemoryStreamFactory _memoryStreamFactory;
         private readonly ITextEncoding _textEncoding;
 
-        internal ResponseStream(Stream stream, HttpListenerResponse response, bool ignore_errors, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        internal ResponseStream(Stream stream, HttpListenerResponse response, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
         {
             this.response = response;
-            this.ignore_errors = ignore_errors;
             _memoryStreamFactory = memoryStreamFactory;
             _textEncoding = textEncoding;
             this.stream = stream;
@@ -130,18 +128,7 @@ namespace SocketHttpListener.Net
 
         internal void InternalWrite(byte[] buffer, int offset, int count)
         {
-            if (ignore_errors)
-            {
-                try
-                {
-                    stream.Write(buffer, offset, count);
-                }
-                catch { }
-            }
-            else
-            {
-                stream.Write(buffer, offset, count);
-            }
+            stream.Write(buffer, offset, count);
         }
 
         public override void Write(byte[] buffer, int offset, int count)
@@ -214,23 +201,13 @@ namespace SocketHttpListener.Net
                 InternalWrite(bytes, 0, bytes.Length);
             }
 
-            try
-            {
-                if (count > 0)
-                {
-                    await stream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
-                }
-
-                if (response.SendChunked)
-                    stream.Write(crlf, 0, 2);
-            }
-            catch
+            if (count > 0)
             {
-                if (!ignore_errors)
-                {
-                    throw;
-                }
+                await stream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
             }
+
+            if (response.SendChunked)
+                stream.Write(crlf, 0, 2);
         }
 
         //public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count,
-- 
cgit v1.2.3


From a855864207fe3ed0ac9b4d648617bb1cb39df3f3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Nov 2016 02:14:04 -0500
Subject: limit access to response stream

---
 .../HttpServer/HttpListenerHost.cs                 | 22 +++++++++++++++-------
 .../SocketSharp/WebSocketSharpResponse.cs          | 21 ++++-----------------
 MediaBrowser.Model/Services/IRequest.cs            | 13 -------------
 ServiceStack/Host/ContentTypes.cs                  | 10 +---------
 ServiceStack/HttpResponseExtensionsInternal.cs     | 22 ++++++++++++----------
 5 files changed, 32 insertions(+), 56 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 49c664eec..41b7a4622 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.HttpServer;
 using Emby.Server.Implementations.HttpServer.SocketSharp;
@@ -248,9 +249,7 @@ namespace Emby.Server.Implementations.HttpServer
                 httpRes.StatusCode = statusCode;
 
                 httpRes.ContentType = "text/html";
-                httpRes.Write(ex.Message);
-
-                httpRes.Close();
+                Write(httpRes, ex.Message);
             }
             catch
             {
@@ -404,7 +403,7 @@ namespace Emby.Server.Implementations.HttpServer
                 {
                     httpRes.StatusCode = 400;
                     httpRes.ContentType = "text/plain";
-                    httpRes.Write("Invalid host");
+                    Write(httpRes, "Invalid host");
                     return;
                 }
 
@@ -458,7 +457,7 @@ namespace Emby.Server.Implementations.HttpServer
 
                     if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
                     {
-                        httpRes.Write(
+                        Write(httpRes,
                             "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
                             newUrl + "\">" + newUrl + "</a></body></html>");
                         return;
@@ -475,7 +474,7 @@ namespace Emby.Server.Implementations.HttpServer
 
                     if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
                     {
-                        httpRes.Write(
+                        Write(httpRes,
                             "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
                             newUrl + "\">" + newUrl + "</a></body></html>");
                         return;
@@ -513,7 +512,7 @@ namespace Emby.Server.Implementations.HttpServer
                 {
                     httpRes.StatusCode = 503;
                     httpRes.ContentType = "text/html";
-                    httpRes.Write(GlobalResponse);
+                    Write(httpRes, GlobalResponse);
                     return;
                 }
 
@@ -547,6 +546,15 @@ namespace Emby.Server.Implementations.HttpServer
             }
         }
 
+        private void Write(IResponse response, string text)
+        {
+            var bOutput = Encoding.UTF8.GetBytes(text);
+            response.SetContentLength(bOutput.Length);
+
+            var outputStream = response.OutputStream;
+            outputStream.Write(bOutput, 0, bOutput.Length);
+        }
+
         public static void RedirectToUrl(IResponse httpRes, string url)
         {
             httpRes.StatusCode = 302;
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
index 9de86e9cc..a8b115056 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
@@ -77,16 +77,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             get { return _response.OutputStream; }
         }
 
-        public void Write(string text)
-        {
-            var bOutput = System.Text.Encoding.UTF8.GetBytes(text);
-            _response.ContentLength64 = bOutput.Length;
-
-            var outputStream = _response.OutputStream;
-            outputStream.Write(bOutput, 0, bOutput.Length);
-            Close();
-        }
-
         public void Close()
         {
             if (!this.IsClosed)
@@ -108,8 +98,10 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         {
             try
             {
-                response.OutputStream.Flush();
-                response.OutputStream.Dispose();
+                var outputStream = response.OutputStream;
+
+                outputStream.Flush();
+                outputStream.Dispose();
                 response.Close();
             }
             catch (Exception ex)
@@ -118,11 +110,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             }
         }
 
-        public void Flush()
-        {
-            _response.OutputStream.Flush();
-        }
-
         public bool IsClosed
         {
             get;
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 455a69d37..e9a9f1c5b 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -136,23 +136,12 @@ namespace MediaBrowser.Model.Services
 
         Stream OutputStream { get; }
 
-        /// <summary>
-        /// Write once to the Response Stream then close it. 
-        /// </summary>
-        /// <param name="text"></param>
-        void Write(string text);
-
         /// <summary>
         /// Signal that this response has been handled and no more processing should be done.
         /// When used in a request or response filter, no more filters or processing is done on this request.
         /// </summary>
         void Close();
 
-        /// <summary>
-        /// Response.Flush() and OutputStream.Flush() seem to have different behaviour in ASP.NET
-        /// </summary>
-        void Flush();
-
         /// <summary>
         /// Gets a value indicating whether this instance is closed.
         /// </summary>
@@ -160,8 +149,6 @@ namespace MediaBrowser.Model.Services
 
         void SetContentLength(long contentLength);
 
-        bool KeepAlive { get; set; }
-
         //Add Metadata to Response
         Dictionary<string, object> Items { get; }
     }
diff --git a/ServiceStack/Host/ContentTypes.cs b/ServiceStack/Host/ContentTypes.cs
index 58ba29801..8840e7c8b 100644
--- a/ServiceStack/Host/ContentTypes.cs
+++ b/ServiceStack/Host/ContentTypes.cs
@@ -18,15 +18,7 @@ namespace ServiceStack.Host
             serializer(response, responseStream);
         }
 
-        public Action<object, IResponse> GetResponseSerializer(string contentType)
-        {
-            var serializer = GetStreamSerializer(contentType);
-            if (serializer == null) return null;
-
-            return (dto, httpRes) => serializer(dto, httpRes.OutputStream);
-        }
-
-        public Action<object, Stream> GetStreamSerializer(string contentType)
+        private Action<object, Stream> GetStreamSerializer(string contentType)
         {
             switch (GetRealContentType(contentType))
             {
diff --git a/ServiceStack/HttpResponseExtensionsInternal.cs b/ServiceStack/HttpResponseExtensionsInternal.cs
index 88b82bdf6..44b790f5f 100644
--- a/ServiceStack/HttpResponseExtensionsInternal.cs
+++ b/ServiceStack/HttpResponseExtensionsInternal.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Net;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using System.Text;
 using System.Threading;
 using MediaBrowser.Model.Services;
 using ServiceStack.Host;
@@ -14,19 +15,19 @@ namespace ServiceStack
 {
     public static class HttpResponseExtensionsInternal
     {
-        public static async Task<bool> WriteToOutputStream(IResponse response, object result)
+        public static async Task<bool> WriteToOutputStream(IResponse response, Stream outputStream, object result)
         {
             var asyncStreamWriter = result as IAsyncStreamWriter;
             if (asyncStreamWriter != null)
             {
-                await asyncStreamWriter.WriteToAsync(response.OutputStream, CancellationToken.None).ConfigureAwait(false);
+                await asyncStreamWriter.WriteToAsync(outputStream, CancellationToken.None).ConfigureAwait(false);
                 return true;
             }
 
             var streamWriter = result as IStreamWriter;
             if (streamWriter != null)
             {
-                streamWriter.WriteTo(response.OutputStream);
+                streamWriter.WriteTo(outputStream);
                 return true;
             }
 
@@ -35,7 +36,7 @@ namespace ServiceStack
             {
                 using (stream)
                 {
-                    await stream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
+                    await stream.CopyToAsync(outputStream).ConfigureAwait(false);
                     return true;
                 }
             }
@@ -46,7 +47,7 @@ namespace ServiceStack
                 response.ContentType = "application/octet-stream";
                 response.SetContentLength(bytes.Length);
 
-                await response.OutputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                await outputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return true;
             }
 
@@ -151,10 +152,11 @@ namespace ServiceStack
                 response.ContentType += "; charset=utf-8";
             }
 
-            var writeToOutputStreamResult = await WriteToOutputStream(response, result).ConfigureAwait(false);
+            var outputStream = response.OutputStream;
+
+            var writeToOutputStreamResult = await WriteToOutputStream(response, outputStream, result).ConfigureAwait(false);
             if (writeToOutputStreamResult)
             {
-                response.Flush(); //required for Compression
                 return;
             }
 
@@ -164,12 +166,12 @@ namespace ServiceStack
                 if (response.ContentType == null || response.ContentType == "text/html")
                     response.ContentType = defaultContentType;
 
-                response.Write(responseText);
+                var bytes = Encoding.UTF8.GetBytes(responseText);
+                await outputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return;
             }
 
-            var serializer = ContentTypes.Instance.GetResponseSerializer(defaultContentType);
-            serializer(result, response);
+            ContentTypes.Instance.SerializeToStream(request, result, outputStream);
         }
     }
 }
-- 
cgit v1.2.3


From 1714cb8764f2311fd255945d5a03d6b298f62071 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Nov 2016 03:02:46 -0500
Subject: update response stream handling

---
 Emby.Server.Core/ApplicationHost.cs                     |  3 ---
 .../HttpServer/SocketSharp/WebSocketSharpResponse.cs    |  7 ++++++-
 MediaBrowser.ServerApplication/MainStartup.cs           |  4 ++++
 SocketHttpListener.Portable/Net/HttpConnection.cs       | 17 ++++++++++++++---
 SocketHttpListener.Portable/Net/HttpListenerRequest.cs  |  4 ++--
 SocketHttpListener.Portable/Net/HttpListenerResponse.cs |  2 +-
 SocketHttpListener.Portable/Net/ResponseStream.cs       | 10 +++++-----
 7 files changed, 32 insertions(+), 15 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 0c0ef894e..5c8aea7ed 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -1136,9 +1136,6 @@ namespace Emby.Server.Core
         {
             get
             {
-#if DEBUG
-                return false;
-#endif
 #pragma warning disable 162
                 return NativeApp.CanSelfUpdate;
 #pragma warning restore 162
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
index a8b115056..dc049cbde 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
@@ -100,7 +100,12 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             {
                 var outputStream = response.OutputStream;
 
-                outputStream.Flush();
+                // This is needed with compression
+                //if (!string.IsNullOrWhiteSpace(GetHeader("Content-Encoding")))
+                {
+                    outputStream.Flush();
+                }
+
                 outputStream.Dispose();
                 response.Close();
             }
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 09c948a4a..fa8cccf34 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -291,6 +291,10 @@ namespace MediaBrowser.ServerApplication
         {
             get
             {
+#if DEBUG
+                return false;
+#endif
+
                 if (_isRunningAsService)
                 {
                     return _canRestartService;
diff --git a/SocketHttpListener.Portable/Net/HttpConnection.cs b/SocketHttpListener.Portable/Net/HttpConnection.cs
index db34c4218..8e472117e 100644
--- a/SocketHttpListener.Portable/Net/HttpConnection.cs
+++ b/SocketHttpListener.Portable/Net/HttpConnection.cs
@@ -23,7 +23,7 @@ namespace SocketHttpListener.Net
         StringBuilder current_line;
         ListenerPrefix prefix;
         RequestStream i_stream;
-        ResponseStream o_stream;
+        Stream o_stream;
         bool chunked;
         int reuses;
         bool context_bound;
@@ -204,12 +204,23 @@ namespace SocketHttpListener.Net
             return i_stream;
         }
 
-        public ResponseStream GetResponseStream()
+        public Stream GetResponseStream()
         {
             // TODO: can we get this stream before reading the input?
             if (o_stream == null)
             {
-                o_stream = new ResponseStream(stream, context.Response, _memoryStreamFactory, _textEncoding);
+                if (context.Response.SendChunked)
+                {
+                    o_stream = new ResponseStream(stream, context.Response, _memoryStreamFactory, _textEncoding);
+                }
+                else
+                {
+                    o_stream = stream;
+                    using (var headerStream = ResponseStream.GetHeaders(context.Response, _memoryStreamFactory, false))
+                    {
+                        headerStream.CopyTo(o_stream);
+                    }
+                }
             }
             return o_stream;
         }
diff --git a/SocketHttpListener.Portable/Net/HttpListenerRequest.cs b/SocketHttpListener.Portable/Net/HttpListenerRequest.cs
index 63d5e510d..5631fc0a1 100644
--- a/SocketHttpListener.Portable/Net/HttpListenerRequest.cs
+++ b/SocketHttpListener.Portable/Net/HttpListenerRequest.cs
@@ -181,11 +181,11 @@ namespace SocketHttpListener.Net
 
             if (String.Compare(Headers["Expect"], "100-continue", StringComparison.OrdinalIgnoreCase) == 0)
             {
-                ResponseStream output = context.Connection.GetResponseStream();
+                var output = context.Connection.GetResponseStream();
                 
                 var _100continue = _textEncoding.GetASCIIEncoding().GetBytes("HTTP/1.1 100 Continue\r\n\r\n");
 
-                output.InternalWrite(_100continue, 0, _100continue.Length);
+                //output.InternalWrite(_100continue, 0, _100continue.Length);
             }
         }
 
diff --git a/SocketHttpListener.Portable/Net/HttpListenerResponse.cs b/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
index 0bc827b5a..93358cae4 100644
--- a/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
+++ b/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
@@ -19,7 +19,7 @@ namespace SocketHttpListener.Net
         CookieCollection cookies;
         WebHeaderCollection headers = new WebHeaderCollection();
         bool keep_alive = true;
-        ResponseStream output_stream;
+        Stream output_stream;
         Version version = HttpVersion.Version11;
         string location;
         int status_code = 200;
diff --git a/SocketHttpListener.Portable/Net/ResponseStream.cs b/SocketHttpListener.Portable/Net/ResponseStream.cs
index 07788ea41..7a6425dea 100644
--- a/SocketHttpListener.Portable/Net/ResponseStream.cs
+++ b/SocketHttpListener.Portable/Net/ResponseStream.cs
@@ -64,7 +64,7 @@ namespace SocketHttpListener.Net
             {
                 disposed = true;
                 byte[] bytes = null;
-                MemoryStream ms = GetHeaders(true);
+                MemoryStream ms = GetHeaders(response, _memoryStreamFactory, false);
                 bool chunked = response.SendChunked;
                 if (stream.CanWrite)
                 {
@@ -102,14 +102,14 @@ namespace SocketHttpListener.Net
             base.Dispose(disposing);
         }
 
-        MemoryStream GetHeaders(bool closing)
+        internal static MemoryStream GetHeaders(HttpListenerResponse response, IMemoryStreamFactory memoryStreamFactory, bool closing)
         {
             // SendHeaders works on shared headers
             lock (response.headers_lock)
             {
                 if (response.HeadersSent)
                     return null;
-                MemoryStream ms = _memoryStreamFactory.CreateNew();
+                MemoryStream ms = memoryStreamFactory.CreateNew();
                 response.SendHeaders(closing, ms);
                 return ms;
             }
@@ -137,7 +137,7 @@ namespace SocketHttpListener.Net
                 throw new ObjectDisposedException(GetType().ToString());
 
             byte[] bytes = null;
-            MemoryStream ms = GetHeaders(false);
+            MemoryStream ms = GetHeaders(response, _memoryStreamFactory, false);
             bool chunked = response.SendChunked;
             if (ms != null)
             {
@@ -177,7 +177,7 @@ namespace SocketHttpListener.Net
                 throw new ObjectDisposedException(GetType().ToString());
 
             byte[] bytes = null;
-            MemoryStream ms = GetHeaders(false);
+            MemoryStream ms = GetHeaders(response, _memoryStreamFactory, false);
             bool chunked = response.SendChunked;
             if (ms != null)
             {
-- 
cgit v1.2.3


From 0e9cd51f9c64d4cfad5cb5c7b0ddae6af8d18ac6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 13 Nov 2016 16:04:21 -0500
Subject: update .net core startup

---
 Emby.Common.Implementations/BaseApplicationHost.cs |   4 +-
 .../BaseApplicationPaths.cs                        |  10 +-
 .../EnvironmentInfo/EnvironmentInfo.cs             |  10 +
 .../IO/ManagedFileSystem.cs                        |   8 +
 Emby.Common.Implementations/Net/NetSocket.cs       |   9 +
 Emby.Common.Implementations/Net/SocketAcceptor.cs  |  24 ++-
 Emby.Common.Implementations/Net/SocketFactory.cs   |   7 +-
 Emby.Server.Core/ApplicationHost.cs                |  14 +-
 Emby.Server.Core/Data/DataExtensions.cs            |   4 +-
 Emby.Server.Core/Data/SqliteItemRepository.cs      |  19 +-
 .../Notifications/SqliteNotificationsRepository.cs |   2 +-
 Emby.Server.Core/ServerApplicationPaths.cs         |   4 +-
 .../Channels/ChannelManager.cs                     |  16 +-
 .../HttpServer/HttpListenerHost.cs                 |   2 +
 .../LiveTv/EmbyTV/EmbyTV.cs                        |  90 +++++++--
 .../LiveTv/EmbyTV/ItemDataProvider.cs              |   3 +-
 .../LiveTv/LiveTvDtoService.cs                     |  20 +-
 .../LiveTv/LiveTvManager.cs                        |  67 +++++--
 .../LiveTv/ProgramImageProvider.cs                 |  14 +-
 MediaBrowser.Api/ApiEntryPoint.cs                  |   6 +-
 .../Configuration/IApplicationPaths.cs             |   6 -
 MediaBrowser.Controller/Entities/BaseItem.cs       |  19 +-
 .../Encoder/EncoderValidator.cs                    |  16 +-
 MediaBrowser.Model/IO/IFileSystem.cs               |   1 +
 MediaBrowser.Model/System/IEnvironmentInfo.cs      |   2 +
 MediaBrowser.Server.Mono/MonoAppHost.cs            |   2 +-
 MediaBrowser.Server.Mono/Program.cs                |  10 +-
 .../Persistence/SqliteExtensions.cs                |   6 +-
 MediaBrowser.ServerApplication/MainStartup.cs      |  28 +--
 .../Updates/ApplicationUpdater.cs                  |   2 +-
 MediaBrowser.ServerApplication/WindowsAppHost.cs   |   9 +-
 MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs |   2 -
 Nuget/MediaBrowser.Common.nuspec                   |   2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |   4 +-
 src/Emby.Server/ApplicationPathHelper.cs           |  11 +-
 src/Emby.Server/CoreAppHost.cs                     |   2 +-
 src/Emby.Server/Program.cs                         | 213 ++++-----------------
 src/Emby.Server/project.json                       |   8 +-
 38 files changed, 353 insertions(+), 323 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs
index f0309511e..1f194968c 100644
--- a/Emby.Common.Implementations/BaseApplicationHost.cs
+++ b/Emby.Common.Implementations/BaseApplicationHost.cs
@@ -326,7 +326,7 @@ namespace Emby.Common.Implementations
 
             builder.AppendLine(string.Format("Processor count: {0}", Environment.ProcessorCount));
             builder.AppendLine(string.Format("Program data path: {0}", appPaths.ProgramDataPath));
-            builder.AppendLine(string.Format("Application Path: {0}", appPaths.ApplicationPath));
+            builder.AppendLine(string.Format("Application directory: {0}", appPaths.ProgramSystemPath));
 
             return builder;
         }
@@ -548,7 +548,7 @@ return null;
             TimerFactory = new TimerFactory();
             RegisterSingleInstance(TimerFactory);
 
-            SocketFactory = new SocketFactory(null);
+            SocketFactory = new SocketFactory(LogManager.GetLogger("SocketFactory"));
             RegisterSingleInstance(SocketFactory);
 
             RegisterSingleInstance(CryptographyProvider);
diff --git a/Emby.Common.Implementations/BaseApplicationPaths.cs b/Emby.Common.Implementations/BaseApplicationPaths.cs
index 628d62bd4..8792778ba 100644
--- a/Emby.Common.Implementations/BaseApplicationPaths.cs
+++ b/Emby.Common.Implementations/BaseApplicationPaths.cs
@@ -12,22 +12,18 @@ namespace Emby.Common.Implementations
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseApplicationPaths"/> class.
         /// </summary>
-        protected BaseApplicationPaths(string programDataPath, string applicationPath)
+        protected BaseApplicationPaths(string programDataPath, string appFolderPath)
         {
             ProgramDataPath = programDataPath;
-            ApplicationPath = applicationPath;
+            ProgramSystemPath = appFolderPath;
         }
 
-        public string ApplicationPath { get; private set; }
         public string ProgramDataPath { get; private set; }
 
         /// <summary>
         /// Gets the path to the system folder
         /// </summary>
-        public string ProgramSystemPath
-        {
-            get { return Path.GetDirectoryName(ApplicationPath); }
-        }
+        public string ProgramSystemPath { get; private set; }
 
         /// <summary>
         /// The _data directory
diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
index 6a1b3ef74..c040e3931 100644
--- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
+++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
@@ -95,5 +95,15 @@ namespace Emby.Common.Implementations.EnvironmentInfo
                 return MediaBrowser.Model.System.Architecture.X64;
             }
         }
+
+        public string GetEnvironmentVariable(string name)
+        {
+            return Environment.GetEnvironmentVariable(name);
+        }
+
+        public virtual string GetUserId()
+        {
+            return null;
+        }
     }
 }
diff --git a/Emby.Common.Implementations/IO/ManagedFileSystem.cs b/Emby.Common.Implementations/IO/ManagedFileSystem.cs
index 1f0aa55fa..83bb50f94 100644
--- a/Emby.Common.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Common.Implementations/IO/ManagedFileSystem.cs
@@ -57,6 +57,14 @@ namespace Emby.Common.Implementations.IO
             }
         }
 
+        public char PathSeparator
+        {
+            get
+            {
+                return Path.DirectorySeparatorChar;
+            }
+        }
+
         public string GetFullPath(string path)
         {
             return Path.GetFullPath(path);
diff --git a/Emby.Common.Implementations/Net/NetSocket.cs b/Emby.Common.Implementations/Net/NetSocket.cs
index faa1a81e2..62ca3d6ac 100644
--- a/Emby.Common.Implementations/Net/NetSocket.cs
+++ b/Emby.Common.Implementations/Net/NetSocket.cs
@@ -15,6 +15,15 @@ namespace Emby.Common.Implementations.Net
 
         public NetSocket(Socket socket, ILogger logger)
         {
+            if (socket == null)
+            {
+                throw new ArgumentNullException("socket");
+            }
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+
             Socket = socket;
             _logger = logger;
         }
diff --git a/Emby.Common.Implementations/Net/SocketAcceptor.cs b/Emby.Common.Implementations/Net/SocketAcceptor.cs
index fd65e9fbc..bddb7a079 100644
--- a/Emby.Common.Implementations/Net/SocketAcceptor.cs
+++ b/Emby.Common.Implementations/Net/SocketAcceptor.cs
@@ -14,6 +14,23 @@ namespace Emby.Common.Implementations.Net
 
         public SocketAcceptor(ILogger logger, Socket originalSocket, Action<ISocket> onAccept, Func<bool> isClosed)
         {
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+            if (originalSocket == null)
+            {
+                throw new ArgumentNullException("originalSocket");
+            }
+            if (onAccept == null)
+            {
+                throw new ArgumentNullException("onAccept");
+            }
+            if (isClosed == null)
+            {
+                throw new ArgumentNullException("isClosed");
+            }
+
             _logger = logger;
             _originalSocket = originalSocket;
             _isClosed = isClosed;
@@ -101,11 +118,8 @@ namespace Emby.Common.Implementations.Net
                 _onAccept(new NetSocket(acceptSocket, _logger));
             }
 
-            if (_originalSocket != null)
-            {
-                // Accept the next connection request
-                StartAccept(e, ref acceptSocket);
-            }
+            // Accept the next connection request
+            StartAccept(e, ref acceptSocket);
         }
     }
 }
diff --git a/Emby.Common.Implementations/Net/SocketFactory.cs b/Emby.Common.Implementations/Net/SocketFactory.cs
index 922b0f3cc..f26137683 100644
--- a/Emby.Common.Implementations/Net/SocketFactory.cs
+++ b/Emby.Common.Implementations/Net/SocketFactory.cs
@@ -23,10 +23,15 @@ namespace Emby.Common.Implementations.Net
         /// </summary>
         private IPAddress _LocalIP;
 
-        private ILogger _logger;
+        private readonly ILogger _logger;
 
         public SocketFactory(ILogger logger)
         {
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+
             _logger = logger;
             _LocalIP = IPAddress.Any;
         }
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 7f795a68d..d3d292ca5 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -725,6 +725,11 @@ namespace Emby.Server.Core
 
             try
             {
+                if (!FileSystemManager.FileExists(certificateLocation))
+                {
+                    return null;
+                }
+
                 X509Certificate2 localCert = new X509Certificate2(certificateLocation);
                 //localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
                 if (!localCert.HasPrivateKey)
@@ -1438,12 +1443,7 @@ namespace Emby.Server.Core
 
             try
             {
-                AuthorizeServer(
-                    UdpServerEntryPoint.PortNumber,
-                    ServerConfigurationManager.Configuration.HttpServerPortNumber,
-                    ServerConfigurationManager.Configuration.HttpsPortNumber,
-                    ConfigurationManager.CommonApplicationPaths.ApplicationPath,
-                    ConfigurationManager.CommonApplicationPaths.TempDirectory);
+                AuthorizeServer();
             }
             catch (Exception ex)
             {
@@ -1451,7 +1451,7 @@ namespace Emby.Server.Core
             }
         }
 
-        protected abstract void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory);
+        protected abstract void AuthorizeServer();
         protected abstract IDbConnector GetDbConnector();
 
         public event EventHandler HasUpdateAvailableChanged;
diff --git a/Emby.Server.Core/Data/DataExtensions.cs b/Emby.Server.Core/Data/DataExtensions.cs
index b633d9217..631c1c500 100644
--- a/Emby.Server.Core/Data/DataExtensions.cs
+++ b/Emby.Server.Core/Data/DataExtensions.cs
@@ -40,7 +40,7 @@ namespace Emby.Server.Core.Data
         public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name)
         {
             var param = cmd.CreateParameter();
-
+            
             param.ParameterName = name;
 
             paramCollection.Add(param);
@@ -173,7 +173,7 @@ namespace Emby.Server.Core.Data
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table " + table);
-            builder.AppendLine("add column " + columnName + " " + type);
+            builder.AppendLine("add column " + columnName + " " + type + " NULL");
 
             connection.RunQueries(new[] { builder.ToString() }, logger);
         }
diff --git a/Emby.Server.Core/Data/SqliteItemRepository.cs b/Emby.Server.Core/Data/SqliteItemRepository.cs
index 2ca86c831..6ed409aa1 100644
--- a/Emby.Server.Core/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Core/Data/SqliteItemRepository.cs
@@ -157,7 +157,7 @@ namespace Emby.Server.Core.Data
 
             string[] queries = {
 
-                                "create table if not exists TypedBaseItems (guid GUID primary key, type TEXT, data BLOB, ParentId GUID, Path TEXT)",
+                                "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)",
 
                                 "create table if not exists AncestorIds (ItemId GUID, AncestorId GUID, AncestorIdText TEXT, PRIMARY KEY (ItemId, AncestorId))",
                                 "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)",
@@ -286,6 +286,7 @@ namespace Emby.Server.Core.Data
             _connection.AddColumn(Logger, "TypedBaseItems", "ExtraType", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "Artists", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "AlbumArtists", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "ExternalId", "Text");
 
             _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text");
 
@@ -440,7 +441,8 @@ namespace Emby.Server.Core.Data
             "TotalBitrate",
             "ExtraType",
             "Artists",
-            "AlbumArtists"
+            "AlbumArtists",
+            "ExternalId"
         };
 
         private readonly string[] _mediaStreamSaveColumns =
@@ -575,7 +577,8 @@ namespace Emby.Server.Core.Data
                 "TotalBitrate",
                 "ExtraType",
                 "Artists",
-                "AlbumArtists"
+                "AlbumArtists",
+                "ExternalId"
             };
             _saveItemCommand = _connection.CreateCommand();
             _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (";
@@ -1084,6 +1087,10 @@ namespace Emby.Server.Core.Data
                         }
                     }
 
+                    _saveItemCommand.GetParameter(index++).Value = item.ExternalId;
+
+                    //Logger.Debug(_saveItemCommand.CommandText);
+
                     _saveItemCommand.Transaction = transaction;
 
                     _saveItemCommand.ExecuteNonQuery();
@@ -1967,6 +1974,12 @@ namespace Emby.Server.Core.Data
             }
             index++;
 
+            if (!reader.IsDBNull(index))
+            {
+                item.ExternalId = reader.GetString(index);
+            }
+            index++;
+
             if (string.IsNullOrWhiteSpace(item.Tagline))
             {
                 var movie = item as Movie;
diff --git a/Emby.Server.Core/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Core/Notifications/SqliteNotificationsRepository.cs
index 8a7fc9270..dee0d4cfd 100644
--- a/Emby.Server.Core/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Core/Notifications/SqliteNotificationsRepository.cs
@@ -30,7 +30,7 @@ namespace Emby.Server.Core.Notifications
             {
                 string[] queries = {
 
-                                "create table if not exists Notifications (Id GUID NOT NULL, UserId GUID NOT NULL, Date DATETIME NOT NULL, Name TEXT NOT NULL, Description TEXT, Url TEXT, Level TEXT NOT NULL, IsRead BOOLEAN NOT NULL, Category TEXT NOT NULL, RelatedId TEXT, PRIMARY KEY (Id, UserId))",
+                                "create table if not exists Notifications (Id GUID NOT NULL, UserId GUID NOT NULL, Date DATETIME NOT NULL, Name TEXT NOT NULL, Description TEXT NULL, Url TEXT NULL, Level TEXT NOT NULL, IsRead BOOLEAN NOT NULL, Category TEXT NOT NULL, RelatedId TEXT NULL, PRIMARY KEY (Id, UserId))",
                                 "create index if not exists idx_Notifications1 on Notifications(Id)",
                                 "create index if not exists idx_Notifications2 on Notifications(UserId)"
                                };
diff --git a/Emby.Server.Core/ServerApplicationPaths.cs b/Emby.Server.Core/ServerApplicationPaths.cs
index d59dd89d9..dc80b773c 100644
--- a/Emby.Server.Core/ServerApplicationPaths.cs
+++ b/Emby.Server.Core/ServerApplicationPaths.cs
@@ -12,8 +12,8 @@ namespace Emby.Server.Core
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseApplicationPaths" /> class.
         /// </summary>
-        public ServerApplicationPaths(string programDataPath, string applicationPath, string applicationResourcesPath)
-            : base(programDataPath, applicationPath)
+        public ServerApplicationPaths(string programDataPath, string appFolderPath, string applicationResourcesPath)
+            : base(programDataPath, appFolderPath)
         {
             ApplicationResourcesPath = applicationResourcesPath;
         }
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index 2ce880c93..94ff7c342 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -326,7 +326,7 @@ namespace Emby.Server.Implementations.Channels
 
             if (requiresCallback != null)
             {
-                results = await GetChannelItemMediaSourcesInternal(requiresCallback, item.ExternalId, cancellationToken)
+                results = await GetChannelItemMediaSourcesInternal(requiresCallback, GetItemExternalId(item), cancellationToken)
                     .ConfigureAwait(false);
             }
             else
@@ -1075,6 +1075,18 @@ namespace Emby.Server.Implementations.Channels
             return result;
         }
 
+        private string GetItemExternalId(BaseItem item)
+        {
+            var externalId = item.ExternalId;
+
+            if (string.IsNullOrWhiteSpace(externalId))
+            {
+                externalId = item.GetProviderId("ProviderExternalId");
+            }
+
+            return externalId;
+        }
+
         private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(1, 1);
         private async Task<ChannelItemResult> GetChannelItems(IChannel channel,
             User user,
@@ -1145,7 +1157,7 @@ namespace Emby.Server.Implementations.Channels
                 {
                     var categoryItem = _libraryManager.GetItemById(new Guid(folderId));
 
-                    query.FolderId = categoryItem.ExternalId;
+                    query.FolderId = GetItemExternalId(categoryItem);
                 }
 
                 var result = await channel.GetChannelItems(query, cancellationToken).ConfigureAwait(false);
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 41b7a4622..876d140ec 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -396,6 +396,8 @@ namespace Emby.Server.Implementations.HttpServer
                 if (_disposed)
                 {
                     httpRes.StatusCode = 503;
+                    httpRes.ContentType = "text/plain";
+                    Write(httpRes, "Server shutting down");
                     return;
                 }
 
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 63356a845..aaf74b5c6 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1551,13 +1551,28 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             try
             {
+                if (timer.IsSports)
+                {
+                    AddGenre(timer.Genres, "Sports");
+                }
+                if (timer.IsKids)
+                {
+                    AddGenre(timer.Genres, "Kids");
+                    AddGenre(timer.Genres, "Children");
+                }
+                if (timer.IsNews)
+                {
+                    AddGenre(timer.Genres, "News");
+                }
+
                 if (timer.IsProgramSeries)
                 {
                     SaveSeriesNfo(timer, recordingPath, seriesPath);
+                    SaveVideoNfo(timer, recordingPath, false);
                 }
                 else if (!timer.IsMovie || timer.IsSports || timer.IsNews)
                 {
-                    SaveVideoNfo(timer, recordingPath);
+                    SaveVideoNfo(timer, recordingPath, true);
                 }
             }
             catch (Exception ex)
@@ -1594,6 +1609,16 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         writer.WriteElementString("title", timer.Name);
                     }
 
+                    if (!string.IsNullOrEmpty(timer.OfficialRating))
+                    {
+                        writer.WriteElementString("mpaa", timer.OfficialRating);
+                    }
+
+                    foreach (var genre in timer.Genres)
+                    {
+                        writer.WriteElementString("genre", genre);
+                    }
+
                     writer.WriteEndElement();
                     writer.WriteEndDocument();
                 }
@@ -1601,7 +1626,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         }
 
         public const string DateAddedFormat = "yyyy-MM-dd HH:mm:ss";
-        private void SaveVideoNfo(TimerInfo timer, string recordingPath)
+        private void SaveVideoNfo(TimerInfo timer, string recordingPath, bool lockData)
         {
             var nfoPath = Path.ChangeExtension(recordingPath, ".nfo");
 
@@ -1622,11 +1647,41 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 using (XmlWriter writer = XmlWriter.Create(stream, settings))
                 {
                     writer.WriteStartDocument(true);
-                    writer.WriteStartElement("movie");
 
-                    if (!string.IsNullOrWhiteSpace(timer.Name))
+                    if (timer.IsProgramSeries)
                     {
-                        writer.WriteElementString("title", timer.Name);
+                        writer.WriteStartElement("episodedetails");
+
+                        if (!string.IsNullOrWhiteSpace(timer.EpisodeTitle))
+                        {
+                            writer.WriteElementString("title", timer.EpisodeTitle);
+                        }
+
+                        if (timer.OriginalAirDate.HasValue)
+                        {
+                            var formatString = _config.GetNfoConfiguration().ReleaseDateFormat;
+
+                            writer.WriteElementString("aired", timer.OriginalAirDate.Value.ToLocalTime().ToString(formatString));
+                        }
+
+                        if (timer.EpisodeNumber.HasValue)
+                        {
+                            writer.WriteElementString("episode", timer.EpisodeNumber.Value.ToString(CultureInfo.InvariantCulture));
+                        }
+
+                        if (timer.SeasonNumber.HasValue)
+                        {
+                            writer.WriteElementString("season", timer.SeasonNumber.Value.ToString(CultureInfo.InvariantCulture));
+                        }
+                    }
+                    else
+                    {
+                        writer.WriteStartElement("movie");
+
+                        if (!string.IsNullOrWhiteSpace(timer.Name))
+                        {
+                            writer.WriteElementString("title", timer.Name);
+                        }
                     }
 
                     writer.WriteElementString("dateadded", DateTime.UtcNow.ToLocalTime().ToString(DateAddedFormat));
@@ -1645,25 +1700,15 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         .Replace("&quot;", "'");
 
                     writer.WriteElementString("plot", overview);
-                    writer.WriteElementString("lockdata", true.ToString().ToLower());
 
-                    if (timer.CommunityRating.HasValue)
+                    if (lockData)
                     {
-                        writer.WriteElementString("rating", timer.CommunityRating.Value.ToString(CultureInfo.InvariantCulture));
+                        writer.WriteElementString("lockdata", true.ToString().ToLower());
                     }
 
-                    if (timer.IsSports)
-                    {
-                        AddGenre(timer.Genres, "Sports");
-                    }
-                    if (timer.IsKids)
-                    {
-                        AddGenre(timer.Genres, "Kids");
-                        AddGenre(timer.Genres, "Children");
-                    }
-                    if (timer.IsNews)
+                    if (timer.CommunityRating.HasValue)
                     {
-                        AddGenre(timer.Genres, "News");
+                        writer.WriteElementString("rating", timer.CommunityRating.Value.ToString(CultureInfo.InvariantCulture));
                     }
 
                     foreach (var genre in timer.Genres)
@@ -1968,4 +2013,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             public CancellationTokenSource CancellationTokenSource { get; set; }
         }
     }
+    public static class ConfigurationExtension
+    {
+        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager manager)
+        {
+            return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index ded4f04c4..16ae26d45 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -54,9 +54,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             catch (FileNotFoundException)
             {
             }
-            catch (IOException ex)
+            catch (IOException)
             {
-                Logger.ErrorException("Error deserializing {0}", ex, jsonFile);
             }
             catch (Exception ex)
             {
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 4e7161521..d3e30a46b 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -269,6 +269,18 @@ namespace Emby.Server.Implementations.LiveTv
             return _libraryManager.GetNewItemId(name.ToLower(), typeof(ILiveTvRecording));
         }
 
+        private string GetItemExternalId(BaseItem item)
+        {
+            var externalId = item.ExternalId;
+
+            if (string.IsNullOrWhiteSpace(externalId))
+            {
+                externalId = item.GetProviderId("ProviderExternalId");
+            }
+
+            return externalId;
+        }
+
         public async Task<TimerInfo> GetTimerInfo(TimerInfoDto dto, bool isNew, LiveTvManager liveTv, CancellationToken cancellationToken)
         {
             var info = new TimerInfo
@@ -304,7 +316,7 @@ namespace Emby.Server.Implementations.LiveTv
 
                 if (channel != null)
                 {
-                    info.ChannelId = channel.ExternalId;
+                    info.ChannelId = GetItemExternalId(channel);
                 }
             }
 
@@ -314,7 +326,7 @@ namespace Emby.Server.Implementations.LiveTv
 
                 if (program != null)
                 {
-                    info.ProgramId = program.ExternalId;
+                    info.ProgramId = GetItemExternalId(program);
                 }
             }
 
@@ -370,7 +382,7 @@ namespace Emby.Server.Implementations.LiveTv
 
                 if (channel != null)
                 {
-                    info.ChannelId = channel.ExternalId;
+                    info.ChannelId = GetItemExternalId(channel);
                 }
             }
 
@@ -380,7 +392,7 @@ namespace Emby.Server.Implementations.LiveTv
 
                 if (program != null)
                 {
-                    info.ProgramId = program.ExternalId;
+                    info.ProgramId = GetItemExternalId(program);
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index adec66858..3a6f23fe9 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -251,12 +251,24 @@ namespace Emby.Server.Implementations.LiveTv
             return await GetLiveStream(id, mediaSourceId, true, cancellationToken).ConfigureAwait(false);
         }
 
+        private string GetItemExternalId(BaseItem item)
+        {
+            var externalId = item.ExternalId;
+
+            if (string.IsNullOrWhiteSpace(externalId))
+            {
+                externalId = item.GetProviderId("ProviderExternalId");
+            }
+
+            return externalId;
+        }
+
         public async Task<IEnumerable<MediaSourceInfo>> GetRecordingMediaSources(IHasMediaSources item, CancellationToken cancellationToken)
         {
             var baseItem = (BaseItem)item;
             var service = GetService(baseItem);
 
-            return await service.GetRecordingStreamMediaSources(baseItem.ExternalId, cancellationToken).ConfigureAwait(false);
+            return await service.GetRecordingStreamMediaSources(GetItemExternalId(baseItem), cancellationToken).ConfigureAwait(false);
         }
 
         public async Task<IEnumerable<MediaSourceInfo>> GetChannelMediaSources(IHasMediaSources item, CancellationToken cancellationToken)
@@ -313,18 +325,18 @@ namespace Emby.Server.Implementations.LiveTv
                 var channel = GetInternalChannel(id);
                 isVideo = channel.ChannelType == ChannelType.TV;
                 service = GetService(channel);
-                _logger.Info("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
+                _logger.Info("Opening channel stream from {0}, external channel Id: {1}", service.Name, GetItemExternalId(channel));
 
                 var supportsManagedStream = service as ISupportsDirectStreamProvider;
                 if (supportsManagedStream != null)
                 {
-                    var streamInfo = await supportsManagedStream.GetChannelStreamWithDirectStreamProvider(channel.ExternalId, mediaSourceId, cancellationToken).ConfigureAwait(false);
+                    var streamInfo = await supportsManagedStream.GetChannelStreamWithDirectStreamProvider(GetItemExternalId(channel), mediaSourceId, cancellationToken).ConfigureAwait(false);
                     info = streamInfo.Item1;
                     directStreamProvider = streamInfo.Item2;
                 }
                 else
                 {
-                    info = await service.GetChannelStream(channel.ExternalId, mediaSourceId, cancellationToken).ConfigureAwait(false);
+                    info = await service.GetChannelStream(GetItemExternalId(channel), mediaSourceId, cancellationToken).ConfigureAwait(false);
                 }
                 info.RequiresClosing = true;
 
@@ -341,8 +353,8 @@ namespace Emby.Server.Implementations.LiveTv
                 isVideo = !string.Equals(recording.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase);
                 service = GetService(recording);
 
-                _logger.Info("Opening recording stream from {0}, external recording Id: {1}", service.Name, recording.ExternalId);
-                info = await service.GetRecordingStream(recording.ExternalId, null, cancellationToken).ConfigureAwait(false);
+                _logger.Info("Opening recording stream from {0}, external recording Id: {1}", service.Name, GetItemExternalId(recording));
+                info = await service.GetRecordingStream(GetItemExternalId(recording), null, cancellationToken).ConfigureAwait(false);
                 info.RequiresClosing = true;
 
                 if (info.RequiresClosing)
@@ -493,7 +505,7 @@ namespace Emby.Server.Implementations.LiveTv
                 isNew = true;
             }
 
-            if (!string.Equals(channelInfo.Id, item.ExternalId))
+            if (!string.Equals(channelInfo.Id, item.ExternalId, StringComparison.Ordinal))
             {
                 isNew = true;
             }
@@ -601,7 +613,6 @@ namespace Emby.Server.Implementations.LiveTv
 
             item.EpisodeTitle = info.EpisodeTitle;
             item.ExternalId = info.Id;
-            item.ExternalSeriesIdLegacy = seriesId;
 
             if (!string.IsNullOrWhiteSpace(seriesId) && !string.Equals(item.ExternalSeriesId, seriesId, StringComparison.Ordinal))
             {
@@ -841,6 +852,13 @@ namespace Emby.Server.Implementations.LiveTv
             return item.Id;
         }
 
+
+
+        private string GetExternalSeriesIdLegacy(BaseItem item)
+        {
+            return item.GetProviderId("ProviderExternalSeriesId");
+        }
+
         public async Task<BaseItemDto> GetProgram(string id, CancellationToken cancellationToken, User user = null)
         {
             var program = GetInternalProgram(id);
@@ -848,7 +866,15 @@ namespace Emby.Server.Implementations.LiveTv
             var dto = _dtoService.GetBaseItemDto(program, new DtoOptions(), user);
 
             var list = new List<Tuple<BaseItemDto, string, string, string>>();
-            list.Add(new Tuple<BaseItemDto, string, string, string>(dto, program.ServiceName, program.ExternalId, program.ExternalSeriesIdLegacy));
+
+            var externalSeriesId = program.ExternalSeriesId;
+
+            if (string.IsNullOrWhiteSpace(externalSeriesId))
+            {
+                externalSeriesId = GetExternalSeriesIdLegacy(program);
+            }
+
+            list.Add(new Tuple<BaseItemDto, string, string, string>(dto, program.ServiceName, GetItemExternalId(program), externalSeriesId));
 
             await AddRecordingInfo(list, cancellationToken).ConfigureAwait(false);
 
@@ -1283,7 +1309,7 @@ namespace Emby.Server.Implementations.LiveTv
                     var isKids = false;
                     var iSSeries = false;
 
-                    var channelPrograms = await service.GetProgramsAsync(currentChannel.ExternalId, start, end, cancellationToken).ConfigureAwait(false);
+                    var channelPrograms = await service.GetProgramsAsync(GetItemExternalId(currentChannel), start, end, cancellationToken).ConfigureAwait(false);
 
                     var existingPrograms = _libraryManager.GetItemList(new InternalItemsQuery
                     {
@@ -1830,7 +1856,14 @@ namespace Emby.Server.Implementations.LiveTv
                     dto.ServiceName = serviceName;
                 }
 
-                programTuples.Add(new Tuple<BaseItemDto, string, string, string>(dto, serviceName, program.ExternalId, program.ExternalSeriesIdLegacy));
+                var externalSeriesId = program.ExternalSeriesId;
+
+                if (string.IsNullOrWhiteSpace(externalSeriesId))
+                {
+                    externalSeriesId = GetExternalSeriesIdLegacy(program);
+                }
+
+                programTuples.Add(new Tuple<BaseItemDto, string, string, string>(dto, serviceName, GetItemExternalId(program), externalSeriesId));
             }
 
             await AddRecordingInfo(programTuples, CancellationToken.None).ConfigureAwait(false);
@@ -2006,7 +2039,7 @@ namespace Emby.Server.Implementations.LiveTv
             if (service is EmbyTV.EmbyTV)
             {
                 // We can't trust that we'll be able to direct stream it through emby server,  no matter what the provider says
-                return service.DeleteRecordingAsync(recording.ExternalId, CancellationToken.None);
+                return service.DeleteRecordingAsync(GetItemExternalId(recording), CancellationToken.None);
             }
 
             return Task.FromResult(true);
@@ -2030,7 +2063,7 @@ namespace Emby.Server.Implementations.LiveTv
 
             try
             {
-                await service.DeleteRecordingAsync(recording.ExternalId, CancellationToken.None).ConfigureAwait(false);
+                await service.DeleteRecordingAsync(GetItemExternalId(recording), CancellationToken.None).ConfigureAwait(false);
             }
             catch (ResourceNotFoundException)
             {
@@ -2289,12 +2322,12 @@ namespace Emby.Server.Implementations.LiveTv
                 programInfo = new ProgramInfo
                 {
                     Audio = program.Audio,
-                    ChannelId = channel.ExternalId,
+                    ChannelId = GetItemExternalId(channel),
                     CommunityRating = program.CommunityRating,
                     EndDate = program.EndDate ?? DateTime.MinValue,
                     EpisodeTitle = program.EpisodeTitle,
                     Genres = program.Genres,
-                    Id = program.ExternalId,
+                    Id = GetItemExternalId(program),
                     IsHD = program.IsHD,
                     IsKids = program.IsKids,
                     IsLive = program.IsLive,
@@ -2360,7 +2393,7 @@ namespace Emby.Server.Implementations.LiveTv
             info.Name = program.Name;
             info.Overview = program.Overview;
             info.ProgramId = programDto.Id;
-            info.ExternalProgramId = program.ExternalId;
+            info.ExternalProgramId = GetItemExternalId(program);
 
             if (program.EndDate.HasValue)
             {
@@ -2804,7 +2837,7 @@ namespace Emby.Server.Implementations.LiveTv
 
         public async Task<ListingsProviderInfo> SaveListingProvider(ListingsProviderInfo info, bool validateLogin, bool validateListings)
         {
-            info = _jsonSerializer.DeserializeFromString< ListingsProviderInfo>(_jsonSerializer.SerializeToString(info));
+            info = _jsonSerializer.DeserializeFromString<ListingsProviderInfo>(_jsonSerializer.SerializeToString(info));
 
             var provider = _listingProviders.FirstOrDefault(i => string.Equals(info.Type, i.Type, StringComparison.OrdinalIgnoreCase));
 
diff --git a/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs b/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
index f5d298af4..5a0389b16 100644
--- a/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
@@ -24,6 +24,18 @@ namespace Emby.Server.Implementations.LiveTv
             return new[] { ImageType.Primary };
         }
 
+        private string GetItemExternalId(BaseItem item)
+        {
+            var externalId = item.ExternalId;
+
+            if (string.IsNullOrWhiteSpace(externalId))
+            {
+                externalId = item.GetProviderId("ProviderExternalId");
+            }
+
+            return externalId;
+        }
+
         public async Task<DynamicImageResponse> GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken)
         {
             var liveTvItem = (LiveTvProgram)item;
@@ -38,7 +50,7 @@ namespace Emby.Server.Implementations.LiveTv
                 {
                     var channel = _liveTvManager.GetInternalChannel(liveTvItem.ChannelId);
 
-                    var response = await service.GetProgramImageAsync(liveTvItem.ExternalId, channel.ExternalId, cancellationToken).ConfigureAwait(false);
+                    var response = await service.GetProgramImageAsync(GetItemExternalId(liveTvItem), GetItemExternalId(channel), cancellationToken).ConfigureAwait(false);
 
                     if (response != null)
                     {
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index bc0241766..37ab12366 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -128,7 +128,11 @@ namespace MediaBrowser.Api
             {
                 // Don't clutter the log
             }
-            catch (IOException ex)
+            catch (IOException)
+            {
+                // Don't clutter the log
+            }
+            catch (Exception ex)
             {
                 Logger.ErrorException("Error deleting encoded media cache", ex);
             }
diff --git a/MediaBrowser.Common/Configuration/IApplicationPaths.cs b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
index d3bf03302..d2446ce46 100644
--- a/MediaBrowser.Common/Configuration/IApplicationPaths.cs
+++ b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
@@ -6,12 +6,6 @@ namespace MediaBrowser.Common.Configuration
     /// </summary>
     public interface IApplicationPaths
     {
-        /// <summary>
-        /// Gets the application path.
-        /// </summary>
-        /// <value>The application path.</value>
-        string ApplicationPath { get; }
-
         /// <summary>
         /// Gets the path to the program data folder
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index b079da97c..10cac7992 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -296,28 +296,11 @@ namespace MediaBrowser.Controller.Entities
         /// If this content came from an external service, the id of the content on that service
         /// </summary>
         [IgnoreDataMember]
-        public string ExternalId
-        {
-            get { return this.GetProviderId("ProviderExternalId"); }
-            set
-            {
-                this.SetProviderId("ProviderExternalId", value);
-            }
-        }
+        public string ExternalId { get; set; }
 
         [IgnoreDataMember]
         public string ExternalSeriesId { get; set; }
 
-        [IgnoreDataMember]
-        public string ExternalSeriesIdLegacy
-        {
-            get { return this.GetProviderId("ProviderExternalSeriesId"); }
-            set
-            {
-                this.SetProviderId("ProviderExternalSeriesId", value);
-            }
-        }
-
         /// <summary>
         /// Gets or sets the etag.
         /// </summary>
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 6acdccf3d..1b8b3feec 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -37,20 +37,22 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 output = GetProcessOutput(encoderAppPath, "-version");
             }
-            catch
+            catch (Exception ex)
             {
+                if (logOutput)
+                {
+                    _logger.ErrorException("Error validating encoder", ex);
+                }
             }
 
-            output = output ?? string.Empty;
-
-            if (logOutput)
+            if (string.IsNullOrWhiteSpace(output))
             {
-                _logger.Info("ffmpeg info: {0}", output);
+                return false;
             }
 
-            if (string.IsNullOrWhiteSpace(output))
+            if (logOutput)
             {
-                return false;
+                _logger.Info("ffmpeg info: {0}", output);
             }
 
             if (output.IndexOf("Libav developers", StringComparison.OrdinalIgnoreCase) != -1)
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index f219d9295..22e1e7758 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -308,6 +308,7 @@ namespace MediaBrowser.Model.IO
         void SetReadOnly(string path, bool isHidden);
 
         char DirectorySeparatorChar { get; }
+        char PathSeparator { get; }
 
         string GetFullPath(string path);
 
diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs
index c5f493e7c..7e7d81e30 100644
--- a/MediaBrowser.Model/System/IEnvironmentInfo.cs
+++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs
@@ -12,6 +12,8 @@ namespace MediaBrowser.Model.System
         string OperatingSystemName { get; }
         string OperatingSystemVersion { get; }
         Architecture SystemArchitecture { get; }
+        string GetEnvironmentVariable(string name);
+        string GetUserId();
     }
 
     public enum OperatingSystem
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index 5f0ecde24..fd3c9f506 100644
--- a/MediaBrowser.Server.Mono/MonoAppHost.cs
+++ b/MediaBrowser.Server.Mono/MonoAppHost.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Server.Mono
             MainClass.Shutdown();
         }
 
-        protected override void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory)
+        protected override void AuthorizeServer()
         {
             throw new NotImplementedException();
         }
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 48390f078..470525ece 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Server.Startup.Common;
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -74,7 +75,9 @@ namespace MediaBrowser.Server.Mono
                 programDataPath = ApplicationPathHelper.GetProgramDataPath(applicationPath);
             }
 
-            return new ServerApplicationPaths(programDataPath, applicationPath, Path.GetDirectoryName(applicationPath));
+            var appFolderPath = Path.GetDirectoryName(applicationPath);
+
+            return new ServerApplicationPaths(programDataPath, appFolderPath, Path.GetDirectoryName(applicationPath));
         }
 
         private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>();
@@ -305,5 +308,10 @@ namespace MediaBrowser.Server.Mono
     public class MonoEnvironmentInfo : EnvironmentInfo
     {
         public bool IsBsd { get; set; }
+
+        public virtual string GetUserId()
+        {
+            return Syscall.getuid().ToString(CultureInfo.InvariantCulture);
+        }
     }
 }
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs
index 72ecfc1bf..22aeb53dd 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs
@@ -14,7 +14,11 @@ namespace Emby.Server.Core.Data
         /// <summary>
         /// Connects to db.
         /// </summary>
-        public static async Task<IDbConnection> ConnectToDb(string dbPath, bool isReadOnly, bool enablePooling, int? cacheSize, ILogger logger)
+        public static async Task<IDbConnection> ConnectToDb(string dbPath, 
+            bool isReadOnly, 
+            bool enablePooling, 
+            int? cacheSize, 
+            ILogger logger)
         {
             if (string.IsNullOrEmpty(dbPath))
             {
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index ab0a36aff..c0ebcde74 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -44,6 +44,8 @@ namespace MediaBrowser.ServerApplication
         [DllImport("kernel32.dll", SetLastError = true)]
         static extern bool SetDllDirectory(string lpPathName);
 
+        public static string ApplicationPath;
+
         public static bool TryGetLocalFromUncDirectory(string local, out string unc)
         {
             if ((local == null) || (local == ""))
@@ -81,14 +83,14 @@ namespace MediaBrowser.ServerApplication
 
             var currentProcess = Process.GetCurrentProcess();
 
-            var applicationPath = currentProcess.MainModule.FileName;
-            var architecturePath = Path.Combine(Path.GetDirectoryName(applicationPath), Environment.Is64BitProcess ? "x64" : "x86");
+            ApplicationPath = currentProcess.MainModule.FileName;
+            var architecturePath = Path.Combine(Path.GetDirectoryName(ApplicationPath), Environment.Is64BitProcess ? "x64" : "x86");
 
             Wand.SetMagickCoderModulePath(architecturePath);
 
             var success = SetDllDirectory(architecturePath);
 
-            var appPaths = CreateApplicationPaths(applicationPath, IsRunningAsService);
+            var appPaths = CreateApplicationPaths(ApplicationPath, IsRunningAsService);
 
             var logManager = new NlogManager(appPaths.LogDirectoryPath, "server");
             logManager.ReloadLogger(LogSeverity.Debug);
@@ -102,7 +104,7 @@ namespace MediaBrowser.ServerApplication
             if (options.ContainsOption("-installservice"))
             {
                 logger.Info("Performing service installation");
-                InstallService(applicationPath, logger);
+                InstallService(ApplicationPath, logger);
                 return;
             }
 
@@ -110,7 +112,7 @@ namespace MediaBrowser.ServerApplication
             if (options.ContainsOption("-installserviceasadmin"))
             {
                 logger.Info("Performing service installation");
-                RunServiceInstallation(applicationPath);
+                RunServiceInstallation(ApplicationPath);
                 return;
             }
 
@@ -118,7 +120,7 @@ namespace MediaBrowser.ServerApplication
             if (options.ContainsOption("-uninstallservice"))
             {
                 logger.Info("Performing service uninstallation");
-                UninstallService(applicationPath, logger);
+                UninstallService(ApplicationPath, logger);
                 return;
             }
 
@@ -126,15 +128,15 @@ namespace MediaBrowser.ServerApplication
             if (options.ContainsOption("-uninstallserviceasadmin"))
             {
                 logger.Info("Performing service uninstallation");
-                RunServiceUninstallation(applicationPath);
+                RunServiceUninstallation(ApplicationPath);
                 return;
             }
 
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
-            RunServiceInstallationIfNeeded(applicationPath);
+            RunServiceInstallationIfNeeded(ApplicationPath);
 
-            if (IsAlreadyRunning(applicationPath, currentProcess))
+            if (IsAlreadyRunning(ApplicationPath, currentProcess))
             {
                 logger.Info("Shutting down because another instance of Emby Server is already running.");
                 return;
@@ -250,6 +252,8 @@ namespace MediaBrowser.ServerApplication
         /// <returns>ServerApplicationPaths.</returns>
         private static ServerApplicationPaths CreateApplicationPaths(string applicationPath, bool runAsService)
         {
+            var appFolderPath = Path.GetDirectoryName(applicationPath);
+
             var resourcesPath = Path.GetDirectoryName(applicationPath);
 
             if (runAsService)
@@ -258,10 +262,10 @@ namespace MediaBrowser.ServerApplication
 
                 var programDataPath = Path.GetDirectoryName(systemPath);
 
-                return new ServerApplicationPaths(programDataPath, applicationPath, resourcesPath);
+                return new ServerApplicationPaths(programDataPath, appFolderPath, resourcesPath);
             }
 
-            return new ServerApplicationPaths(ApplicationPathHelper.GetProgramDataPath(applicationPath), applicationPath, resourcesPath);
+            return new ServerApplicationPaths(ApplicationPathHelper.GetProgramDataPath(applicationPath), appFolderPath, resourcesPath);
         }
 
         /// <summary>
@@ -663,7 +667,7 @@ namespace MediaBrowser.ServerApplication
 
                 _logger.Info("Starting new instance");
                 //Application.Restart();
-                Process.Start(_appHost.ServerConfigurationManager.ApplicationPaths.ApplicationPath);
+                Process.Start(ApplicationPath);
 
                 ShutdownWindowsApplication();
             }
diff --git a/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
index c426395b7..97537b27d 100644
--- a/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
+++ b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
@@ -44,7 +44,7 @@ namespace MediaBrowser.ServerApplication.Updates
             // startpath = executable to launch
             // systempath = folder containing installation
             var args = string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3} service={4} installpath=\"{5}\" startpath=\"{6}\" systempath=\"{7}\"",
-                    product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath, appPaths.ApplicationPath, systemPath);
+                    product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath, MainStartup.ApplicationPath, systemPath);
 
             logger.Info("Args: {0}", args);
             Process.Start(tempUpdater, args);
diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs
index 8fd718432..d9bead6b7 100644
--- a/MediaBrowser.ServerApplication/WindowsAppHost.cs
+++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs
@@ -6,6 +6,7 @@ using System.Reflection;
 using Emby.Server.Core;
 using Emby.Server.Core.Data;
 using Emby.Server.Core.FFMpeg;
+using Emby.Server.Implementations.EntryPoints;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.System;
@@ -60,9 +61,13 @@ namespace MediaBrowser.ServerApplication
             MainStartup.Shutdown();
         }
 
-        protected override void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory)
+        protected override void AuthorizeServer()
         {
-            ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsServerPort, applicationPath, tempDirectory);
+            ServerAuthorization.AuthorizeServer(UdpServerEntryPoint.PortNumber,
+                    ServerConfigurationManager.Configuration.HttpServerPortNumber,
+                    ServerConfigurationManager.Configuration.HttpsPortNumber,
+                    MainStartup.ApplicationPath,
+                    ConfigurationManager.CommonApplicationPaths.TempDirectory);
         }
 
         protected override IDbConnector GetDbConnector()
diff --git a/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
index 4c22f0246..b512939a7 100644
--- a/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
@@ -90,8 +90,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
         }
 
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
         protected override List<string> GetTagsUsed()
         {
             var list = new List<string>
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 464a29eb2..daeb754ba 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.689</version>
+        <version>3.0.691</version>
         <title>Emby.Common</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 96e9a697a..a34a9bee2 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.689</version>
+        <version>3.0.691</version>
         <title>Emby.Server.Core</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Emby Server.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.689" />
+            <dependency id="MediaBrowser.Common" version="3.0.691" />
         </dependencies>
     </metadata>
     <files>
diff --git a/src/Emby.Server/ApplicationPathHelper.cs b/src/Emby.Server/ApplicationPathHelper.cs
index 4da87b6a0..c611ff372 100644
--- a/src/Emby.Server/ApplicationPathHelper.cs
+++ b/src/Emby.Server/ApplicationPathHelper.cs
@@ -8,7 +8,7 @@ namespace Emby.Server
 {
     public class ApplicationPathHelper
     {
-        public static string GetProgramDataPath(string applicationPath)
+        public static string GetProgramDataPath(string appDirectory)
         {
             var useDebugPath = false;
 
@@ -27,14 +27,7 @@ namespace Emby.Server
             // If it's a relative path, e.g. "..\"
             if (!Path.IsPathRooted(programDataPath))
             {
-                var path = Path.GetDirectoryName(applicationPath);
-
-                if (string.IsNullOrEmpty(path))
-                {
-                    throw new Exception("Unable to determine running assembly location");
-                }
-
-                programDataPath = Path.Combine(path, programDataPath);
+                programDataPath = Path.Combine(appDirectory, programDataPath);
 
                 programDataPath = Path.GetFullPath(programDataPath);
             }
diff --git a/src/Emby.Server/CoreAppHost.cs b/src/Emby.Server/CoreAppHost.cs
index 1a1526513..21f6ae445 100644
--- a/src/Emby.Server/CoreAppHost.cs
+++ b/src/Emby.Server/CoreAppHost.cs
@@ -51,7 +51,7 @@ namespace Emby.Server
             return list;
         }
 
-        protected override void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory)
+        protected override void AuthorizeServer()
         {
         }
 
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs
index 64fc423a1..6f871990d 100644
--- a/src/Emby.Server/Program.cs
+++ b/src/Emby.Server/Program.cs
@@ -28,8 +28,6 @@ namespace Emby.Server
 
         private static ILogger _logger;
 
-        private static bool _isRunningAsService = false;
-        private static bool _canRestartService = false;
         private static bool _appHostDisposed;
 
         [DllImport("kernel32.dll", SetLastError = true)]
@@ -41,39 +39,33 @@ namespace Emby.Server
         public static void Main(string[] args)
         {
             var options = new StartupOptions();
-            _isRunningAsService = options.ContainsOption("-service");
-
-            if (_isRunningAsService)
-            {
-                //_canRestartService = CanRestartWindowsService();
-            }
 
             var currentProcess = Process.GetCurrentProcess();
-
-            var applicationPath = currentProcess.MainModule.FileName;
+            
+            var baseDirectory = System.AppContext.BaseDirectory;
             //var architecturePath = Path.Combine(Path.GetDirectoryName(applicationPath), Environment.Is64BitProcess ? "x64" : "x86");
 
             //Wand.SetMagickCoderModulePath(architecturePath);
 
             //var success = SetDllDirectory(architecturePath);
 
-            var appPaths = CreateApplicationPaths(applicationPath, _isRunningAsService);
+            var appPaths = CreateApplicationPaths(baseDirectory);
 
             var logManager = new NlogManager(appPaths.LogDirectoryPath, "server");
             logManager.ReloadLogger(LogSeverity.Debug);
             logManager.AddConsoleOutput();
 
             var logger = _logger = logManager.GetLogger("Main");
-
+            
             ApplicationHost.LogEnvironmentInfo(logger, appPaths, true);
 
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
-            if (IsAlreadyRunning(applicationPath, currentProcess))
-            {
-                logger.Info("Shutting down because another instance of Emby Server is already running.");
-                return;
-            }
+            //if (IsAlreadyRunning(applicationPath, currentProcess))
+            //{
+            //    logger.Info("Shutting down because another instance of Emby Server is already running.");
+            //    return;
+            //}
 
             if (PerformUpdateIfNeeded(appPaths, logger))
             {
@@ -81,14 +73,7 @@ namespace Emby.Server
                 return;
             }
 
-            try
-            {
-                RunApplication(appPaths, logManager, _isRunningAsService, options);
-            }
-            finally
-            {
-                OnServiceShutdown();
-            }
+            RunApplication(appPaths, logManager, options);
         }
 
         /// <summary>
@@ -139,34 +124,17 @@ namespace Emby.Server
                 }
             }
 
-            if (!_isRunningAsService)
-            {
-                return false;
-            }
-
             return false;
         }
 
         /// <summary>
         /// Creates the application paths.
         /// </summary>
-        /// <param name="applicationPath">The application path.</param>
-        /// <param name="runAsService">if set to <c>true</c> [run as service].</param>
-        /// <returns>ServerApplicationPaths.</returns>
-        private static ServerApplicationPaths CreateApplicationPaths(string applicationPath, bool runAsService)
+        private static ServerApplicationPaths CreateApplicationPaths(string appDirectory)
         {
-            var resourcesPath = Path.GetDirectoryName(applicationPath);
-
-            if (runAsService)
-            {
-                var systemPath = Path.GetDirectoryName(applicationPath);
-
-                var programDataPath = Path.GetDirectoryName(systemPath);
-
-                return new ServerApplicationPaths(programDataPath, applicationPath, resourcesPath);
-            }
+            var resourcesPath = appDirectory;
 
-            return new ServerApplicationPaths(ApplicationPathHelper.GetProgramDataPath(applicationPath), applicationPath, resourcesPath);
+            return new ServerApplicationPaths(ApplicationPathHelper.GetProgramDataPath(appDirectory), appDirectory, resourcesPath);
         }
 
         /// <summary>
@@ -177,14 +145,7 @@ namespace Emby.Server
         {
             get
             {
-                if (_isRunningAsService)
-                {
-                    return _canRestartService;
-                }
-                else
-                {
-                    return true;
-                }
+                return true;
             }
         }
 
@@ -196,14 +157,7 @@ namespace Emby.Server
         {
             get
             {
-                if (_isRunningAsService)
-                {
-                    return _canRestartService;
-                }
-                else
-                {
-                    return true;
-                }
+                return false;
             }
         }
 
@@ -214,9 +168,8 @@ namespace Emby.Server
         /// </summary>
         /// <param name="appPaths">The app paths.</param>
         /// <param name="logManager">The log manager.</param>
-        /// <param name="runService">if set to <c>true</c> [run service].</param>
         /// <param name="options">The options.</param>
-        private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, bool runService, StartupOptions options)
+        private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options)
         {
             var fileSystem = new ManagedFileSystem(logManager.GetLogger("FileSystem"), true, true, true);
 
@@ -240,29 +193,19 @@ namespace Emby.Server
 
             var initProgress = new Progress<double>();
 
-            if (!runService)
-            {
-                // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
-                SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |
-                             ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
-            }
+            // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
+            SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |
+                         ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
 
             var task = _appHost.Init(initProgress);
             Task.WaitAll(task);
 
             task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()), TaskContinuationOptions.OnlyOnRanToCompletion | TaskContinuationOptions.AttachedToParent);
 
-            if (runService)
-            {
-                StartService(logManager);
-            }
-            else
-            {
-                Task.WaitAll(task);
+            Task.WaitAll(task);
 
-                task = ApplicationTaskCompletionSource.Task;
-                Task.WaitAll(task);
-            }
+            task = ApplicationTaskCompletionSource.Task;
+            Task.WaitAll(task);
         }
 
         private static void GenerateCertificate(string certPath, string certHost)
@@ -270,31 +213,6 @@ namespace Emby.Server
             //CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, _logger);
         }
 
-        /// <summary>
-        /// Starts the service.
-        /// </summary>
-        private static void StartService(ILogManager logManager)
-        {
-        }
-
-        /// <summary>
-        /// Handles the Disposed event of the service control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        static void service_Disposed(object sender, EventArgs e)
-        {
-            ApplicationTaskCompletionSource.SetResult(true);
-            OnServiceShutdown();
-        }
-
-        private static void OnServiceShutdown()
-        {
-            _logger.Info("Shutting down");
-
-            DisposeAppHost();
-        }
-
         /// <summary>
         /// Handles the UnhandledException event of the CurrentDomain control.
         /// </summary>
@@ -306,10 +224,7 @@ namespace Emby.Server
 
             new UnhandledExceptionWriter(_appHost.ServerConfigurationManager.ApplicationPaths, _logger, _appHost.LogManager).Log(exception);
 
-            if (!_isRunningAsService)
-            {
-                ShowMessageBox("Unhandled exception: " + exception.Message);
-            }
+            ShowMessageBox("Unhandled exception: " + exception.Message);
 
             if (!Debugger.IsAttached)
             {
@@ -325,29 +240,6 @@ namespace Emby.Server
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
         private static bool PerformUpdateIfNeeded(ServerApplicationPaths appPaths, ILogger logger)
         {
-            // Look for the existence of an update archive
-            var updateArchive = Path.Combine(appPaths.TempUpdatePath, "MBServer" + ".zip");
-            if (File.Exists(updateArchive))
-            {
-                logger.Info("An update is available from {0}", updateArchive);
-
-                // Update is there - execute update
-                try
-                {
-                    //var serviceName = _isRunningAsService ? BackgroundService.GetExistingServiceName() : string.Empty;
-                    //new ApplicationUpdater().UpdateApplication(appPaths, updateArchive, logger, serviceName);
-
-                    // And just let the app exit so it can update
-                    return true;
-                }
-                catch (Exception e)
-                {
-                    logger.ErrorException("Error starting updater.", e);
-
-                    ShowMessageBox(string.Format("Error attempting to update application.\n\n{0}\n\n{1}", e.GetType().Name, e.Message));
-                }
-            }
-
             return false;
         }
 
@@ -358,37 +250,25 @@ namespace Emby.Server
 
         public static void Shutdown()
         {
-            if (_isRunningAsService)
-            {
-                ShutdownWindowsService();
-            }
-            else
-            {
-                DisposeAppHost();
+            DisposeAppHost();
 
-                ShutdownWindowsApplication();
-            }
+            //_logger.Info("Calling Application.Exit");
+            //Application.Exit();
+
+            _logger.Info("Calling Environment.Exit");
+            Environment.Exit(0);
+
+            _logger.Info("Calling ApplicationTaskCompletionSource.SetResult");
+            ApplicationTaskCompletionSource.SetResult(true);
         }
 
         public static void Restart()
         {
             DisposeAppHost();
 
-            if (_isRunningAsService)
-            {
-                RestartWindowsService();
-            }
-            else
-            {
-                //_logger.Info("Hiding server notify icon");
-                //_serverNotifyIcon.Visible = false;
+            // todo: start new instance
 
-                _logger.Info("Starting new instance");
-                //Application.Restart();
-                Process.Start(_appHost.ServerConfigurationManager.ApplicationPaths.ApplicationPath);
-
-                ShutdownWindowsApplication();
-            }
+            Shutdown();
         }
 
         private static void DisposeAppHost()
@@ -402,31 +282,6 @@ namespace Emby.Server
             }
         }
 
-        private static void ShutdownWindowsApplication()
-        {
-            //_logger.Info("Calling Application.Exit");
-            //Application.Exit();
-
-            _logger.Info("Calling Environment.Exit");
-            Environment.Exit(0);
-
-            _logger.Info("Calling ApplicationTaskCompletionSource.SetResult");
-            ApplicationTaskCompletionSource.SetResult(true);
-        }
-
-        private static void ShutdownWindowsService()
-        {
-        }
-
-        private static void RestartWindowsService()
-        {
-        }
-
-        private static bool CanRestartWindowsService()
-        {
-            return false;
-        }
-
         /// <summary>
         /// Sets the error mode.
         /// </summary>
diff --git a/src/Emby.Server/project.json b/src/Emby.Server/project.json
index c64db844f..55acee514 100644
--- a/src/Emby.Server/project.json
+++ b/src/Emby.Server/project.json
@@ -12,10 +12,10 @@
       "version": "1.0.1"
     },
     "Mono.Nat": "1.0.0-*",
-	"Microsoft.Win32.Registry": "4.0.0",
-	"System.Runtime.Extensions": "4.1.0",
-	"System.Diagnostics.Process": "4.1.0",
-	"Microsoft.Data.SQLite": "1.0.0"
+    "Microsoft.Win32.Registry": "4.0.0",
+    "System.Runtime.Extensions": "4.1.0",
+    "System.Diagnostics.Process": "4.1.0",
+    "Microsoft.Data.SQLite": "1.1.0-preview1-final"
   },
 
   "frameworks": {
-- 
cgit v1.2.3


From 65a1ef020b205b1676bd7dd70e7261a1fa29b7a2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Nov 2016 00:52:49 -0500
Subject: move sync repository to portable project

---
 Emby.Common.Implementations/BaseApplicationHost.cs |   1 -
 .../ScheduledTasks/TaskManager.cs                  |  26 +-
 .../Updates/GithubUpdater.cs                       | 269 ------
 Emby.Server.Core/ApplicationHost.cs                |  24 +-
 Emby.Server.Core/Browser/BrowserLauncher.cs        |  75 --
 Emby.Server.Core/Data/SqliteItemRepository.cs      |  29 +-
 .../EntryPoints/ExternalPortForwarding.cs          |   3 +-
 Emby.Server.Core/EntryPoints/StartupWizard.cs      |  59 --
 Emby.Server.Core/HttpServerFactory.cs              |   6 +-
 Emby.Server.Core/Migrations/DbMigration.cs         |  64 --
 .../Migrations/UpdateLevelMigration.cs             | 131 ---
 Emby.Server.Core/Sync/SyncRepository.cs            | 976 ---------------------
 .../Activity/ActivityRepository.cs                 |   2 +-
 .../Browser/BrowserLauncher.cs                     |  73 ++
 .../Data/BaseSqliteRepository.cs                   |  20 +-
 .../Data/CleanDatabaseScheduledTask.cs             | 148 +---
 .../Emby.Server.Implementations.csproj             |   4 +
 .../EntryPoints/StartupWizard.cs                   |  59 ++
 .../FileOrganization/OrganizerScheduledTask.cs     |   2 +-
 .../HttpServer/HttpListenerHost.cs                 |   8 +-
 .../Migrations/UpdateLevelMigration.cs             | 130 +++
 .../Security/AuthenticationRepository.cs           |   4 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs | 770 ++++++++++++++++
 Emby.Server.Implementations/TV/TVSeriesManager.cs  |   4 -
 MediaBrowser.Api/StartupWizardService.cs           |   1 -
 MediaBrowser.Common/MediaBrowser.Common.csproj     |   1 +
 MediaBrowser.Common/Updates/GithubUpdater.cs       | 269 ++++++
 .../Entities/InternalItemsQuery.cs                 |   1 -
 MediaBrowser.Controller/Entities/TV/Series.cs      |   4 -
 .../Configuration/ServerConfiguration.cs           |   4 -
 MediaBrowser.Model/Tasks/ITaskManager.cs           |   2 -
 MediaBrowser.Server.Mono/MonoAppHost.cs            |  26 +
 MediaBrowser.Server.Mono/Native/MonoFileSystem.cs  |   3 +-
 MediaBrowser.ServerApplication/MainStartup.cs      |   2 +-
 MediaBrowser.ServerApplication/ServerNotifyIcon.cs |   2 +-
 MediaBrowser.ServerApplication/WindowsAppHost.cs   |   9 +
 36 files changed, 1392 insertions(+), 1819 deletions(-)
 delete mode 100644 Emby.Common.Implementations/Updates/GithubUpdater.cs
 delete mode 100644 Emby.Server.Core/Browser/BrowserLauncher.cs
 delete mode 100644 Emby.Server.Core/EntryPoints/StartupWizard.cs
 delete mode 100644 Emby.Server.Core/Migrations/DbMigration.cs
 delete mode 100644 Emby.Server.Core/Migrations/UpdateLevelMigration.cs
 delete mode 100644 Emby.Server.Core/Sync/SyncRepository.cs
 create mode 100644 Emby.Server.Implementations/Browser/BrowserLauncher.cs
 create mode 100644 Emby.Server.Implementations/EntryPoints/StartupWizard.cs
 create mode 100644 Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs
 create mode 100644 Emby.Server.Implementations/Sync/SyncRepository.cs
 create mode 100644 MediaBrowser.Common/Updates/GithubUpdater.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs
index 1f194968c..02d7cb31f 100644
--- a/Emby.Common.Implementations/BaseApplicationHost.cs
+++ b/Emby.Common.Implementations/BaseApplicationHost.cs
@@ -4,7 +4,6 @@ using Emby.Common.Implementations.Devices;
 using Emby.Common.Implementations.IO;
 using Emby.Common.Implementations.ScheduledTasks;
 using Emby.Common.Implementations.Serialization;
-using Emby.Common.Implementations.Updates;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Progress;
diff --git a/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs b/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs
index 218af7ed5..b0153c588 100644
--- a/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs
+++ b/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs
@@ -55,25 +55,6 @@ namespace Emby.Common.Implementations.ScheduledTasks
         private ILogger Logger { get; set; }
         private readonly IFileSystem _fileSystem;
 
-        private bool _suspendTriggers;
-
-        public bool SuspendTriggers
-        {
-            get { return _suspendTriggers; }
-            set
-            {
-                Logger.Info("Setting SuspendTriggers to {0}", value);
-                var executeQueued = _suspendTriggers && !value;
-
-                _suspendTriggers = value;
-
-                if (executeQueued)
-                {
-                    ExecuteQueuedTasks();
-                }
-            }
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="TaskManager" /> class.
         /// </summary>
@@ -230,7 +211,7 @@ namespace Emby.Common.Implementations.ScheduledTasks
 
             lock (_taskQueue)
             {
-                if (task.State == TaskState.Idle && !SuspendTriggers)
+                if (task.State == TaskState.Idle)
                 {
                     Execute(task, options);
                     return;
@@ -322,11 +303,6 @@ namespace Emby.Common.Implementations.ScheduledTasks
         /// </summary>
         private void ExecuteQueuedTasks()
         {
-            if (SuspendTriggers)
-            {
-                return;
-            }
-
             Logger.Info("ExecuteQueuedTasks");
 
             // Execute queued tasks
diff --git a/Emby.Common.Implementations/Updates/GithubUpdater.cs b/Emby.Common.Implementations/Updates/GithubUpdater.cs
deleted file mode 100644
index 42bc29ed5..000000000
--- a/Emby.Common.Implementations/Updates/GithubUpdater.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Updates;
-
-namespace Emby.Common.Implementations.Updates
-{
-    public class GithubUpdater
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly IJsonSerializer _jsonSerializer;
-
-        public GithubUpdater(IHttpClient httpClient, IJsonSerializer jsonSerializer)
-        {
-            _httpClient = httpClient;
-            _jsonSerializer = jsonSerializer;
-        }
-
-        public async Task<CheckForUpdateResult> CheckForUpdateResult(string organzation, string repository, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename, TimeSpan cacheLength, CancellationToken cancellationToken)
-        {
-            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
-
-            var options = new HttpRequestOptions
-            {
-                Url = url,
-                EnableKeepAlive = false,
-                CancellationToken = cancellationToken,
-                UserAgent = "Emby/3.0",
-                BufferContent = false
-            };
-
-            if (cacheLength.Ticks > 0)
-            {
-                options.CacheMode = CacheMode.Unconditional;
-                options.CacheLength = cacheLength;
-            }
-
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
-            {
-                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
-
-                return CheckForUpdateResult(obj, minVersion, updateLevel, assetFilename, packageName, targetFilename);
-            }
-        }
-
-        private CheckForUpdateResult CheckForUpdateResult(RootObject[] obj, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename)
-        {
-            if (updateLevel == PackageVersionClass.Release)
-            {
-                // Technically all we need to do is check that it's not pre-release
-                // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
-                obj = obj.Where(i => !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) && !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
-            }
-            else if (updateLevel == PackageVersionClass.Beta)
-            {
-                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase)).ToArray();
-            }
-            else if (updateLevel == PackageVersionClass.Dev)
-            {
-                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) || i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
-            }
-
-            var availableUpdate = obj
-                .Select(i => CheckForUpdateResult(i, minVersion, assetFilename, packageName, targetFilename))
-                .Where(i => i != null)
-                .OrderByDescending(i => Version.Parse(i.AvailableVersion))
-                .FirstOrDefault();
-
-            return availableUpdate ?? new CheckForUpdateResult
-            {
-                IsUpdateAvailable = false
-            };
-        }
-
-        private bool MatchesUpdateLevel(RootObject i, PackageVersionClass updateLevel)
-        {
-            if (updateLevel == PackageVersionClass.Beta)
-            {
-                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase);
-            }
-            if (updateLevel == PackageVersionClass.Dev)
-            {
-                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) ||
-                       i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
-            }
-
-            // Technically all we need to do is check that it's not pre-release
-            // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
-            return !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) &&
-                   !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
-        }
-
-        public async Task<List<RootObject>> GetLatestReleases(string organzation, string repository, string assetFilename, CancellationToken cancellationToken)
-        {
-            var list = new List<RootObject>();
-
-            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
-
-            var options = new HttpRequestOptions
-            {
-                Url = url,
-                EnableKeepAlive = false,
-                CancellationToken = cancellationToken,
-                UserAgent = "Emby/3.0",
-                BufferContent = false
-            };
-
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
-            {
-                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
-
-                obj = obj.Where(i => (i.assets ?? new List<Asset>()).Any(a => IsAsset(a, assetFilename))).ToArray();
-
-                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Release)).OrderByDescending(GetVersion).Take(1));
-                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Beta)).OrderByDescending(GetVersion).Take(1));
-                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Dev)).OrderByDescending(GetVersion).Take(1));
-
-                return list;
-            }
-        }
-
-        public Version GetVersion(RootObject obj)
-        {
-            Version version;
-            if (!Version.TryParse(obj.tag_name, out version))
-            {
-                return new Version(1, 0);
-            }
-
-            return version;
-        }
-
-        private CheckForUpdateResult CheckForUpdateResult(RootObject obj, Version minVersion, string assetFilename, string packageName, string targetFilename)
-        {
-            Version version;
-            if (!Version.TryParse(obj.tag_name, out version))
-            {
-                return null;
-            }
-
-            if (version < minVersion)
-            {
-                return null;
-            }
-
-            var asset = (obj.assets ?? new List<Asset>()).FirstOrDefault(i => IsAsset(i, assetFilename));
-
-            if (asset == null)
-            {
-                return null;
-            }
-
-            return new CheckForUpdateResult
-            {
-                AvailableVersion = version.ToString(),
-                IsUpdateAvailable = version > minVersion,
-                Package = new PackageVersionInfo
-                {
-                    classification = obj.prerelease ?
-                        (obj.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase) ? PackageVersionClass.Dev : PackageVersionClass.Beta) :
-                        PackageVersionClass.Release,
-                    name = packageName,
-                    sourceUrl = asset.browser_download_url,
-                    targetFilename = targetFilename,
-                    versionStr = version.ToString(),
-                    requiredVersionStr = "1.0.0",
-                    description = obj.body,
-                    infoUrl = obj.html_url
-                }
-            };
-        }
-
-        private bool IsAsset(Asset asset, string assetFilename)
-        {
-            var downloadFilename = Path.GetFileName(asset.browser_download_url) ?? string.Empty;
-
-            if (downloadFilename.IndexOf(assetFilename, StringComparison.OrdinalIgnoreCase) != -1)
-            {
-                return true;
-            }
-
-            return string.Equals(assetFilename, downloadFilename, StringComparison.OrdinalIgnoreCase);
-        }
-
-        public class Uploader
-        {
-            public string login { get; set; }
-            public int id { get; set; }
-            public string avatar_url { get; set; }
-            public string gravatar_id { get; set; }
-            public string url { get; set; }
-            public string html_url { get; set; }
-            public string followers_url { get; set; }
-            public string following_url { get; set; }
-            public string gists_url { get; set; }
-            public string starred_url { get; set; }
-            public string subscriptions_url { get; set; }
-            public string organizations_url { get; set; }
-            public string repos_url { get; set; }
-            public string events_url { get; set; }
-            public string received_events_url { get; set; }
-            public string type { get; set; }
-            public bool site_admin { get; set; }
-        }
-
-        public class Asset
-        {
-            public string url { get; set; }
-            public int id { get; set; }
-            public string name { get; set; }
-            public object label { get; set; }
-            public Uploader uploader { get; set; }
-            public string content_type { get; set; }
-            public string state { get; set; }
-            public int size { get; set; }
-            public int download_count { get; set; }
-            public string created_at { get; set; }
-            public string updated_at { get; set; }
-            public string browser_download_url { get; set; }
-        }
-
-        public class Author
-        {
-            public string login { get; set; }
-            public int id { get; set; }
-            public string avatar_url { get; set; }
-            public string gravatar_id { get; set; }
-            public string url { get; set; }
-            public string html_url { get; set; }
-            public string followers_url { get; set; }
-            public string following_url { get; set; }
-            public string gists_url { get; set; }
-            public string starred_url { get; set; }
-            public string subscriptions_url { get; set; }
-            public string organizations_url { get; set; }
-            public string repos_url { get; set; }
-            public string events_url { get; set; }
-            public string received_events_url { get; set; }
-            public string type { get; set; }
-            public bool site_admin { get; set; }
-        }
-
-        public class RootObject
-        {
-            public string url { get; set; }
-            public string assets_url { get; set; }
-            public string upload_url { get; set; }
-            public string html_url { get; set; }
-            public int id { get; set; }
-            public string tag_name { get; set; }
-            public string target_commitish { get; set; }
-            public string name { get; set; }
-            public bool draft { get; set; }
-            public Author author { get; set; }
-            public bool prerelease { get; set; }
-            public string created_at { get; set; }
-            public string published_at { get; set; }
-            public List<Asset> assets { get; set; }
-            public string tarball_url { get; set; }
-            public string zipball_url { get; set; }
-            public string body { get; set; }
-        }
-    }
-}
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 6073991b1..00b9b99e6 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -65,7 +65,6 @@ using Emby.Common.Implementations.Networking;
 using Emby.Common.Implementations.Reflection;
 using Emby.Common.Implementations.Serialization;
 using Emby.Common.Implementations.TextEncoding;
-using Emby.Common.Implementations.Updates;
 using Emby.Common.Implementations.Xml;
 using Emby.Photos;
 using MediaBrowser.Model.IO;
@@ -90,10 +89,10 @@ using Emby.Server.Implementations.Devices;
 using Emby.Server.Implementations.FFMpeg;
 using Emby.Server.Core.IO;
 using Emby.Server.Core.Localization;
-using Emby.Server.Core.Migrations;
+using Emby.Server.Implementations.Migrations;
 using Emby.Server.Implementations.Security;
 using Emby.Server.Implementations.Social;
-using Emby.Server.Core.Sync;
+using Emby.Server.Implementations.Sync;
 using Emby.Server.Implementations.Channels;
 using Emby.Server.Implementations.Collections;
 using Emby.Server.Implementations.Connect;
@@ -357,12 +356,6 @@ namespace Emby.Server.Core
         {
             await PerformPreInitMigrations().ConfigureAwait(false);
 
-            if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion &&
-                ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
-            {
-                TaskManager.SuspendTriggers = true;
-            }
-
             await base.RunStartupTasks().ConfigureAwait(false);
 
             await MediaEncoder.Init().ConfigureAwait(false);
@@ -494,7 +487,6 @@ namespace Emby.Server.Core
         {
             var migrations = new List<IVersionMigration>
             {
-                new DbMigration(ServerConfigurationManager, TaskManager)
             };
 
             foreach (var task in migrations)
@@ -568,7 +560,7 @@ namespace Emby.Server.Core
             AuthenticationRepository = await GetAuthenticationRepository().ConfigureAwait(false);
             RegisterSingleInstance(AuthenticationRepository);
 
-            SyncRepository = await GetSyncRepository().ConfigureAwait(false);
+            SyncRepository = GetSyncRepository();
             RegisterSingleInstance(SyncRepository);
 
             UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService, () => ConnectManager, this, JsonSerializer, FileSystemManager, CryptographyProvider, _defaultUserNameFactory());
@@ -591,7 +583,7 @@ namespace Emby.Server.Core
             CertificatePath = GetCertificatePath(true);
             Certificate = GetCertificate(CertificatePath);
 
-            HttpServer = HttpServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamFactory, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer, EnvironmentInfo, Certificate);
+            HttpServer = HttpServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamFactory, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer, EnvironmentInfo, Certificate, SupportsDualModeSockets);
             HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading");
             RegisterSingleInstance(HttpServer, false);
             progress.Report(10);
@@ -714,6 +706,8 @@ namespace Emby.Server.Core
             await ((UserManager)UserManager).Initialize().ConfigureAwait(false);
         }
 
+        protected abstract bool SupportsDualModeSockets { get; }
+
         private ICertificate GetCertificate(string certificateLocation)
         {
             if (string.IsNullOrWhiteSpace(certificateLocation))
@@ -844,11 +838,11 @@ namespace Emby.Server.Core
             return repo;
         }
 
-        private async Task<ISyncRepository> GetSyncRepository()
+        private ISyncRepository GetSyncRepository()
         {
-            var repo = new SyncRepository(LogManager, JsonSerializer, ServerConfigurationManager.ApplicationPaths, GetDbConnector());
+            var repo = new SyncRepository(LogManager.GetLogger("SyncRepository"), JsonSerializer, ServerConfigurationManager.ApplicationPaths);
 
-            await repo.Initialize().ConfigureAwait(false);
+            repo.Initialize();
 
             return repo;
         }
diff --git a/Emby.Server.Core/Browser/BrowserLauncher.cs b/Emby.Server.Core/Browser/BrowserLauncher.cs
deleted file mode 100644
index 4ccc41c30..000000000
--- a/Emby.Server.Core/Browser/BrowserLauncher.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using MediaBrowser.Controller;
-using System;
-
-namespace Emby.Server.Core.Browser
-{
-    /// <summary>
-    /// Class BrowserLauncher
-    /// </summary>
-    public static class BrowserLauncher
-    {
-        /// <summary>
-        /// Opens the dashboard page.
-        /// </summary>
-        /// <param name="page">The page.</param>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenDashboardPage(string page, IServerApplicationHost appHost)
-        {
-            var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
-
-            OpenUrl(appHost, url);
-        }
-
-        /// <summary>
-        /// Opens the community.
-        /// </summary>
-        public static void OpenCommunity(IServerApplicationHost appHost)
-        {
-            OpenUrl(appHost, "http://emby.media/community");
-        }
-
-        public static void OpenEmbyPremiere(IServerApplicationHost appHost)
-        {
-            OpenDashboardPage("supporterkey.html", appHost);
-        }
-
-        /// <summary>
-        /// Opens the web client.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenWebClient(IServerApplicationHost appHost)
-        {
-            OpenDashboardPage("index.html", appHost);
-        }
-
-        /// <summary>
-        /// Opens the dashboard.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenDashboard(IServerApplicationHost appHost)
-        {
-            OpenDashboardPage("dashboard.html", appHost);
-        }
-
-        /// <summary>
-        /// Opens the URL.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        private static void OpenUrl(IServerApplicationHost appHost, string url)
-        {
-            try
-            {
-                appHost.LaunchUrl(url);
-            }
-            catch (NotImplementedException)
-            {
-                
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Error launching url: " + url);
-                Console.WriteLine(ex.Message);
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Core/Data/SqliteItemRepository.cs b/Emby.Server.Core/Data/SqliteItemRepository.cs
index ed03c0f67..2f08081f6 100644
--- a/Emby.Server.Core/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Core/Data/SqliteItemRepository.cs
@@ -3060,18 +3060,6 @@ namespace Emby.Server.Core.Data
             {
                 //whereClauses.Add("(UserId is null or UserId=@UserId)");
             }
-            if (query.IsCurrentSchema.HasValue)
-            {
-                if (query.IsCurrentSchema.Value)
-                {
-                    whereClauses.Add("(SchemaVersion not null AND SchemaVersion=@SchemaVersion)");
-                }
-                else
-                {
-                    whereClauses.Add("(SchemaVersion is null or SchemaVersion<>@SchemaVersion)");
-                }
-                cmd.Parameters.Add(cmd, "@SchemaVersion", DbType.Int32).Value = LatestSchemaVersion;
-            }
             if (query.IsHD.HasValue)
             {
                 whereClauses.Add("IsHD=@IsHD");
@@ -3454,7 +3442,7 @@ namespace Emby.Server.Core.Data
                 cmd.Parameters.Add(cmd, "@NameLessThan", DbType.String).Value = query.NameLessThan.ToLower();
             }
 
-            if (query.ImageTypes.Length > 0 && _config.Configuration.SchemaVersion >= 87)
+            if (query.ImageTypes.Length > 0)
             {
                 foreach (var requiredImage in query.ImageTypes)
                 {
@@ -3738,15 +3726,8 @@ namespace Emby.Server.Core.Data
             }
             if (query.IsVirtualItem.HasValue)
             {
-                if (_config.Configuration.SchemaVersion >= 90)
-                {
-                    whereClauses.Add("IsVirtualItem=@IsVirtualItem");
-                    cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value;
-                }
-                else if (!query.IsVirtualItem.Value)
-                {
-                    whereClauses.Add("LocationType<>'Virtual'");
-                }
+                whereClauses.Add("IsVirtualItem=@IsVirtualItem");
+                cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value;
             }
             if (query.IsSpecialSeason.HasValue)
             {
@@ -3770,7 +3751,7 @@ namespace Emby.Server.Core.Data
                     whereClauses.Add("PremiereDate < DATETIME('now')");
                 }
             }
-            if (query.IsMissing.HasValue && _config.Configuration.SchemaVersion >= 90)
+            if (query.IsMissing.HasValue)
             {
                 if (query.IsMissing.Value)
                 {
@@ -3781,7 +3762,7 @@ namespace Emby.Server.Core.Data
                     whereClauses.Add("(IsVirtualItem=0 OR PremiereDate >= DATETIME('now'))");
                 }
             }
-            if (query.IsVirtualUnaired.HasValue && _config.Configuration.SchemaVersion >= 90)
+            if (query.IsVirtualUnaired.HasValue)
             {
                 if (query.IsVirtualUnaired.Value)
                 {
diff --git a/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
index c1a19a71f..11e275940 100644
--- a/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
@@ -95,7 +95,7 @@ namespace Emby.Server.Core.EntryPoints
 
             NatUtility.StartDiscovery();
 
-            _timer = _timerFactory.Create(ClearCreatedRules, null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5));
+            _timer = _timerFactory.Create(ClearCreatedRules, null, TimeSpan.FromMinutes(10), TimeSpan.FromMinutes(10));
 
             _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered;
 
@@ -233,6 +233,7 @@ namespace Emby.Server.Core.EntryPoints
                 await device.CreatePortMap(new Mapping(Protocol.Tcp, privatePort, publicPort)
                 {
                     Description = _appHost.Name
+
                 }).ConfigureAwait(false);
             }
             catch (Exception ex)
diff --git a/Emby.Server.Core/EntryPoints/StartupWizard.cs b/Emby.Server.Core/EntryPoints/StartupWizard.cs
deleted file mode 100644
index 30ceca073..000000000
--- a/Emby.Server.Core/EntryPoints/StartupWizard.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Model.Logging;
-using Emby.Server.Core.Browser;
-
-namespace Emby.Server.Core.EntryPoints
-{
-    /// <summary>
-    /// Class StartupWizard
-    /// </summary>
-    public class StartupWizard : IServerEntryPoint
-    {
-        /// <summary>
-        /// The _app host
-        /// </summary>
-        private readonly IServerApplicationHost _appHost;
-        /// <summary>
-        /// The _user manager
-        /// </summary>
-        private readonly ILogger _logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartupWizard" /> class.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        /// <param name="logger">The logger.</param>
-        public StartupWizard(IServerApplicationHost appHost, ILogger logger)
-        {
-            _appHost = appHost;
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Runs this instance.
-        /// </summary>
-        public void Run()
-        {
-            if (_appHost.IsFirstRun)
-            {
-                LaunchStartupWizard();
-            }
-        }
-
-        /// <summary>
-        /// Launches the startup wizard.
-        /// </summary>
-        private void LaunchStartupWizard()
-        {
-            BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost);
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Emby.Server.Core/HttpServerFactory.cs b/Emby.Server.Core/HttpServerFactory.cs
index d6c07e258..8ec5fb026 100644
--- a/Emby.Server.Core/HttpServerFactory.cs
+++ b/Emby.Server.Core/HttpServerFactory.cs
@@ -44,7 +44,8 @@ namespace Emby.Server.Core
             IJsonSerializer json,
             IXmlSerializer xml,
             IEnvironmentInfo environment,
-            ICertificate certificate)
+            ICertificate certificate,
+            bool enableDualModeSockets)
         {
             var logger = logManager.GetLogger("HttpServer");
 
@@ -63,7 +64,8 @@ namespace Emby.Server.Core
                 environment,
                 certificate,
                 new StreamFactory(),
-                GetParseFn);
+                GetParseFn,
+                enableDualModeSockets);
         }
 
         private static Func<string, object> GetParseFn(Type propertyType)
diff --git a/Emby.Server.Core/Migrations/DbMigration.cs b/Emby.Server.Core/Migrations/DbMigration.cs
deleted file mode 100644
index 5d652770f..000000000
--- a/Emby.Server.Core/Migrations/DbMigration.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.Threading.Tasks;
-using Emby.Server.Implementations.Data;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Model.Tasks;
-using Emby.Server.Core.Data;
-using Emby.Server.Implementations.Migrations;
-
-namespace Emby.Server.Core.Migrations
-{
-    public class DbMigration : IVersionMigration
-    {
-        private readonly IServerConfigurationManager _config;
-        private readonly ITaskManager _taskManager;
-
-        public DbMigration(IServerConfigurationManager config, ITaskManager taskManager)
-        {
-            _config = config;
-            _taskManager = taskManager;
-        }
-
-        public async Task Run()
-        {
-            // If a forced migration is required, do that now
-            if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
-            {
-                if (!_config.Configuration.IsStartupWizardCompleted)
-                {
-                    _config.Configuration.MigrationVersion = CleanDatabaseScheduledTask.MigrationVersion;
-                    _config.SaveConfiguration();
-                    return;
-                }
-
-                _taskManager.SuspendTriggers = true;
-                CleanDatabaseScheduledTask.EnableUnavailableMessage = true;
-                
-                Task.Run(async () =>
-                {
-                    await Task.Delay(1000).ConfigureAwait(false);
-
-                    _taskManager.Execute<CleanDatabaseScheduledTask>();
-                });
-
-                return;
-            }
-            
-            if (_config.Configuration.SchemaVersion < SqliteItemRepository.LatestSchemaVersion)
-            {
-                if (!_config.Configuration.IsStartupWizardCompleted)
-                {
-                    _config.Configuration.SchemaVersion = SqliteItemRepository.LatestSchemaVersion;
-                    _config.SaveConfiguration();
-                    return;
-                }
-
-                Task.Run(async () =>
-                {
-                    await Task.Delay(1000).ConfigureAwait(false);
-
-                    _taskManager.Execute<CleanDatabaseScheduledTask>();
-                });
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Core/Migrations/UpdateLevelMigration.cs b/Emby.Server.Core/Migrations/UpdateLevelMigration.cs
deleted file mode 100644
index c79dbabea..000000000
--- a/Emby.Server.Core/Migrations/UpdateLevelMigration.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.Common.Implementations.Updates;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Updates;
-using Emby.Server.Implementations.Migrations;
-
-namespace Emby.Server.Core.Migrations
-{
-    public class UpdateLevelMigration : IVersionMigration
-    {
-        private readonly IServerConfigurationManager _config;
-        private readonly IServerApplicationHost _appHost;
-        private readonly IHttpClient _httpClient;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly string _releaseAssetFilename;
-        private readonly ILogger _logger;
-
-        public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename, ILogger logger)
-        {
-            _config = config;
-            _appHost = appHost;
-            _httpClient = httpClient;
-            _jsonSerializer = jsonSerializer;
-            _releaseAssetFilename = releaseAssetFilename;
-            _logger = logger;
-        }
-
-        public async Task Run()
-        {
-            var lastVersion = _config.Configuration.LastVersion;
-            var currentVersion = _appHost.ApplicationVersion;
-
-            if (string.Equals(lastVersion, currentVersion.ToString(), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            try
-            {
-                var updateLevel = _config.Configuration.SystemUpdateLevel;
-
-                await CheckVersion(currentVersion, updateLevel, CancellationToken.None).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error in update migration", ex);
-            }
-        }
-
-        private async Task CheckVersion(Version currentVersion, PackageVersionClass currentUpdateLevel, CancellationToken cancellationToken)
-        {
-            var releases = await new GithubUpdater(_httpClient, _jsonSerializer)
-                .GetLatestReleases("MediaBrowser", "Emby", _releaseAssetFilename, cancellationToken).ConfigureAwait(false);
-
-            var newUpdateLevel = GetNewUpdateLevel(currentVersion, currentUpdateLevel, releases);
-
-            if (newUpdateLevel != currentUpdateLevel)
-            {
-                _config.Configuration.SystemUpdateLevel = newUpdateLevel;
-                _config.SaveConfiguration();
-            }
-        }
-
-        private PackageVersionClass GetNewUpdateLevel(Version currentVersion, PackageVersionClass currentUpdateLevel, List<GithubUpdater.RootObject> releases)
-        {
-            var newUpdateLevel = currentUpdateLevel;
-
-            // If the current version is later than current stable, set the update level to beta
-            if (releases.Count >= 1)
-            {
-                var release = releases[0];
-                var version = ParseVersion(release.tag_name);
-                if (version != null)
-                {
-                    if (currentVersion > version)
-                    {
-                        newUpdateLevel = PackageVersionClass.Beta;
-                    }
-                    else
-                    {
-                        return PackageVersionClass.Release;
-                    }
-                }
-            }
-
-            // If the current version is later than current beta, set the update level to dev
-            if (releases.Count >= 2)
-            {
-                var release = releases[1];
-                var version = ParseVersion(release.tag_name);
-                if (version != null)
-                {
-                    if (currentVersion > version)
-                    {
-                        newUpdateLevel = PackageVersionClass.Dev;
-                    }
-                    else
-                    {
-                        return PackageVersionClass.Beta;
-                    }
-                }
-            }
-
-            return newUpdateLevel;
-        }
-
-        private Version ParseVersion(string versionString)
-        {
-            if (!string.IsNullOrWhiteSpace(versionString))
-            {
-                var parts = versionString.Split('.');
-                if (parts.Length == 3)
-                {
-                    versionString += ".0";
-                }
-            }
-
-            Version version;
-            Version.TryParse(versionString, out version);
-
-            return version;
-        }
-    }
-}
diff --git a/Emby.Server.Core/Sync/SyncRepository.cs b/Emby.Server.Core/Sync/SyncRepository.cs
deleted file mode 100644
index bfcf76767..000000000
--- a/Emby.Server.Core/Sync/SyncRepository.cs
+++ /dev/null
@@ -1,976 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Emby.Server.Core.Data;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Sync;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Sync;
-
-namespace Emby.Server.Core.Sync
-{
-    public class SyncRepository : BaseSqliteRepository, ISyncRepository
-    {
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
-        private readonly IJsonSerializer _json;
-
-        public SyncRepository(ILogManager logManager, IJsonSerializer json, IServerApplicationPaths appPaths, IDbConnector connector)
-            : base(logManager, connector)
-        {
-            _json = json;
-            DbFilePath = Path.Combine(appPaths.DataPath, "sync14.db");
-        }
-
-        private class SyncSummary
-        {
-            public Dictionary<string, int> Items { get; set; }
-
-            public SyncSummary()
-            {
-                Items = new Dictionary<string, int>();
-            }
-        }
-
-
-        public async Task Initialize()
-        {
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                string[] queries = {
-
-                                "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Profile TEXT, Quality TEXT, Bitrate INT, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
-
-                                "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT, JobItemIndex INT, ItemDateModifiedTicks BIGINT)",
-
-                                "drop index if exists idx_SyncJobItems2",
-                                "drop index if exists idx_SyncJobItems3",
-                                "drop index if exists idx_SyncJobs1",
-                                "drop index if exists idx_SyncJobs",
-                                "drop index if exists idx_SyncJobItems1",
-                                "create index if not exists idx_SyncJobItems4 on SyncJobItems(TargetId,ItemId,Status,Progress,DateCreated)",
-                                "create index if not exists idx_SyncJobItems5 on SyncJobItems(TargetId,Status,ItemId,Progress)",
-
-                                "create index if not exists idx_SyncJobs2 on SyncJobs(TargetId,Status,ItemIds,Progress)",
-
-                                "pragma shrink_memory"
-                               };
-
-                connection.RunQueries(queries, Logger);
-
-                connection.AddColumn(Logger, "SyncJobs", "Profile", "TEXT");
-                connection.AddColumn(Logger, "SyncJobs", "Bitrate", "INT");
-                connection.AddColumn(Logger, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT");
-            }
-        }
-
-        private const string BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
-        private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks from SyncJobItems";
-
-        public SyncJob GetJob(string id)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            CheckDisposed();
-
-            var guid = new Guid(id);
-
-            if (guid == Guid.Empty)
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            using (var connection = CreateConnection(true).Result)
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = BaseJobSelectText + " where Id=@Id";
-
-                    cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-                    {
-                        if (reader.Read())
-                        {
-                            return GetJob(reader);
-                        }
-                    }
-                }
-
-                return null;
-            }
-        }
-
-        private SyncJob GetJob(IDataReader reader)
-        {
-            var info = new SyncJob
-            {
-                Id = reader.GetGuid(0).ToString("N"),
-                TargetId = reader.GetString(1),
-                Name = reader.GetString(2)
-            };
-
-            if (!reader.IsDBNull(3))
-            {
-                info.Profile = reader.GetString(3);
-            }
-
-            if (!reader.IsDBNull(4))
-            {
-                info.Quality = reader.GetString(4);
-            }
-
-            if (!reader.IsDBNull(5))
-            {
-                info.Bitrate = reader.GetInt32(5);
-            }
-
-            if (!reader.IsDBNull(6))
-            {
-                info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader.GetString(6), true);
-            }
-
-            if (!reader.IsDBNull(7))
-            {
-                info.Progress = reader.GetDouble(7);
-            }
-
-            if (!reader.IsDBNull(8))
-            {
-                info.UserId = reader.GetString(8);
-            }
-
-            if (!reader.IsDBNull(9))
-            {
-                info.RequestedItemIds = reader.GetString(9).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            }
-
-            if (!reader.IsDBNull(10))
-            {
-                info.Category = (SyncCategory)Enum.Parse(typeof(SyncCategory), reader.GetString(10), true);
-            }
-
-            if (!reader.IsDBNull(11))
-            {
-                info.ParentId = reader.GetString(11);
-            }
-
-            if (!reader.IsDBNull(12))
-            {
-                info.UnwatchedOnly = reader.GetBoolean(12);
-            }
-
-            if (!reader.IsDBNull(13))
-            {
-                info.ItemLimit = reader.GetInt32(13);
-            }
-
-            info.SyncNewContent = reader.GetBoolean(14);
-
-            info.DateCreated = reader.GetDateTime(15).ToUniversalTime();
-            info.DateLastModified = reader.GetDateTime(16).ToUniversalTime();
-            info.ItemCount = reader.GetInt32(17);
-
-            return info;
-        }
-
-        public Task Create(SyncJob job)
-        {
-            return InsertOrUpdate(job, true);
-        }
-
-        public Task Update(SyncJob job)
-        {
-            return InsertOrUpdate(job, false);
-        }
-
-        private async Task InsertOrUpdate(SyncJob job, bool insert)
-        {
-            if (job == null)
-            {
-                throw new ArgumentNullException("job");
-            }
-
-            CheckDisposed();
-
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    if (insert)
-                    {
-                        cmd.CommandText = "insert into SyncJobs (Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Profile, @Quality, @Bitrate, @Status, @Progress, @UserId, @ItemIds, @Category, @ParentId, @UnwatchedOnly, @ItemLimit, @SyncNewContent, @DateCreated, @DateLastModified, @ItemCount)";
-
-                        cmd.Parameters.Add(cmd, "@Id");
-                        cmd.Parameters.Add(cmd, "@TargetId");
-                        cmd.Parameters.Add(cmd, "@Name");
-                        cmd.Parameters.Add(cmd, "@Profile");
-                        cmd.Parameters.Add(cmd, "@Quality");
-                        cmd.Parameters.Add(cmd, "@Bitrate");
-                        cmd.Parameters.Add(cmd, "@Status");
-                        cmd.Parameters.Add(cmd, "@Progress");
-                        cmd.Parameters.Add(cmd, "@UserId");
-                        cmd.Parameters.Add(cmd, "@ItemIds");
-                        cmd.Parameters.Add(cmd, "@Category");
-                        cmd.Parameters.Add(cmd, "@ParentId");
-                        cmd.Parameters.Add(cmd, "@UnwatchedOnly");
-                        cmd.Parameters.Add(cmd, "@ItemLimit");
-                        cmd.Parameters.Add(cmd, "@SyncNewContent");
-                        cmd.Parameters.Add(cmd, "@DateCreated");
-                        cmd.Parameters.Add(cmd, "@DateLastModified");
-                        cmd.Parameters.Add(cmd, "@ItemCount");
-                    }
-                    else
-                    {
-                        cmd.CommandText = "update SyncJobs set TargetId=@TargetId,Name=@Name,Profile=@Profile,Quality=@Quality,Bitrate=@Bitrate,Status=@Status,Progress=@Progress,UserId=@UserId,ItemIds=@ItemIds,Category=@Category,ParentId=@ParentId,UnwatchedOnly=@UnwatchedOnly,ItemLimit=@ItemLimit,SyncNewContent=@SyncNewContent,DateCreated=@DateCreated,DateLastModified=@DateLastModified,ItemCount=@ItemCount where Id=@Id";
-
-                        cmd.Parameters.Add(cmd, "@Id");
-                        cmd.Parameters.Add(cmd, "@TargetId");
-                        cmd.Parameters.Add(cmd, "@Name");
-                        cmd.Parameters.Add(cmd, "@Profile");
-                        cmd.Parameters.Add(cmd, "@Quality");
-                        cmd.Parameters.Add(cmd, "@Bitrate");
-                        cmd.Parameters.Add(cmd, "@Status");
-                        cmd.Parameters.Add(cmd, "@Progress");
-                        cmd.Parameters.Add(cmd, "@UserId");
-                        cmd.Parameters.Add(cmd, "@ItemIds");
-                        cmd.Parameters.Add(cmd, "@Category");
-                        cmd.Parameters.Add(cmd, "@ParentId");
-                        cmd.Parameters.Add(cmd, "@UnwatchedOnly");
-                        cmd.Parameters.Add(cmd, "@ItemLimit");
-                        cmd.Parameters.Add(cmd, "@SyncNewContent");
-                        cmd.Parameters.Add(cmd, "@DateCreated");
-                        cmd.Parameters.Add(cmd, "@DateLastModified");
-                        cmd.Parameters.Add(cmd, "@ItemCount");
-                    }
-
-                    IDbTransaction transaction = null;
-
-                    try
-                    {
-                        transaction = connection.BeginTransaction();
-
-                        var index = 0;
-
-                        cmd.GetParameter(index++).Value = new Guid(job.Id);
-                        cmd.GetParameter(index++).Value = job.TargetId;
-                        cmd.GetParameter(index++).Value = job.Name;
-                        cmd.GetParameter(index++).Value = job.Profile;
-                        cmd.GetParameter(index++).Value = job.Quality;
-                        cmd.GetParameter(index++).Value = job.Bitrate;
-                        cmd.GetParameter(index++).Value = job.Status.ToString();
-                        cmd.GetParameter(index++).Value = job.Progress;
-                        cmd.GetParameter(index++).Value = job.UserId;
-                        cmd.GetParameter(index++).Value = string.Join(",", job.RequestedItemIds.ToArray());
-                        cmd.GetParameter(index++).Value = job.Category;
-                        cmd.GetParameter(index++).Value = job.ParentId;
-                        cmd.GetParameter(index++).Value = job.UnwatchedOnly;
-                        cmd.GetParameter(index++).Value = job.ItemLimit;
-                        cmd.GetParameter(index++).Value = job.SyncNewContent;
-                        cmd.GetParameter(index++).Value = job.DateCreated;
-                        cmd.GetParameter(index++).Value = job.DateLastModified;
-                        cmd.GetParameter(index++).Value = job.ItemCount;
-
-                        cmd.Transaction = transaction;
-
-                        cmd.ExecuteNonQuery();
-
-                        transaction.Commit();
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        if (transaction != null)
-                        {
-                            transaction.Rollback();
-                        }
-
-                        throw;
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.ErrorException("Failed to save record:", e);
-
-                        if (transaction != null)
-                        {
-                            transaction.Rollback();
-                        }
-
-                        throw;
-                    }
-                    finally
-                    {
-                        if (transaction != null)
-                        {
-                            transaction.Dispose();
-                        }
-                    }
-                }
-            }
-        }
-
-        public async Task DeleteJob(string id)
-        {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            CheckDisposed();
-
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                using (var deleteJobCommand = connection.CreateCommand())
-                {
-                    using (var deleteJobItemsCommand = connection.CreateCommand())
-                    {
-                        IDbTransaction transaction = null;
-
-                        try
-                        {
-                            // _deleteJobCommand
-                            deleteJobCommand.CommandText = "delete from SyncJobs where Id=@Id";
-                            deleteJobCommand.Parameters.Add(deleteJobCommand, "@Id");
-
-                            transaction = connection.BeginTransaction();
-
-                            deleteJobCommand.GetParameter(0).Value = new Guid(id);
-                            deleteJobCommand.Transaction = transaction;
-                            deleteJobCommand.ExecuteNonQuery();
-
-                            // _deleteJobItemsCommand
-                            deleteJobItemsCommand.CommandText = "delete from SyncJobItems where JobId=@JobId";
-                            deleteJobItemsCommand.Parameters.Add(deleteJobItemsCommand, "@JobId");
-
-                            deleteJobItemsCommand.GetParameter(0).Value = id;
-                            deleteJobItemsCommand.Transaction = transaction;
-                            deleteJobItemsCommand.ExecuteNonQuery();
-
-                            transaction.Commit();
-                        }
-                        catch (OperationCanceledException)
-                        {
-                            if (transaction != null)
-                            {
-                                transaction.Rollback();
-                            }
-
-                            throw;
-                        }
-                        catch (Exception e)
-                        {
-                            Logger.ErrorException("Failed to save record:", e);
-
-                            if (transaction != null)
-                            {
-                                transaction.Rollback();
-                            }
-
-                            throw;
-                        }
-                        finally
-                        {
-                            if (transaction != null)
-                            {
-                                transaction.Dispose();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public QueryResult<SyncJob> GetJobs(SyncJobQuery query)
-        {
-            if (query == null)
-            {
-                throw new ArgumentNullException("query");
-            }
-
-            CheckDisposed();
-
-            using (var connection = CreateConnection(true).Result)
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = BaseJobSelectText;
-
-                    var whereClauses = new List<string>();
-
-                    if (query.Statuses.Length > 0)
-                    {
-                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
-
-                        whereClauses.Add(string.Format("Status in ({0})", statuses));
-                    }
-                    if (!string.IsNullOrWhiteSpace(query.TargetId))
-                    {
-                        whereClauses.Add("TargetId=@TargetId");
-                        cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId;
-                    }
-                    if (!string.IsNullOrWhiteSpace(query.ExcludeTargetIds))
-                    {
-                        var excludeIds = (query.ExcludeTargetIds ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                        if (excludeIds.Length == 1)
-                        {
-                            whereClauses.Add("TargetId<>@ExcludeTargetId");
-                            cmd.Parameters.Add(cmd, "@ExcludeTargetId", DbType.String).Value = excludeIds[0];
-                        }
-                        else if (excludeIds.Length > 1)
-                        {
-                            whereClauses.Add("TargetId<>@ExcludeTargetId");
-                            cmd.Parameters.Add(cmd, "@ExcludeTargetId", DbType.String).Value = excludeIds[0];
-                        }
-                    }
-                    if (!string.IsNullOrWhiteSpace(query.UserId))
-                    {
-                        whereClauses.Add("UserId=@UserId");
-                        cmd.Parameters.Add(cmd, "@UserId", DbType.String).Value = query.UserId;
-                    }
-                    if (query.SyncNewContent.HasValue)
-                    {
-                        whereClauses.Add("SyncNewContent=@SyncNewContent");
-                        cmd.Parameters.Add(cmd, "@SyncNewContent", DbType.Boolean).Value = query.SyncNewContent.Value;
-                    }
-
-                    cmd.CommandText += " mainTable";
-
-                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                        string.Empty :
-                        " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                    var startIndex = query.StartIndex ?? 0;
-                    if (startIndex > 0)
-                    {
-                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobs ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC LIMIT {0})",
-                            startIndex.ToString(_usCulture)));
-                    }
-
-                    if (whereClauses.Count > 0)
-                    {
-                        cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
-                    }
-
-                    cmd.CommandText += " ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC";
-
-                    if (query.Limit.HasValue)
-                    {
-                        cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                    }
-
-                    cmd.CommandText += "; select count (Id) from SyncJobs" + whereTextWithoutPaging;
-
-                    var list = new List<SyncJob>();
-                    var count = 0;
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                    {
-                        while (reader.Read())
-                        {
-                            list.Add(GetJob(reader));
-                        }
-
-                        if (reader.NextResult() && reader.Read())
-                        {
-                            count = reader.GetInt32(0);
-                        }
-                    }
-
-                    return new QueryResult<SyncJob>()
-                    {
-                        Items = list.ToArray(),
-                        TotalRecordCount = count
-                    };
-                }
-            }
-        }
-
-        public SyncJobItem GetJobItem(string id)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            CheckDisposed();
-
-            var guid = new Guid(id);
-
-            using (var connection = CreateConnection(true).Result)
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = BaseJobItemSelectText + " where Id=@Id";
-
-                    cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-                    {
-                        if (reader.Read())
-                        {
-                            return GetJobItem(reader);
-                        }
-                    }
-                }
-
-                return null;
-            }
-        }
-
-        private QueryResult<T> GetJobItemReader<T>(SyncJobItemQuery query, string baseSelectText, Func<IDataReader, T> itemFactory)
-        {
-            if (query == null)
-            {
-                throw new ArgumentNullException("query");
-            }
-
-            using (var connection = CreateConnection(true).Result)
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = baseSelectText;
-
-                    var whereClauses = new List<string>();
-
-                    if (!string.IsNullOrWhiteSpace(query.JobId))
-                    {
-                        whereClauses.Add("JobId=@JobId");
-                        cmd.Parameters.Add(cmd, "@JobId", DbType.String).Value = query.JobId;
-                    }
-                    if (!string.IsNullOrWhiteSpace(query.ItemId))
-                    {
-                        whereClauses.Add("ItemId=@ItemId");
-                        cmd.Parameters.Add(cmd, "@ItemId", DbType.String).Value = query.ItemId;
-                    }
-                    if (!string.IsNullOrWhiteSpace(query.TargetId))
-                    {
-                        whereClauses.Add("TargetId=@TargetId");
-                        cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId;
-                    }
-
-                    if (query.Statuses.Length > 0)
-                    {
-                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
-
-                        whereClauses.Add(string.Format("Status in ({0})", statuses));
-                    }
-
-                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                        string.Empty :
-                        " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                    var startIndex = query.StartIndex ?? 0;
-                    if (startIndex > 0)
-                    {
-                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobItems ORDER BY JobItemIndex, DateCreated LIMIT {0})",
-                            startIndex.ToString(_usCulture)));
-                    }
-
-                    if (whereClauses.Count > 0)
-                    {
-                        cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
-                    }
-
-                    cmd.CommandText += " ORDER BY JobItemIndex, DateCreated";
-
-                    if (query.Limit.HasValue)
-                    {
-                        cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                    }
-
-                    cmd.CommandText += "; select count (Id) from SyncJobItems" + whereTextWithoutPaging;
-
-                    var list = new List<T>();
-                    var count = 0;
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                    {
-                        while (reader.Read())
-                        {
-                            list.Add(itemFactory(reader));
-                        }
-
-                        if (reader.NextResult() && reader.Read())
-                        {
-                            count = reader.GetInt32(0);
-                        }
-                    }
-
-                    return new QueryResult<T>()
-                    {
-                        Items = list.ToArray(),
-                        TotalRecordCount = count
-                    };
-                }
-            }
-        }
-
-        public Dictionary<string, SyncedItemProgress> GetSyncedItemProgresses(SyncJobItemQuery query)
-        {
-            var result = new Dictionary<string, SyncedItemProgress>();
-
-            var now = DateTime.UtcNow;
-
-            using (var connection = CreateConnection(true).Result)
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "select ItemId,Status,Progress from SyncJobItems";
-
-                    var whereClauses = new List<string>();
-
-                    if (!string.IsNullOrWhiteSpace(query.TargetId))
-                    {
-                        whereClauses.Add("TargetId=@TargetId");
-                        cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId;
-                    }
-
-                    if (query.Statuses.Length > 0)
-                    {
-                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
-
-                        whereClauses.Add(string.Format("Status in ({0})", statuses));
-                    }
-
-                    if (whereClauses.Count > 0)
-                    {
-                        cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
-                    }
-
-                    cmd.CommandText += ";" + cmd.CommandText
-                        .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs")
-                        .Replace("'Synced'", "'Completed','CompletedWithError'");
-
-                    //Logger.Debug(cmd.CommandText);
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                    {
-                        LogQueryTime("GetSyncedItemProgresses", cmd, now);
-
-                        while (reader.Read())
-                        {
-                            AddStatusResult(reader, result, false);
-                        }
-
-                        if (reader.NextResult())
-                        {
-                            while (reader.Read())
-                            {
-                                AddStatusResult(reader, result, true);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        private void LogQueryTime(string methodName, IDbCommand cmd, DateTime startDate)
-        {
-            var elapsed = (DateTime.UtcNow - startDate).TotalMilliseconds;
-
-            var slowThreshold = 1000;
-
-#if DEBUG
-            slowThreshold = 50;
-#endif
-
-            if (elapsed >= slowThreshold)
-            {
-                Logger.Debug("{2} query time (slow): {0}ms. Query: {1}",
-                    Convert.ToInt32(elapsed),
-                    cmd.CommandText,
-                    methodName);
-            }
-            else
-            {
-                //Logger.Debug("{2} query time: {0}ms. Query: {1}",
-                //    Convert.ToInt32(elapsed),
-                //    cmd.CommandText,
-                //    methodName);
-            }
-        }
-
-        private void AddStatusResult(IDataReader reader, Dictionary<string, SyncedItemProgress> result, bool multipleIds)
-        {
-            if (reader.IsDBNull(0))
-            {
-                return;
-            }
-
-            var itemIds = new List<string>();
-
-            var ids = reader.GetString(0);
-
-            if (multipleIds)
-            {
-                itemIds = ids.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            }
-            else
-            {
-                itemIds.Add(ids);
-            }
-
-            if (!reader.IsDBNull(1))
-            {
-                SyncJobItemStatus status;
-                var statusString = reader.GetString(1);
-                if (string.Equals(statusString, "Completed", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(statusString, "CompletedWithError", StringComparison.OrdinalIgnoreCase))
-                {
-                    status = SyncJobItemStatus.Synced;
-                }
-                else
-                {
-                    status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), statusString, true);
-                }
-
-                if (status == SyncJobItemStatus.Synced)
-                {
-                    foreach (var itemId in itemIds)
-                    {
-                        result[itemId] = new SyncedItemProgress
-                        {
-                            Status = SyncJobItemStatus.Synced
-                        };
-                    }
-                }
-                else
-                {
-                    double progress = reader.IsDBNull(2) ? 0.0 : reader.GetDouble(2);
-
-                    foreach (var itemId in itemIds)
-                    {
-                        SyncedItemProgress currentStatus;
-                        if (!result.TryGetValue(itemId, out currentStatus) || (currentStatus.Status != SyncJobItemStatus.Synced && progress >= currentStatus.Progress))
-                        {
-                            result[itemId] = new SyncedItemProgress
-                            {
-                                Status = status,
-                                Progress = progress
-                            };
-                        }
-                    }
-                }
-            }
-        }
-
-        public QueryResult<SyncJobItem> GetJobItems(SyncJobItemQuery query)
-        {
-            return GetJobItemReader(query, BaseJobItemSelectText, GetJobItem);
-        }
-
-        public Task Create(SyncJobItem jobItem)
-        {
-            return InsertOrUpdate(jobItem, true);
-        }
-
-        public Task Update(SyncJobItem jobItem)
-        {
-            return InsertOrUpdate(jobItem, false);
-        }
-
-        private async Task InsertOrUpdate(SyncJobItem jobItem, bool insert)
-        {
-            if (jobItem == null)
-            {
-                throw new ArgumentNullException("jobItem");
-            }
-
-            CheckDisposed();
-
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    if (insert)
-                    {
-                        cmd.CommandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource, @IsMarkedForRemoval, @JobItemIndex, @ItemDateModifiedTicks)";
-
-                        cmd.Parameters.Add(cmd, "@Id");
-                        cmd.Parameters.Add(cmd, "@ItemId");
-                        cmd.Parameters.Add(cmd, "@ItemName");
-                        cmd.Parameters.Add(cmd, "@MediaSourceId");
-                        cmd.Parameters.Add(cmd, "@JobId");
-                        cmd.Parameters.Add(cmd, "@TemporaryPath");
-                        cmd.Parameters.Add(cmd, "@OutputPath");
-                        cmd.Parameters.Add(cmd, "@Status");
-                        cmd.Parameters.Add(cmd, "@TargetId");
-                        cmd.Parameters.Add(cmd, "@DateCreated");
-                        cmd.Parameters.Add(cmd, "@Progress");
-                        cmd.Parameters.Add(cmd, "@AdditionalFiles");
-                        cmd.Parameters.Add(cmd, "@MediaSource");
-                        cmd.Parameters.Add(cmd, "@IsMarkedForRemoval");
-                        cmd.Parameters.Add(cmd, "@JobItemIndex");
-                        cmd.Parameters.Add(cmd, "@ItemDateModifiedTicks");
-                    }
-                    else
-                    {
-                        // cmd
-                        cmd.CommandText = "update SyncJobItems set ItemId=@ItemId,ItemName=@ItemName,MediaSourceId=@MediaSourceId,JobId=@JobId,TemporaryPath=@TemporaryPath,OutputPath=@OutputPath,Status=@Status,TargetId=@TargetId,DateCreated=@DateCreated,Progress=@Progress,AdditionalFiles=@AdditionalFiles,MediaSource=@MediaSource,IsMarkedForRemoval=@IsMarkedForRemoval,JobItemIndex=@JobItemIndex,ItemDateModifiedTicks=@ItemDateModifiedTicks where Id=@Id";
-
-                        cmd.Parameters.Add(cmd, "@Id");
-                        cmd.Parameters.Add(cmd, "@ItemId");
-                        cmd.Parameters.Add(cmd, "@ItemName");
-                        cmd.Parameters.Add(cmd, "@MediaSourceId");
-                        cmd.Parameters.Add(cmd, "@JobId");
-                        cmd.Parameters.Add(cmd, "@TemporaryPath");
-                        cmd.Parameters.Add(cmd, "@OutputPath");
-                        cmd.Parameters.Add(cmd, "@Status");
-                        cmd.Parameters.Add(cmd, "@TargetId");
-                        cmd.Parameters.Add(cmd, "@DateCreated");
-                        cmd.Parameters.Add(cmd, "@Progress");
-                        cmd.Parameters.Add(cmd, "@AdditionalFiles");
-                        cmd.Parameters.Add(cmd, "@MediaSource");
-                        cmd.Parameters.Add(cmd, "@IsMarkedForRemoval");
-                        cmd.Parameters.Add(cmd, "@JobItemIndex");
-                        cmd.Parameters.Add(cmd, "@ItemDateModifiedTicks");
-                    }
-
-                    IDbTransaction transaction = null;
-
-                    try
-                    {
-                        transaction = connection.BeginTransaction();
-
-                        var index = 0;
-
-                        cmd.GetParameter(index++).Value = new Guid(jobItem.Id);
-                        cmd.GetParameter(index++).Value = jobItem.ItemId;
-                        cmd.GetParameter(index++).Value = jobItem.ItemName;
-                        cmd.GetParameter(index++).Value = jobItem.MediaSourceId;
-                        cmd.GetParameter(index++).Value = jobItem.JobId;
-                        cmd.GetParameter(index++).Value = jobItem.TemporaryPath;
-                        cmd.GetParameter(index++).Value = jobItem.OutputPath;
-                        cmd.GetParameter(index++).Value = jobItem.Status.ToString();
-                        cmd.GetParameter(index++).Value = jobItem.TargetId;
-                        cmd.GetParameter(index++).Value = jobItem.DateCreated;
-                        cmd.GetParameter(index++).Value = jobItem.Progress;
-                        cmd.GetParameter(index++).Value = _json.SerializeToString(jobItem.AdditionalFiles);
-                        cmd.GetParameter(index++).Value = jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource);
-                        cmd.GetParameter(index++).Value = jobItem.IsMarkedForRemoval;
-                        cmd.GetParameter(index++).Value = jobItem.JobItemIndex;
-                        cmd.GetParameter(index++).Value = jobItem.ItemDateModifiedTicks;
-
-                        cmd.Transaction = transaction;
-
-                        cmd.ExecuteNonQuery();
-
-                        transaction.Commit();
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        if (transaction != null)
-                        {
-                            transaction.Rollback();
-                        }
-
-                        throw;
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.ErrorException("Failed to save record:", e);
-
-                        if (transaction != null)
-                        {
-                            transaction.Rollback();
-                        }
-
-                        throw;
-                    }
-                    finally
-                    {
-                        if (transaction != null)
-                        {
-                            transaction.Dispose();
-                        }
-                    }
-                }
-            }
-        }
-
-        private SyncJobItem GetJobItem(IDataReader reader)
-        {
-            var info = new SyncJobItem
-            {
-                Id = reader.GetGuid(0).ToString("N"),
-                ItemId = reader.GetString(1)
-            };
-
-            if (!reader.IsDBNull(2))
-            {
-                info.ItemName = reader.GetString(2);
-            }
-
-            if (!reader.IsDBNull(3))
-            {
-                info.MediaSourceId = reader.GetString(3);
-            }
-
-            info.JobId = reader.GetString(4);
-
-            if (!reader.IsDBNull(5))
-            {
-                info.TemporaryPath = reader.GetString(5);
-            }
-            if (!reader.IsDBNull(6))
-            {
-                info.OutputPath = reader.GetString(6);
-            }
-
-            if (!reader.IsDBNull(7))
-            {
-                info.Status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), reader.GetString(7), true);
-            }
-
-            info.TargetId = reader.GetString(8);
-
-            info.DateCreated = reader.GetDateTime(9).ToUniversalTime();
-
-            if (!reader.IsDBNull(10))
-            {
-                info.Progress = reader.GetDouble(10);
-            }
-
-            if (!reader.IsDBNull(11))
-            {
-                var json = reader.GetString(11);
-
-                if (!string.IsNullOrWhiteSpace(json))
-                {
-                    info.AdditionalFiles = _json.DeserializeFromString<List<ItemFileInfo>>(json);
-                }
-            }
-
-            if (!reader.IsDBNull(12))
-            {
-                var json = reader.GetString(12);
-
-                if (!string.IsNullOrWhiteSpace(json))
-                {
-                    info.MediaSource = _json.DeserializeFromString<MediaSourceInfo>(json);
-                }
-            }
-
-            info.IsMarkedForRemoval = reader.GetBoolean(13);
-            info.JobItemIndex = reader.GetInt32(14);
-
-            if (!reader.IsDBNull(15))
-            {
-                info.ItemDateModifiedTicks = reader.GetInt64(15);
-            }
-
-            return info;
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index ea9e537c9..7bc77402e 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -87,7 +87,7 @@ namespace Emby.Server.Implementations.Activity
 
                     if (minDate.HasValue)
                     {
-                        whereClauses.Add("DateCreated>=@DateCreated");
+                        whereClauses.Add("DateCreated>=?");
                         paramList.Add(minDate.Value.ToDateTimeParamValue());
                     }
 
diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
new file mode 100644
index 000000000..05cde91e2
--- /dev/null
+++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -0,0 +1,73 @@
+using MediaBrowser.Controller;
+using System;
+
+namespace Emby.Server.Implementations.Browser
+{
+    /// <summary>
+    /// Class BrowserLauncher
+    /// </summary>
+    public static class BrowserLauncher
+    {
+        /// <summary>
+        /// Opens the dashboard page.
+        /// </summary>
+        /// <param name="page">The page.</param>
+        /// <param name="appHost">The app host.</param>
+        public static void OpenDashboardPage(string page, IServerApplicationHost appHost)
+        {
+            var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
+
+            OpenUrl(appHost, url);
+        }
+
+        /// <summary>
+        /// Opens the community.
+        /// </summary>
+        public static void OpenCommunity(IServerApplicationHost appHost)
+        {
+            OpenUrl(appHost, "http://emby.media/community");
+        }
+
+        public static void OpenEmbyPremiere(IServerApplicationHost appHost)
+        {
+            OpenDashboardPage("supporterkey.html", appHost);
+        }
+
+        /// <summary>
+        /// Opens the web client.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        public static void OpenWebClient(IServerApplicationHost appHost)
+        {
+            OpenDashboardPage("index.html", appHost);
+        }
+
+        /// <summary>
+        /// Opens the dashboard.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        public static void OpenDashboard(IServerApplicationHost appHost)
+        {
+            OpenDashboardPage("dashboard.html", appHost);
+        }
+
+        /// <summary>
+        /// Opens the URL.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        private static void OpenUrl(IServerApplicationHost appHost, string url)
+        {
+            try
+            {
+                appHost.LaunchUrl(url);
+            }
+            catch (NotImplementedException)
+            {
+                
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 8febe83b2..c47a534d1 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Logging;
 using SQLitePCL.pretty;
+using System.Linq;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -120,21 +121,30 @@ namespace Emby.Server.Implementations.Data
 
         }
 
-        protected void AddColumn(IDatabaseConnection connection, string table, string columnName, string type)
+        protected List<string> GetColumnNames(IDatabaseConnection connection, string table)
         {
+            var list = new List<string>();
+
             foreach (var row in connection.Query("PRAGMA table_info(" + table + ")"))
             {
                 if (row[1].SQLiteType != SQLiteType.Null)
                 {
                     var name = row[1].ToString();
 
-                    if (string.Equals(name, columnName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return;
-                    }
+                    list.Add(name);
                 }
             }
 
+            return list;
+        }
+
+        protected void AddColumn(IDatabaseConnection connection, string table, string columnName, string type, List<string> existingColumnNames)
+        {
+            if (existingColumnNames.Contains(columnName, StringComparer.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
             connection.ExecuteAll(string.Join(";", new string[]
             {
                 "alter table " + table,
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index dd32e2cbd..3f11b6eb0 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.Progress;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
@@ -7,20 +6,13 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
-using Emby.Server.Implementations.ScheduledTasks;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -29,26 +21,14 @@ namespace Emby.Server.Implementations.Data
         private readonly ILibraryManager _libraryManager;
         private readonly IItemRepository _itemRepo;
         private readonly ILogger _logger;
-        private readonly IServerConfigurationManager _config;
         private readonly IFileSystem _fileSystem;
-        private readonly IHttpServer _httpServer;
-        private readonly ILocalizationManager _localization;
-        private readonly ITaskManager _taskManager;
 
-        public const int MigrationVersion = 23;
-        public static bool EnableUnavailableMessage = false;
-        const int LatestSchemaVersion = 109;
-
-        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, IItemRepository itemRepo, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem, IHttpServer httpServer, ILocalizationManager localization, ITaskManager taskManager)
+        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, IItemRepository itemRepo, ILogger logger, IFileSystem fileSystem)
         {
             _libraryManager = libraryManager;
             _itemRepo = itemRepo;
             _logger = logger;
-            _config = config;
             _fileSystem = fileSystem;
-            _httpServer = httpServer;
-            _localization = localization;
-            _taskManager = taskManager;
         }
 
         public string Name
@@ -68,8 +48,6 @@ namespace Emby.Server.Implementations.Data
 
         public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
-            OnProgress(0);
-
             // Ensure these objects are lazy loaded.
             // Without this there is a deadlock that will need to be investigated
             var rootChildren = _libraryManager.RootFolder.Children.ToList();
@@ -78,19 +56,7 @@ namespace Emby.Server.Implementations.Data
             var innerProgress = new ActionableProgress<double>();
             innerProgress.RegisterAction(p =>
             {
-                double newPercentCommplete = .4 * p;
-                OnProgress(newPercentCommplete);
-
-                progress.Report(newPercentCommplete);
-            });
-
-            await UpdateToLatestSchema(cancellationToken, innerProgress).ConfigureAwait(false);
-
-            innerProgress = new ActionableProgress<double>();
-            innerProgress.RegisterAction(p =>
-            {
-                double newPercentCommplete = 40 + .05 * p;
-                OnProgress(newPercentCommplete);
+                double newPercentCommplete = .45 * p;
                 progress.Report(newPercentCommplete);
             });
             await CleanDeadItems(cancellationToken, innerProgress).ConfigureAwait(false);
@@ -100,122 +66,12 @@ namespace Emby.Server.Implementations.Data
             innerProgress.RegisterAction(p =>
             {
                 double newPercentCommplete = 45 + .55 * p;
-                OnProgress(newPercentCommplete);
                 progress.Report(newPercentCommplete);
             });
             await CleanDeletedItems(cancellationToken, innerProgress).ConfigureAwait(false);
             progress.Report(100);
 
             await _itemRepo.UpdateInheritedValues(cancellationToken).ConfigureAwait(false);
-
-            if (_config.Configuration.MigrationVersion < MigrationVersion)
-            {
-                _config.Configuration.MigrationVersion = MigrationVersion;
-                _config.SaveConfiguration();
-            }
-
-            if (_config.Configuration.SchemaVersion < LatestSchemaVersion)
-            {
-                _config.Configuration.SchemaVersion = LatestSchemaVersion;
-                _config.SaveConfiguration();
-            }
-
-            if (EnableUnavailableMessage)
-            {
-                EnableUnavailableMessage = false;
-                _httpServer.GlobalResponse = null;
-                _taskManager.QueueScheduledTask<RefreshMediaLibraryTask>();
-            }
-
-            _taskManager.SuspendTriggers = false;
-        }
-
-        private void OnProgress(double newPercentCommplete)
-        {
-            if (EnableUnavailableMessage)
-            {
-                var html = "<!doctype html><html><head><title>Emby</title></head><body>";
-                var text = _localization.GetLocalizedString("DbUpgradeMessage");
-                html += string.Format(text, newPercentCommplete.ToString("N2", CultureInfo.InvariantCulture));
-
-                html += "<script>setTimeout(function(){window.location.reload(true);}, 5000);</script>";
-                html += "</body></html>";
-
-                _httpServer.GlobalResponse = html;
-            }
-        }
-
-        private async Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
-            {
-                IsCurrentSchema = false,
-                ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name }
-            });
-
-            var numComplete = 0;
-            var numItems = itemIds.Count;
-
-            _logger.Debug("Upgrading schema for {0} items", numItems);
-
-            var list = new List<BaseItem>();
-
-            foreach (var itemId in itemIds)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                if (itemId != Guid.Empty)
-                {
-                    // Somehow some invalid data got into the db. It probably predates the boundary checking
-                    var item = _libraryManager.GetItemById(itemId);
-
-                    if (item != null)
-                    {
-                        list.Add(item);
-                    }
-                }
-
-                if (list.Count >= 1000)
-                {
-                    try
-                    {
-                        await _itemRepo.SaveItems(list, cancellationToken).ConfigureAwait(false);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        throw;
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.ErrorException("Error saving item", ex);
-                    }
-
-                    list.Clear();
-                }
-
-                numComplete++;
-                double percent = numComplete;
-                percent /= numItems;
-                progress.Report(percent * 100);
-            }
-
-            if (list.Count > 0)
-            {
-                try
-                {
-                    await _itemRepo.SaveItems(list, cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    throw;
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error saving item", ex);
-                }
-            }
-
-            progress.Report(100);
         }
 
         private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 653a6a9c1..973576a0d 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -36,6 +36,7 @@
     <Compile Include="Activity\ActivityManager.cs" />
     <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="Branding\BrandingConfigurationFactory.cs" />
+    <Compile Include="Browser\BrowserLauncher.cs" />
     <Compile Include="Channels\ChannelConfigurations.cs" />
     <Compile Include="Channels\ChannelDynamicMediaSourceProvider.cs" />
     <Compile Include="Channels\ChannelImageProvider.cs" />
@@ -64,6 +65,7 @@
     <Compile Include="EntryPoints\RecordingNotifier.cs" />
     <Compile Include="EntryPoints\RefreshUsersMetadata.cs" />
     <Compile Include="EntryPoints\ServerEventNotifier.cs" />
+    <Compile Include="EntryPoints\StartupWizard.cs" />
     <Compile Include="EntryPoints\SystemEvents.cs" />
     <Compile Include="EntryPoints\UdpServerEntryPoint.cs" />
     <Compile Include="EntryPoints\UsageEntryPoint.cs" />
@@ -174,6 +176,7 @@
     <Compile Include="Localization\LocalizationManager.cs" />
     <Compile Include="MediaEncoder\EncodingManager.cs" />
     <Compile Include="Migrations\IVersionMigration.cs" />
+    <Compile Include="Migrations\UpdateLevelMigration.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
     <Compile Include="News\NewsService.cs" />
     <Compile Include="Notifications\CoreNotificationTypes.cs" />
@@ -258,6 +261,7 @@
     <Compile Include="Sync\SyncManager.cs" />
     <Compile Include="Sync\SyncNotificationEntryPoint.cs" />
     <Compile Include="Sync\SyncRegistrationInfo.cs" />
+    <Compile Include="Sync\SyncRepository.cs" />
     <Compile Include="Sync\TargetDataProvider.cs" />
     <Compile Include="TV\SeriesPostScanTask.cs" />
     <Compile Include="TV\TVSeriesManager.cs" />
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
new file mode 100644
index 000000000..424153f22
--- /dev/null
+++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
@@ -0,0 +1,59 @@
+using Emby.Server.Implementations.Browser;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Model.Logging;
+
+namespace Emby.Server.Implementations.EntryPoints
+{
+    /// <summary>
+    /// Class StartupWizard
+    /// </summary>
+    public class StartupWizard : IServerEntryPoint
+    {
+        /// <summary>
+        /// The _app host
+        /// </summary>
+        private readonly IServerApplicationHost _appHost;
+        /// <summary>
+        /// The _user manager
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartupWizard" /> class.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        /// <param name="logger">The logger.</param>
+        public StartupWizard(IServerApplicationHost appHost, ILogger logger)
+        {
+            _appHost = appHost;
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Runs this instance.
+        /// </summary>
+        public void Run()
+        {
+            if (_appHost.IsFirstRun)
+            {
+                LaunchStartupWizard();
+            }
+        }
+
+        /// <summary>
+        /// Launches the startup wizard.
+        /// </summary>
+        private void LaunchStartupWizard()
+        {
+            BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost);
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index 5be7ba7ad..48a85e0e0 100644
--- a/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
+++ b/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
@@ -74,7 +74,7 @@ namespace Emby.Server.Implementations.FileOrganization
             return new[] { 
             
                 // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromMinutes(5).Ticks}
+                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromMinutes(15).Ticks}
             };
         }
 
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 876d140ec..c1758127a 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -59,12 +59,13 @@ namespace Emby.Server.Implementations.HttpServer
         private readonly IEnvironmentInfo _environment;
         private readonly IStreamFactory _streamFactory;
         private readonly Func<Type, Func<string, object>> _funcParseFn;
+        private readonly bool _enableDualModeSockets;
 
         public HttpListenerHost(IServerApplicationHost applicationHost,
             ILogger logger,
             IServerConfigurationManager config,
             string serviceName,
-            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func<Type, Func<string, object>> funcParseFn)
+            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func<Type, Func<string, object>> funcParseFn, bool enableDualModeSockets)
             : base(serviceName)
         {
             _appHost = applicationHost;
@@ -80,6 +81,7 @@ namespace Emby.Server.Implementations.HttpServer
             _certificate = certificate;
             _streamFactory = streamFactory;
             _funcParseFn = funcParseFn;
+            _enableDualModeSockets = enableDualModeSockets;
             _config = config;
 
             _logger = logger;
@@ -179,8 +181,6 @@ namespace Emby.Server.Implementations.HttpServer
 
         private IHttpListener GetListener()
         {
-            var enableDualMode = _environment.OperatingSystem == OperatingSystem.Windows;
-
             return new WebSocketSharpListener(_logger,
                 _certificate,
                 _memoryStreamProvider,
@@ -189,7 +189,7 @@ namespace Emby.Server.Implementations.HttpServer
                 _socketFactory,
                 _cryptoProvider,
                 _streamFactory,
-                enableDualMode,
+                _enableDualModeSockets,
                 GetRequest);
         }
 
diff --git a/Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs b/Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs
new file mode 100644
index 000000000..c532ea08d
--- /dev/null
+++ b/Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Updates;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Updates;
+
+namespace Emby.Server.Implementations.Migrations
+{
+    public class UpdateLevelMigration : IVersionMigration
+    {
+        private readonly IServerConfigurationManager _config;
+        private readonly IServerApplicationHost _appHost;
+        private readonly IHttpClient _httpClient;
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly string _releaseAssetFilename;
+        private readonly ILogger _logger;
+
+        public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename, ILogger logger)
+        {
+            _config = config;
+            _appHost = appHost;
+            _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
+            _releaseAssetFilename = releaseAssetFilename;
+            _logger = logger;
+        }
+
+        public async Task Run()
+        {
+            var lastVersion = _config.Configuration.LastVersion;
+            var currentVersion = _appHost.ApplicationVersion;
+
+            if (string.Equals(lastVersion, currentVersion.ToString(), StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            try
+            {
+                var updateLevel = _config.Configuration.SystemUpdateLevel;
+
+                await CheckVersion(currentVersion, updateLevel, CancellationToken.None).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error in update migration", ex);
+            }
+        }
+
+        private async Task CheckVersion(Version currentVersion, PackageVersionClass currentUpdateLevel, CancellationToken cancellationToken)
+        {
+            var releases = await new GithubUpdater(_httpClient, _jsonSerializer)
+                .GetLatestReleases("MediaBrowser", "Emby", _releaseAssetFilename, cancellationToken).ConfigureAwait(false);
+
+            var newUpdateLevel = GetNewUpdateLevel(currentVersion, currentUpdateLevel, releases);
+
+            if (newUpdateLevel != currentUpdateLevel)
+            {
+                _config.Configuration.SystemUpdateLevel = newUpdateLevel;
+                _config.SaveConfiguration();
+            }
+        }
+
+        private PackageVersionClass GetNewUpdateLevel(Version currentVersion, PackageVersionClass currentUpdateLevel, List<GithubUpdater.RootObject> releases)
+        {
+            var newUpdateLevel = currentUpdateLevel;
+
+            // If the current version is later than current stable, set the update level to beta
+            if (releases.Count >= 1)
+            {
+                var release = releases[0];
+                var version = ParseVersion(release.tag_name);
+                if (version != null)
+                {
+                    if (currentVersion > version)
+                    {
+                        newUpdateLevel = PackageVersionClass.Beta;
+                    }
+                    else
+                    {
+                        return PackageVersionClass.Release;
+                    }
+                }
+            }
+
+            // If the current version is later than current beta, set the update level to dev
+            if (releases.Count >= 2)
+            {
+                var release = releases[1];
+                var version = ParseVersion(release.tag_name);
+                if (version != null)
+                {
+                    if (currentVersion > version)
+                    {
+                        newUpdateLevel = PackageVersionClass.Dev;
+                    }
+                    else
+                    {
+                        return PackageVersionClass.Beta;
+                    }
+                }
+            }
+
+            return newUpdateLevel;
+        }
+
+        private Version ParseVersion(string versionString)
+        {
+            if (!string.IsNullOrWhiteSpace(versionString))
+            {
+                var parts = versionString.Split('.');
+                if (parts.Length == 3)
+                {
+                    versionString += ".0";
+                }
+            }
+
+            Version version;
+            Version.TryParse(versionString, out version);
+
+            return version;
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index 5179bd258..f4cb42d29 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -40,7 +40,9 @@ namespace Emby.Server.Implementations.Security
 
                 connection.RunInTransaction(db =>
                 {
-                    AddColumn(db, "AccessTokens", "AppVersion", "TEXT");
+                    var existingColumnNames = GetColumnNames(db, "AccessTokens");
+
+                    AddColumn(db, "AccessTokens", "AppVersion", "TEXT", existingColumnNames);
                 });
             }
         }
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
new file mode 100644
index 000000000..fbc5772f3
--- /dev/null
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -0,0 +1,770 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Emby.Server.Implementations.Data;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Sync;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Sync;
+using SQLitePCL.pretty;
+
+namespace Emby.Server.Implementations.Sync
+{
+    public class SyncRepository : BaseSqliteRepository, ISyncRepository
+    {
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+        private readonly IJsonSerializer _json;
+
+        public SyncRepository(ILogger logger, IJsonSerializer json, IServerApplicationPaths appPaths)
+            : base(logger)
+        {
+            _json = json;
+            DbFilePath = Path.Combine(appPaths.DataPath, "sync14.db");
+        }
+
+        private class SyncSummary
+        {
+            public Dictionary<string, int> Items { get; set; }
+
+            public SyncSummary()
+            {
+                Items = new Dictionary<string, int>();
+            }
+        }
+
+        public void Initialize()
+        {
+            using (var connection = CreateConnection())
+            {
+                string[] queries = {
+
+                                "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Profile TEXT, Quality TEXT, Bitrate INT, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
+
+                                "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT, JobItemIndex INT, ItemDateModifiedTicks BIGINT)",
+
+                                "drop index if exists idx_SyncJobItems2",
+                                "drop index if exists idx_SyncJobItems3",
+                                "drop index if exists idx_SyncJobs1",
+                                "drop index if exists idx_SyncJobs",
+                                "drop index if exists idx_SyncJobItems1",
+                                "create index if not exists idx_SyncJobItems4 on SyncJobItems(TargetId,ItemId,Status,Progress,DateCreated)",
+                                "create index if not exists idx_SyncJobItems5 on SyncJobItems(TargetId,Status,ItemId,Progress)",
+
+                                "create index if not exists idx_SyncJobs2 on SyncJobs(TargetId,Status,ItemIds,Progress)",
+
+                                "pragma shrink_memory"
+                               };
+
+                connection.RunQueries(queries);
+
+                connection.RunInTransaction(db =>
+                {
+                    var existingColumnNames = GetColumnNames(db, "SyncJobs");
+                    AddColumn(db, "SyncJobs", "Profile", "TEXT", existingColumnNames);
+                    AddColumn(db, "SyncJobs", "Bitrate", "INT", existingColumnNames);
+
+                    existingColumnNames = GetColumnNames(db, "SyncJobItems");
+                    AddColumn(db, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT", existingColumnNames);
+                });
+            }
+        }
+
+        private const string BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
+        private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks from SyncJobItems";
+
+        public SyncJob GetJob(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            CheckDisposed();
+
+            var guid = new Guid(id);
+
+            if (guid == Guid.Empty)
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = BaseJobSelectText + " where Id=?";
+                    var paramList = new List<object>();
+
+                    paramList.Add(guid.ToGuidParamValue());
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        return GetJob(row);
+                    }
+
+                    return null;
+                }
+            }
+        }
+
+        private SyncJob GetJob(IReadOnlyList<IResultSetValue> reader)
+        {
+            var info = new SyncJob
+            {
+                Id = reader[0].ReadGuid().ToString("N"),
+                TargetId = reader[1].ToString(),
+                Name = reader[2].ToString()
+            };
+
+            if (reader[3].SQLiteType != SQLiteType.Null)
+            {
+                info.Profile = reader[3].ToString();
+            }
+
+            if (reader[4].SQLiteType != SQLiteType.Null)
+            {
+                info.Quality = reader[4].ToString();
+            }
+
+            if (reader[5].SQLiteType != SQLiteType.Null)
+            {
+                info.Bitrate = reader[5].ToInt();
+            }
+
+            if (reader[6].SQLiteType != SQLiteType.Null)
+            {
+                info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader[6].ToString(), true);
+            }
+
+            if (reader[7].SQLiteType != SQLiteType.Null)
+            {
+                info.Progress = reader[7].ToDouble();
+            }
+
+            if (reader[8].SQLiteType != SQLiteType.Null)
+            {
+                info.UserId = reader[8].ToString();
+            }
+
+            if (reader[9].SQLiteType != SQLiteType.Null)
+            {
+                info.RequestedItemIds = reader[9].ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+            }
+
+            if (reader[10].SQLiteType != SQLiteType.Null)
+            {
+                info.Category = (SyncCategory)Enum.Parse(typeof(SyncCategory), reader[10].ToString(), true);
+            }
+
+            if (reader[11].SQLiteType != SQLiteType.Null)
+            {
+                info.ParentId = reader[11].ToString();
+            }
+
+            if (reader[12].SQLiteType != SQLiteType.Null)
+            {
+                info.UnwatchedOnly = reader[12].ToBool();
+            }
+
+            if (reader[13].SQLiteType != SQLiteType.Null)
+            {
+                info.ItemLimit = reader[13].ToInt();
+            }
+
+            info.SyncNewContent = reader[14].ToBool();
+
+            info.DateCreated = reader[15].ReadDateTime();
+            info.DateLastModified = reader[16].ReadDateTime();
+            info.ItemCount = reader[17].ToInt();
+
+            return info;
+        }
+
+        public Task Create(SyncJob job)
+        {
+            return InsertOrUpdate(job, true);
+        }
+
+        public Task Update(SyncJob job)
+        {
+            return InsertOrUpdate(job, false);
+        }
+
+        private async Task InsertOrUpdate(SyncJob job, bool insert)
+        {
+            if (job == null)
+            {
+                throw new ArgumentNullException("job");
+            }
+
+            CheckDisposed();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection())
+                {
+                    string commandText;
+                    var paramList = new List<object>();
+
+                    if (insert)
+                    {
+                        commandText = "insert into SyncJobs (Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+                    }
+                    else
+                    {
+                        commandText = "update SyncJobs set TargetId=?,Name=?,Profile=?,Quality=?,Bitrate=?,Status=?,Progress=?,UserId=?,ItemIds=?,Category=?,ParentId=?,UnwatchedOnly=?,ItemLimit=?,SyncNewContent=?,DateCreated=?,DateLastModified=?,ItemCount=? where Id=?";
+                    }
+
+                    paramList.Add(job.Id.ToGuidParamValue());
+                    paramList.Add(job.TargetId);
+                    paramList.Add(job.Name);
+                    paramList.Add(job.Profile);
+                    paramList.Add(job.Quality);
+                    paramList.Add(job.Bitrate);
+                    paramList.Add(job.Status.ToString());
+                    paramList.Add(job.Progress);
+                    paramList.Add(job.UserId);
+
+                    paramList.Add(string.Join(",", job.RequestedItemIds.ToArray()));
+                    paramList.Add(job.Category);
+                    paramList.Add(job.ParentId);
+                    paramList.Add(job.UnwatchedOnly);
+                    paramList.Add(job.ItemLimit);
+                    paramList.Add(job.SyncNewContent);
+                    paramList.Add(job.DateCreated.ToDateTimeParamValue());
+                    paramList.Add(job.DateLastModified.ToDateTimeParamValue());
+                    paramList.Add(job.ItemCount);
+
+                    connection.RunInTransaction(conn =>
+                    {
+                        conn.Execute(commandText, paramList.ToArray());
+                    });
+                }
+            }
+        }
+
+        public async Task DeleteJob(string id)
+        {
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            CheckDisposed();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection())
+                {
+                    connection.RunInTransaction(conn =>
+                    {
+                        conn.Execute("delete from SyncJobs where Id=?", id.ToGuidParamValue());
+                        conn.Execute("delete from SyncJobItems where JobId=?", id);
+                    });
+                }
+            }
+        }
+
+        public QueryResult<SyncJob> GetJobs(SyncJobQuery query)
+        {
+            if (query == null)
+            {
+                throw new ArgumentNullException("query");
+            }
+
+            CheckDisposed();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = BaseJobSelectText;
+                    var paramList = new List<object>();
+
+                    var whereClauses = new List<string>();
+
+                    if (query.Statuses.Length > 0)
+                    {
+                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
+
+                        whereClauses.Add(string.Format("Status in ({0})", statuses));
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.TargetId))
+                    {
+                        whereClauses.Add("TargetId=?");
+                        paramList.Add(query.TargetId);
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.ExcludeTargetIds))
+                    {
+                        var excludeIds = (query.ExcludeTargetIds ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                        if (excludeIds.Length == 1)
+                        {
+                            whereClauses.Add("TargetId<>?");
+                            paramList.Add(excludeIds[0]);
+                        }
+                        else if (excludeIds.Length > 1)
+                        {
+                            whereClauses.Add("TargetId<>?");
+                            paramList.Add(excludeIds[0]);
+                        }
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.UserId))
+                    {
+                        whereClauses.Add("UserId=?");
+                        paramList.Add(query.UserId);
+                    }
+                    if (query.SyncNewContent.HasValue)
+                    {
+                        whereClauses.Add("SyncNewContent=?");
+                        paramList.Add(query.SyncNewContent.Value);
+                    }
+
+                    commandText += " mainTable";
+
+                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                    var startIndex = query.StartIndex ?? 0;
+                    if (startIndex > 0)
+                    {
+                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobs ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC LIMIT {0})",
+                            startIndex.ToString(_usCulture)));
+                    }
+
+                    if (whereClauses.Count > 0)
+                    {
+                        commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    }
+
+                    commandText += " ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC";
+
+                    if (query.Limit.HasValue)
+                    {
+                        commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                    }
+
+                    var list = new List<SyncJob>();
+                    var count = connection.Query("select count (Id) from SyncJobs" + whereTextWithoutPaging, paramList.ToArray())
+                            .SelectScalarInt()
+                            .First();
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        list.Add(GetJob(row));
+                    }
+
+                    return new QueryResult<SyncJob>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
+                }
+            }
+        }
+
+        public SyncJobItem GetJobItem(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            CheckDisposed();
+
+            lock (WriteLock)
+            {
+                var guid = new Guid(id);
+
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = BaseJobItemSelectText + " where Id=?";
+                    var paramList = new List<object>();
+
+                    paramList.Add(guid.ToGuidParamValue());
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        return GetJobItem(row);
+                    }
+
+                    return null;
+                }
+            }
+        }
+
+        private QueryResult<T> GetJobItemReader<T>(SyncJobItemQuery query, string baseSelectText, Func<IReadOnlyList<IResultSetValue>, T> itemFactory)
+        {
+            if (query == null)
+            {
+                throw new ArgumentNullException("query");
+            }
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = baseSelectText;
+                    var paramList = new List<object>();
+
+                    var whereClauses = new List<string>();
+
+                    if (!string.IsNullOrWhiteSpace(query.JobId))
+                    {
+                        whereClauses.Add("JobId=?");
+                        paramList.Add(query.JobId);
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.ItemId))
+                    {
+                        whereClauses.Add("ItemId=?");
+                        paramList.Add(query.ItemId);
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.TargetId))
+                    {
+                        whereClauses.Add("TargetId=?");
+                        paramList.Add(query.TargetId);
+                    }
+
+                    if (query.Statuses.Length > 0)
+                    {
+                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
+
+                        whereClauses.Add(string.Format("Status in ({0})", statuses));
+                    }
+
+                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                    var startIndex = query.StartIndex ?? 0;
+                    if (startIndex > 0)
+                    {
+                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobItems ORDER BY JobItemIndex, DateCreated LIMIT {0})",
+                            startIndex.ToString(_usCulture)));
+                    }
+
+                    if (whereClauses.Count > 0)
+                    {
+                        commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    }
+
+                    commandText += " ORDER BY JobItemIndex, DateCreated";
+
+                    if (query.Limit.HasValue)
+                    {
+                        commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                    }
+
+                    var list = new List<T>();
+                    var count = connection.Query("select count (Id) from SyncJobItems" + whereTextWithoutPaging, paramList.ToArray())
+                            .SelectScalarInt()
+                            .First();
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        list.Add(itemFactory(row));
+                    }
+
+                    return new QueryResult<T>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
+                }
+            }
+        }
+
+        public Dictionary<string, SyncedItemProgress> GetSyncedItemProgresses(SyncJobItemQuery query)
+        {
+            var result = new Dictionary<string, SyncedItemProgress>();
+
+            var now = DateTime.UtcNow;
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = "select ItemId,Status,Progress from SyncJobItems";
+
+                    var whereClauses = new List<string>();
+                    var paramList = new List<object>();
+
+                    if (!string.IsNullOrWhiteSpace(query.TargetId))
+                    {
+                        whereClauses.Add("TargetId=?");
+                        paramList.Add(query.TargetId);
+                    }
+
+                    if (query.Statuses.Length > 0)
+                    {
+                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
+
+                        whereClauses.Add(string.Format("Status in ({0})", statuses));
+                    }
+
+                    if (whereClauses.Count > 0)
+                    {
+                        commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    }
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        AddStatusResult(row, result, false);
+                    }
+                    LogQueryTime("GetSyncedItemProgresses", commandText, now);
+
+                    commandText = commandText
+                        .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs")
+                        .Replace("'Synced'", "'Completed','CompletedWithError'");
+
+                    now = DateTime.UtcNow;
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        AddStatusResult(row, result, true);
+                    }
+                    LogQueryTime("GetSyncedItemProgresses", commandText, now);
+                }
+            }
+
+            return result;
+        }
+
+        private void LogQueryTime(string methodName, string commandText, DateTime startDate)
+        {
+            var elapsed = (DateTime.UtcNow - startDate).TotalMilliseconds;
+
+            var slowThreshold = 1000;
+
+#if DEBUG
+            slowThreshold = 50;
+#endif
+
+            if (elapsed >= slowThreshold)
+            {
+                Logger.Debug("{2} query time (slow): {0}ms. Query: {1}",
+                    Convert.ToInt32(elapsed),
+                    commandText,
+                    methodName);
+            }
+            else
+            {
+                //Logger.Debug("{2} query time: {0}ms. Query: {1}",
+                //    Convert.ToInt32(elapsed),
+                //    cmd.CommandText,
+                //    methodName);
+            }
+        }
+
+        private void AddStatusResult(IReadOnlyList<IResultSetValue> reader, Dictionary<string, SyncedItemProgress> result, bool multipleIds)
+        {
+            if (reader[0].SQLiteType == SQLiteType.Null)
+            {
+                return;
+            }
+
+            var itemIds = new List<string>();
+
+            var ids = reader[0].ToString();
+
+            if (multipleIds)
+            {
+                itemIds = ids.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+            }
+            else
+            {
+                itemIds.Add(ids);
+            }
+
+            if (reader[1].SQLiteType != SQLiteType.Null)
+            {
+                SyncJobItemStatus status;
+                var statusString = reader[1].ToString();
+                if (string.Equals(statusString, "Completed", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(statusString, "CompletedWithError", StringComparison.OrdinalIgnoreCase))
+                {
+                    status = SyncJobItemStatus.Synced;
+                }
+                else
+                {
+                    status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), statusString, true);
+                }
+
+                if (status == SyncJobItemStatus.Synced)
+                {
+                    foreach (var itemId in itemIds)
+                    {
+                        result[itemId] = new SyncedItemProgress
+                        {
+                            Status = SyncJobItemStatus.Synced
+                        };
+                    }
+                }
+                else
+                {
+                    double progress = reader[2].SQLiteType == SQLiteType.Null ? 0.0 : reader[2].ToDouble();
+
+                    foreach (var itemId in itemIds)
+                    {
+                        SyncedItemProgress currentStatus;
+                        if (!result.TryGetValue(itemId, out currentStatus) || (currentStatus.Status != SyncJobItemStatus.Synced && progress >= currentStatus.Progress))
+                        {
+                            result[itemId] = new SyncedItemProgress
+                            {
+                                Status = status,
+                                Progress = progress
+                            };
+                        }
+                    }
+                }
+            }
+        }
+
+        public QueryResult<SyncJobItem> GetJobItems(SyncJobItemQuery query)
+        {
+            return GetJobItemReader(query, BaseJobItemSelectText, GetJobItem);
+        }
+
+        public Task Create(SyncJobItem jobItem)
+        {
+            return InsertOrUpdate(jobItem, true);
+        }
+
+        public Task Update(SyncJobItem jobItem)
+        {
+            return InsertOrUpdate(jobItem, false);
+        }
+
+        private async Task InsertOrUpdate(SyncJobItem jobItem, bool insert)
+        {
+            if (jobItem == null)
+            {
+                throw new ArgumentNullException("jobItem");
+            }
+
+            CheckDisposed();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection())
+                {
+                    string commandText;
+
+                    if (insert)
+                    {
+                        commandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+                    }
+                    else
+                    {
+                        // cmd
+                        commandText = "update SyncJobItems set ItemId=?,ItemName=?,MediaSourceId=?,JobId=?,TemporaryPath=?,OutputPath=?,Status=?,TargetId=?,DateCreated=?,Progress=?,AdditionalFiles=?,MediaSource=?,IsMarkedForRemoval=?,JobItemIndex=?,ItemDateModifiedTicks=? where Id=?";
+                    }
+
+                    var paramList = new List<object>();
+                    paramList.Add(jobItem.Id.ToGuidParamValue());
+                    paramList.Add(jobItem.ItemId);
+                    paramList.Add(jobItem.ItemName);
+                    paramList.Add(jobItem.MediaSourceId);
+                    paramList.Add(jobItem.JobId);
+                    paramList.Add(jobItem.TemporaryPath);
+                    paramList.Add(jobItem.OutputPath);
+                    paramList.Add(jobItem.Status.ToString());
+
+                    paramList.Add(jobItem.TargetId);
+                    paramList.Add(jobItem.DateCreated.ToDateTimeParamValue());
+                    paramList.Add(jobItem.Progress);
+                    paramList.Add(_json.SerializeToString(jobItem.AdditionalFiles));
+                    paramList.Add(jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource));
+                    paramList.Add(jobItem.IsMarkedForRemoval);
+                    paramList.Add(jobItem.JobItemIndex);
+                    paramList.Add(jobItem.ItemDateModifiedTicks);
+
+                    connection.RunInTransaction(conn =>
+                    {
+                        conn.Execute(commandText, paramList.ToArray());
+                    });
+                }
+            }
+        }
+
+        private SyncJobItem GetJobItem(IReadOnlyList<IResultSetValue> reader)
+        {
+            var info = new SyncJobItem
+            {
+                Id = reader[0].ReadGuid().ToString("N"),
+                ItemId = reader[1].ToString()
+            };
+
+            if (reader[2].SQLiteType != SQLiteType.Null)
+            {
+                info.ItemName = reader[2].ToString();
+            }
+
+            if (reader[3].SQLiteType != SQLiteType.Null)
+            {
+                info.MediaSourceId = reader[3].ToString();
+            }
+
+            info.JobId = reader[4].ToString();
+
+            if (reader[5].SQLiteType != SQLiteType.Null)
+            {
+                info.TemporaryPath = reader[5].ToString();
+            }
+            if (reader[6].SQLiteType != SQLiteType.Null)
+            {
+                info.OutputPath = reader[6].ToString();
+            }
+
+            if (reader[7].SQLiteType != SQLiteType.Null)
+            {
+                info.Status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), reader[7].ToString(), true);
+            }
+
+            info.TargetId = reader[8].ToString();
+
+            info.DateCreated = reader[9].ReadDateTime();
+
+            if (reader[10].SQLiteType != SQLiteType.Null)
+            {
+                info.Progress = reader[10].ToDouble();
+            }
+
+            if (reader[11].SQLiteType != SQLiteType.Null)
+            {
+                var json = reader[11].ToString();
+
+                if (!string.IsNullOrWhiteSpace(json))
+                {
+                    info.AdditionalFiles = _json.DeserializeFromString<List<ItemFileInfo>>(json);
+                }
+            }
+
+            if (reader[12].SQLiteType != SQLiteType.Null)
+            {
+                var json = reader[12].ToString();
+
+                if (!string.IsNullOrWhiteSpace(json))
+                {
+                    info.MediaSource = _json.DeserializeFromString<MediaSourceInfo>(json);
+                }
+            }
+
+            info.IsMarkedForRemoval = reader[13].ToBool();
+            info.JobItemIndex = reader[14].ToInt();
+
+            if (reader[15].SQLiteType != SQLiteType.Null)
+            {
+                info.ItemDateModifiedTicks = reader[15].ToInt64();
+            }
+
+            return info;
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index f3bab7883..a47aaa305 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -148,10 +148,6 @@ namespace Emby.Server.Implementations.TV
 
         private string GetUniqueSeriesKey(BaseItem series)
         {
-            if (_config.Configuration.SchemaVersion < 97)
-            {
-                return series.Id.ToString("N");
-            }
             return series.GetPresentationUniqueKey();
         }
 
diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 49fdcece1..4e5047f78 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -115,7 +115,6 @@ namespace MediaBrowser.Api
             config.EnableStandaloneMusicKeys = true;
             config.EnableCaseSensitiveItemIds = true;
             config.EnableFolderView = true;
-            config.SchemaVersion = 109;
             config.EnableSimpleArtistDetection = true;
             config.SkipDeserializationForBasicTypes = true;
             config.SkipDeserializationForPrograms = true;
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 9e212219d..eb082f707 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -70,6 +70,7 @@
     <Compile Include="Security\IRequiresRegistration.cs" />
     <Compile Include="Security\ISecurityManager.cs" />
     <Compile Include="Security\PaymentRequiredException.cs" />
+    <Compile Include="Updates\GithubUpdater.cs" />
     <Compile Include="Updates\IInstallationManager.cs" />
     <Compile Include="Updates\InstallationEventArgs.cs" />
     <Compile Include="Updates\InstallationFailedEventArgs.cs" />
diff --git a/MediaBrowser.Common/Updates/GithubUpdater.cs b/MediaBrowser.Common/Updates/GithubUpdater.cs
new file mode 100644
index 000000000..c5000391d
--- /dev/null
+++ b/MediaBrowser.Common/Updates/GithubUpdater.cs
@@ -0,0 +1,269 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Updates;
+
+namespace MediaBrowser.Common.Updates
+{
+    public class GithubUpdater
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly IJsonSerializer _jsonSerializer;
+
+        public GithubUpdater(IHttpClient httpClient, IJsonSerializer jsonSerializer)
+        {
+            _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
+        }
+
+        public async Task<CheckForUpdateResult> CheckForUpdateResult(string organzation, string repository, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename, TimeSpan cacheLength, CancellationToken cancellationToken)
+        {
+            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
+
+            var options = new HttpRequestOptions
+            {
+                Url = url,
+                EnableKeepAlive = false,
+                CancellationToken = cancellationToken,
+                UserAgent = "Emby/3.0",
+                BufferContent = false
+            };
+
+            if (cacheLength.Ticks > 0)
+            {
+                options.CacheMode = CacheMode.Unconditional;
+                options.CacheLength = cacheLength;
+            }
+
+            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            {
+                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
+
+                return CheckForUpdateResult(obj, minVersion, updateLevel, assetFilename, packageName, targetFilename);
+            }
+        }
+
+        private CheckForUpdateResult CheckForUpdateResult(RootObject[] obj, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename)
+        {
+            if (updateLevel == PackageVersionClass.Release)
+            {
+                // Technically all we need to do is check that it's not pre-release
+                // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
+                obj = obj.Where(i => !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) && !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+            else if (updateLevel == PackageVersionClass.Beta)
+            {
+                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+            else if (updateLevel == PackageVersionClass.Dev)
+            {
+                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) || i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+
+            var availableUpdate = obj
+                .Select(i => CheckForUpdateResult(i, minVersion, assetFilename, packageName, targetFilename))
+                .Where(i => i != null)
+                .OrderByDescending(i => Version.Parse(i.AvailableVersion))
+                .FirstOrDefault();
+
+            return availableUpdate ?? new CheckForUpdateResult
+            {
+                IsUpdateAvailable = false
+            };
+        }
+
+        private bool MatchesUpdateLevel(RootObject i, PackageVersionClass updateLevel)
+        {
+            if (updateLevel == PackageVersionClass.Beta)
+            {
+                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase);
+            }
+            if (updateLevel == PackageVersionClass.Dev)
+            {
+                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) ||
+                       i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
+            }
+
+            // Technically all we need to do is check that it's not pre-release
+            // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
+            return !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) &&
+                   !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public async Task<List<RootObject>> GetLatestReleases(string organzation, string repository, string assetFilename, CancellationToken cancellationToken)
+        {
+            var list = new List<RootObject>();
+
+            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
+
+            var options = new HttpRequestOptions
+            {
+                Url = url,
+                EnableKeepAlive = false,
+                CancellationToken = cancellationToken,
+                UserAgent = "Emby/3.0",
+                BufferContent = false
+            };
+
+            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            {
+                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
+
+                obj = obj.Where(i => (i.assets ?? new List<Asset>()).Any(a => IsAsset(a, assetFilename))).ToArray();
+
+                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Release)).OrderByDescending(GetVersion).Take(1));
+                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Beta)).OrderByDescending(GetVersion).Take(1));
+                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Dev)).OrderByDescending(GetVersion).Take(1));
+
+                return list;
+            }
+        }
+
+        public Version GetVersion(RootObject obj)
+        {
+            Version version;
+            if (!Version.TryParse(obj.tag_name, out version))
+            {
+                return new Version(1, 0);
+            }
+
+            return version;
+        }
+
+        private CheckForUpdateResult CheckForUpdateResult(RootObject obj, Version minVersion, string assetFilename, string packageName, string targetFilename)
+        {
+            Version version;
+            if (!Version.TryParse(obj.tag_name, out version))
+            {
+                return null;
+            }
+
+            if (version < minVersion)
+            {
+                return null;
+            }
+
+            var asset = (obj.assets ?? new List<Asset>()).FirstOrDefault(i => IsAsset(i, assetFilename));
+
+            if (asset == null)
+            {
+                return null;
+            }
+
+            return new CheckForUpdateResult
+            {
+                AvailableVersion = version.ToString(),
+                IsUpdateAvailable = version > minVersion,
+                Package = new PackageVersionInfo
+                {
+                    classification = obj.prerelease ?
+                        (obj.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase) ? PackageVersionClass.Dev : PackageVersionClass.Beta) :
+                        PackageVersionClass.Release,
+                    name = packageName,
+                    sourceUrl = asset.browser_download_url,
+                    targetFilename = targetFilename,
+                    versionStr = version.ToString(),
+                    requiredVersionStr = "1.0.0",
+                    description = obj.body,
+                    infoUrl = obj.html_url
+                }
+            };
+        }
+
+        private bool IsAsset(Asset asset, string assetFilename)
+        {
+            var downloadFilename = Path.GetFileName(asset.browser_download_url) ?? string.Empty;
+
+            if (downloadFilename.IndexOf(assetFilename, StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return true;
+            }
+
+            return string.Equals(assetFilename, downloadFilename, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public class Uploader
+        {
+            public string login { get; set; }
+            public int id { get; set; }
+            public string avatar_url { get; set; }
+            public string gravatar_id { get; set; }
+            public string url { get; set; }
+            public string html_url { get; set; }
+            public string followers_url { get; set; }
+            public string following_url { get; set; }
+            public string gists_url { get; set; }
+            public string starred_url { get; set; }
+            public string subscriptions_url { get; set; }
+            public string organizations_url { get; set; }
+            public string repos_url { get; set; }
+            public string events_url { get; set; }
+            public string received_events_url { get; set; }
+            public string type { get; set; }
+            public bool site_admin { get; set; }
+        }
+
+        public class Asset
+        {
+            public string url { get; set; }
+            public int id { get; set; }
+            public string name { get; set; }
+            public object label { get; set; }
+            public Uploader uploader { get; set; }
+            public string content_type { get; set; }
+            public string state { get; set; }
+            public int size { get; set; }
+            public int download_count { get; set; }
+            public string created_at { get; set; }
+            public string updated_at { get; set; }
+            public string browser_download_url { get; set; }
+        }
+
+        public class Author
+        {
+            public string login { get; set; }
+            public int id { get; set; }
+            public string avatar_url { get; set; }
+            public string gravatar_id { get; set; }
+            public string url { get; set; }
+            public string html_url { get; set; }
+            public string followers_url { get; set; }
+            public string following_url { get; set; }
+            public string gists_url { get; set; }
+            public string starred_url { get; set; }
+            public string subscriptions_url { get; set; }
+            public string organizations_url { get; set; }
+            public string repos_url { get; set; }
+            public string events_url { get; set; }
+            public string received_events_url { get; set; }
+            public string type { get; set; }
+            public bool site_admin { get; set; }
+        }
+
+        public class RootObject
+        {
+            public string url { get; set; }
+            public string assets_url { get; set; }
+            public string upload_url { get; set; }
+            public string html_url { get; set; }
+            public int id { get; set; }
+            public string tag_name { get; set; }
+            public string target_commitish { get; set; }
+            public string name { get; set; }
+            public bool draft { get; set; }
+            public Author author { get; set; }
+            public bool prerelease { get; set; }
+            public string created_at { get; set; }
+            public string published_at { get; set; }
+            public List<Asset> assets { get; set; }
+            public string tarball_url { get; set; }
+            public string zipball_url { get; set; }
+            public string body { get; set; }
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 3fb118a9c..94baacf13 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -123,7 +123,6 @@ namespace MediaBrowser.Controller.Entities
         public int? MinParentalRating { get; set; }
         public int? MaxParentalRating { get; set; }
 
-        public bool? IsCurrentSchema { get; set; }
         public bool? HasDeadParentId { get; set; }
         public bool? IsOffline { get; set; }
         public bool? IsVirtualItem { get; set; }
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index cca8e3c19..a997d3476 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -126,10 +126,6 @@ namespace MediaBrowser.Controller.Entities.TV
 
         private static string GetUniqueSeriesKey(BaseItem series)
         {
-            if (ConfigurationManager.Configuration.SchemaVersion < 97)
-            {
-                return series.Id.ToString("N");
-            }
             return series.GetPresentationUniqueKey();
         }
 
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 9715a624f..cdda858b7 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -192,9 +192,6 @@ namespace MediaBrowser.Model.Configuration
 
         public int SharingExpirationDays { get; set; }
 
-        public string[] Migrations { get; set; }
-
-        public int MigrationVersion { get; set; }
         public int SchemaVersion { get; set; }
         public int SqliteCacheSize { get; set; }
 
@@ -218,7 +215,6 @@ namespace MediaBrowser.Model.Configuration
         public ServerConfiguration()
         {
             LocalNetworkAddresses = new string[] { };
-            Migrations = new string[] { };
             CodecsUsed = new string[] { };
             SqliteCacheSize = 0;
             ImageExtractionTimeoutMs = 0;
diff --git a/MediaBrowser.Model/Tasks/ITaskManager.cs b/MediaBrowser.Model/Tasks/ITaskManager.cs
index b6f847feb..fa3da97b3 100644
--- a/MediaBrowser.Model/Tasks/ITaskManager.cs
+++ b/MediaBrowser.Model/Tasks/ITaskManager.cs
@@ -74,7 +74,5 @@ namespace MediaBrowser.Model.Tasks
         
         event EventHandler<GenericEventArgs<IScheduledTaskWorker>> TaskExecuting;
         event EventHandler<TaskCompletionEventArgs> TaskCompleted;
-
-        bool SuspendTriggers { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index bb7db6a7c..d864c47d6 100644
--- a/MediaBrowser.Server.Mono/MonoAppHost.cs
+++ b/MediaBrowser.Server.Mono/MonoAppHost.cs
@@ -92,6 +92,32 @@ namespace MediaBrowser.Server.Mono
             MainClass.Shutdown();
         }
 
+        protected override bool SupportsDualModeSockets
+        {
+            get
+            {
+                return GetMonoVersion() >= new Version(4, 6);
+            }
+        }
+
+        private static Version GetMonoVersion()
+        {
+            Type type = Type.GetType("Mono.Runtime");
+            if (type != null)
+            {
+                MethodInfo displayName = type.GetTypeInfo().GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static);
+                var displayNameValue = displayName.Invoke(null, null).ToString().Trim().Split(' ')[0];
+
+                Version version;
+                if (Version.TryParse(displayNameValue, out version))
+                {
+                    return version;
+                }
+            }
+
+            return new Version(1, 0);
+        }
+
         protected override void AuthorizeServer()
         {
             throw new NotImplementedException();
diff --git a/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs b/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs
index 748b94604..3d6a3e35d 100644
--- a/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs
+++ b/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs
@@ -6,7 +6,8 @@ namespace MediaBrowser.Server.Mono.Native
 {
     public class MonoFileSystem : ManagedFileSystem
     {
-        public MonoFileSystem(ILogger logger, bool supportsAsyncFileStreams, bool enableManagedInvalidFileNameChars) : base(logger, supportsAsyncFileStreams, enableManagedInvalidFileNameChars, false)
+        public MonoFileSystem(ILogger logger, bool supportsAsyncFileStreams, bool enableManagedInvalidFileNameChars)
+            : base(logger, supportsAsyncFileStreams, enableManagedInvalidFileNameChars, true)
         {
         }
 
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 9b634d12b..7eafc1721 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -23,8 +23,8 @@ using Emby.Common.Implementations.Logging;
 using Emby.Common.Implementations.Networking;
 using Emby.Common.Implementations.Security;
 using Emby.Server.Core;
-using Emby.Server.Core.Browser;
 using Emby.Server.Implementations;
+using Emby.Server.Implementations.Browser;
 using Emby.Server.Implementations.IO;
 using ImageMagickSharp;
 using MediaBrowser.Common.Net;
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index 139961e6f..c421dd9eb 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Model.Logging;
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
-using Emby.Server.Core.Browser;
+using Emby.Server.Implementations.Browser;
 using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.ServerApplication
diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs
index b950de118..937762ed0 100644
--- a/MediaBrowser.ServerApplication/WindowsAppHost.cs
+++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs
@@ -117,6 +117,14 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
+        protected override bool SupportsDualModeSockets
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         public override void LaunchUrl(string url)
         {
             var process = new Process
@@ -137,6 +145,7 @@ namespace MediaBrowser.ServerApplication
             }
             catch (Exception ex)
             {
+                Console.WriteLine("Error launching url: {0}", url);
                 Logger.ErrorException("Error launching url: {0}", ex, url);
 
                 throw;
-- 
cgit v1.2.3


From 9606a2a710614404b4dda96cceff688314a1ec89 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 24 Nov 2016 11:29:23 -0500
Subject: filter duplicate recordings based on showId

---
 Emby.Common.Implementations/Net/UdpSocket.cs       |  2 -
 .../HttpServer/HttpResultFactory.cs                |  3 +-
 .../LiveTv/EmbyTV/EmbyTV.cs                        | 50 +++++++++++++++++++++-
 .../LiveTv/EmbyTV/RecordingHelper.cs               |  1 +
 .../LiveTv/Listings/XmlTvListingsProvider.cs       |  7 ++-
 MediaBrowser.Controller/LiveTv/TimerInfo.cs        |  2 +
 .../Configuration/ServerConfiguration.cs           |  2 -
 MediaBrowser.Model/Querying/ItemFields.cs          |  2 +
 MediaBrowser.WebDashboard/Api/DashboardService.cs  | 16 +++----
 MediaBrowser.WebDashboard/Api/PackageCreator.cs    | 32 +++++---------
 10 files changed, 79 insertions(+), 38 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Common.Implementations/Net/UdpSocket.cs b/Emby.Common.Implementations/Net/UdpSocket.cs
index b9b7d8a2d..367d2242c 100644
--- a/Emby.Common.Implementations/Net/UdpSocket.cs
+++ b/Emby.Common.Implementations/Net/UdpSocket.cs
@@ -33,8 +33,6 @@ namespace Emby.Common.Implementations.Net
             _LocalPort = localPort;
 
             _Socket.Bind(new IPEndPoint(ip, _LocalPort));
-            if (_LocalPort == 0)
-                _LocalPort = (_Socket.LocalEndPoint as IPEndPoint).Port;
         }
 
         #endregion
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index f65331ec7..313db6a75 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -100,7 +100,8 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            if (addCachePrevention)
+            string expires;
+            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out expires))
             {
                 responseHeaders["Expires"] = "-1";
             }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index b7d2d1748..1fe5d87ce 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -645,6 +645,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             existingTimer.SeasonNumber = updatedTimer.SeasonNumber;
             existingTimer.ShortOverview = updatedTimer.ShortOverview;
             existingTimer.StartDate = updatedTimer.StartDate;
+            existingTimer.ShowId = updatedTimer.ShowId;
         }
 
         public Task<ImageStream> GetChannelImageAsync(string channelId, CancellationToken cancellationToken)
@@ -1836,6 +1837,39 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return seriesTimer.SkipEpisodesInLibrary && IsProgramAlreadyInLibrary(timer);
         }
 
+        private void HandleDuplicateShowIds(List<TimerInfo> timers)
+        {
+            foreach (var timer in timers.Skip(1))
+            {
+                // TODO: Get smarter, prefer HD, etc
+
+                timer.Status = RecordingStatus.Cancelled;
+                _timerProvider.Update(timer);
+            }
+        }
+
+        private void SearchForDuplicateShowIds(List<TimerInfo> timers)
+        {
+            var groups = timers.ToLookup(i => i.ShowId ?? string.Empty).ToList();
+
+            foreach (var group in groups)
+            {
+                if (string.IsNullOrWhiteSpace(group.Key))
+                {
+                    continue;
+                }
+
+                var groupTimers = group.ToList();
+
+                if (groupTimers.Count < 2)
+                {
+                    continue;
+                }
+
+                HandleDuplicateShowIds(groupTimers);
+            }
+        }
+
         private async Task UpdateTimersForSeriesTimer(List<ProgramInfo> epgData, SeriesTimerInfo seriesTimer, bool deleteInvalidTimers)
         {
             var allTimers = GetTimersForSeries(seriesTimer, epgData)
@@ -1843,6 +1877,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             var registration = await _liveTvManager.GetRegistrationInfo("seriesrecordings").ConfigureAwait(false);
 
+            var enabledTimersForSeries = new List<TimerInfo>();
+
             if (registration.IsValid)
             {
                 foreach (var timer in allTimers)
@@ -1855,6 +1891,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         {
                             timer.Status = RecordingStatus.Cancelled;
                         }
+                        else
+                        {
+                            enabledTimersForSeries.Add(timer);
+                        }
                         _timerProvider.Add(timer);
                     }
                     else
@@ -1870,6 +1910,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                                 existingTimer.Status = RecordingStatus.Cancelled;
                             }
 
+                            if (existingTimer.Status != RecordingStatus.Cancelled)
+                            {
+                                enabledTimersForSeries.Add(existingTimer);
+                            }
+
                             existingTimer.SeriesTimerId = seriesTimer.Id;
                             _timerProvider.Update(existingTimer);
                         }
@@ -1877,6 +1922,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
             }
 
+            SearchForDuplicateShowIds(enabledTimersForSeries);
+
             if (deleteInvalidTimers)
             {
                 var allTimerIds = allTimers
@@ -1901,8 +1948,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private IEnumerable<TimerInfo> GetTimersForSeries(SeriesTimerInfo seriesTimer,
-            IEnumerable<ProgramInfo> allPrograms)
+        private IEnumerable<TimerInfo> GetTimersForSeries(SeriesTimerInfo seriesTimer, IEnumerable<ProgramInfo> allPrograms)
         {
             if (seriesTimer == null)
             {
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
index 0ae5971bc..1b6ddc73f 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
@@ -31,6 +31,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             timer.Name = parent.Name;
             timer.Overview = parent.Overview;
             timer.SeriesTimerId = seriesTimer.Id;
+            timer.ShowId = parent.ShowId;
 
             CopyProgramInfoToTimerInfo(parent, timer);
 
diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
index 33db69ee2..45158b3c2 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
@@ -124,12 +124,14 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
         private ProgramInfo GetProgramInfo(XmlTvProgram p, ListingsProviderInfo info)
         {
+            var episodeTitle = p.Episode == null ? null : p.Episode.Title;
+
             var programInfo = new ProgramInfo
             {
                 ChannelId = p.ChannelId,
                 EndDate = GetDate(p.EndDate),
                 EpisodeNumber = p.Episode == null ? null : p.Episode.Episode,
-                EpisodeTitle = p.Episode == null ? null : p.Episode.Title,
+                EpisodeTitle = episodeTitle,
                 Genres = p.Categories,
                 Id = String.Format("{0}_{1:O}", p.ChannelId, p.StartDate), // Construct an id from the channel and start date,
                 StartDate = GetDate(p.StartDate),
@@ -149,7 +151,8 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 HasImage = p.Icon != null && !String.IsNullOrEmpty(p.Icon.Source),
                 OfficialRating = p.Rating != null && !String.IsNullOrEmpty(p.Rating.Value) ? p.Rating.Value : null,
                 CommunityRating = p.StarRating.HasValue ? p.StarRating.Value : (float?)null,
-                SeriesId = p.Episode != null ? p.Title.GetMD5().ToString("N") : null
+                SeriesId = p.Episode != null ? p.Title.GetMD5().ToString("N") : null,
+                ShowId = ((p.Title ?? string.Empty) + (episodeTitle ?? string.Empty)).GetMD5().ToString("N")
             };
 
             if (programInfo.IsMovie)
diff --git a/MediaBrowser.Controller/LiveTv/TimerInfo.cs b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
index fd614253a..ee8dd5d3a 100644
--- a/MediaBrowser.Controller/LiveTv/TimerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
@@ -34,6 +34,8 @@ namespace MediaBrowser.Controller.LiveTv
         /// <value>The program identifier.</value>
         public string ProgramId { get; set; }
 
+        public string ShowId { get; set; }
+
         /// <summary>
         /// Name of the recording.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index cdda858b7..64225ae76 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -154,7 +154,6 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [enable dashboard response caching]; otherwise, <c>false</c>.</value>
         public bool EnableDashboardResponseCaching { get; set; }
-        public bool EnableDashboardResourceMinification { get; set; }
 
         /// <summary>
         /// Allows the dashboard to be served from a custom path.
@@ -230,7 +229,6 @@ namespace MediaBrowser.Model.Configuration
             HttpsPortNumber = DefaultHttpsPort;
             EnableHttps = false;
             EnableDashboardResponseCaching = true;
-            EnableDashboardResourceMinification = true;
             EnableAnonymousUsageReporting = true;
 
             EnableAutomaticRestart = true;
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index dfca9e771..bf1d4991c 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -45,6 +45,8 @@
         /// </summary>
         Chapters,
 
+        ChildCount,
+
         /// <summary>
         /// The critic rating summary
         /// </summary>
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index ebd11ca9a..7fcfbfb13 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -113,6 +113,7 @@ namespace MediaBrowser.WebDashboard.Api
         private readonly ILocalizationManager _localization;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IAssemblyInfo _assemblyInfo;
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardService" /> class.
@@ -120,7 +121,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// <param name="appHost">The app host.</param>
         /// <param name="serverConfigurationManager">The server configuration manager.</param>
         /// <param name="fileSystem">The file system.</param>
-        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, IAssemblyInfo assemblyInfo, ILogger logger, IHttpResultFactory resultFactory)
+        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, IAssemblyInfo assemblyInfo, ILogger logger, IHttpResultFactory resultFactory, IMemoryStreamFactory memoryStreamFactory)
         {
             _appHost = appHost;
             _serverConfigurationManager = serverConfigurationManager;
@@ -130,6 +131,7 @@ namespace MediaBrowser.WebDashboard.Api
             _assemblyInfo = assemblyInfo;
             _logger = logger;
             _resultFactory = resultFactory;
+            _memoryStreamFactory = memoryStreamFactory;
         }
 
         /// <summary>
@@ -161,7 +163,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             if (plugin != null && stream != null)
             {
-                return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator().ModifyHtml("dummy.html", stream, null, _appHost.ApplicationVersion.ToString(), null, false));
+                return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator().ModifyHtml("dummy.html", stream, null, _appHost.ApplicationVersion.ToString(), null));
             }
 
             throw new ResourceNotFoundException();
@@ -294,7 +296,7 @@ namespace MediaBrowser.WebDashboard.Api
                 cacheDuration = TimeSpan.FromDays(365);
             }
 
-            var cacheKey = (_appHost.ApplicationVersion.ToString() + (localizationCulture ?? string.Empty) + path).GetMD5();
+            var cacheKey = (_appHost.ApplicationVersion + (localizationCulture ?? string.Empty) + path).GetMD5();
 
             return await _resultFactory.GetStaticResult(Request, cacheKey, null, cacheDuration, contentType, () => GetResourceStream(path, localizationCulture)).ConfigureAwait(false);
         }
@@ -312,15 +314,13 @@ namespace MediaBrowser.WebDashboard.Api
         /// <returns>Task{Stream}.</returns>
         private Task<Stream> GetResourceStream(string path, string localizationCulture)
         {
-            var minify = _serverConfigurationManager.Configuration.EnableDashboardResourceMinification;
-
             return GetPackageCreator()
-                .GetResource(path, null, localizationCulture, _appHost.ApplicationVersion.ToString(), minify);
+                .GetResource(path, null, localizationCulture, _appHost.ApplicationVersion.ToString());
         }
 
         private PackageCreator GetPackageCreator()
         {
-            return new PackageCreator(_fileSystem, _localization, _logger, _serverConfigurationManager, _jsonSerializer);
+            return new PackageCreator(_fileSystem, _logger, _serverConfigurationManager, _memoryStreamFactory);
         }
 
         private List<string> GetDeployIgnoreExtensions()
@@ -507,7 +507,7 @@ namespace MediaBrowser.WebDashboard.Api
 
         private async Task DumpFile(string resourceVirtualPath, string destinationFilePath, string mode, string culture, string appVersion)
         {
-            using (var stream = await GetPackageCreator().GetResource(resourceVirtualPath, mode, culture, appVersion, false).ConfigureAwait(false))
+            using (var stream = await GetPackageCreator().GetResource(resourceVirtualPath, mode, culture, appVersion).ConfigureAwait(false))
             {
                 using (var fs = _fileSystem.GetFileStream(destinationFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
                 {
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 260352c7e..f2df01976 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -16,32 +16,28 @@ namespace MediaBrowser.WebDashboard.Api
     public class PackageCreator
     {
         private readonly IFileSystem _fileSystem;
-        private readonly ILocalizationManager _localization;
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
-        private readonly IJsonSerializer _jsonSerializer;
+        private readonly IMemoryStreamFactory _memoryStreamFactory;
 
-        public PackageCreator(IFileSystem fileSystem, ILocalizationManager localization, ILogger logger, IServerConfigurationManager config, IJsonSerializer jsonSerializer)
+        public PackageCreator(IFileSystem fileSystem, ILogger logger, IServerConfigurationManager config, IMemoryStreamFactory memoryStreamFactory)
         {
             _fileSystem = fileSystem;
-            _localization = localization;
             _logger = logger;
             _config = config;
-            _jsonSerializer = jsonSerializer;
+            _memoryStreamFactory = memoryStreamFactory;
         }
 
         public async Task<Stream> GetResource(string path,
             string mode,
             string localizationCulture,
-            string appVersion,
-            bool enableMinification)
+            string appVersion)
         {
             Stream resourceStream;
 
             if (path.Equals("css/all.css", StringComparison.OrdinalIgnoreCase))
             {
-                resourceStream = await GetAllCss(enableMinification).ConfigureAwait(false);
-                enableMinification = false;
+                resourceStream = await GetAllCss().ConfigureAwait(false);
             }
             else
             {
@@ -56,7 +52,7 @@ namespace MediaBrowser.WebDashboard.Api
                 {
                     if (IsCoreHtml(path))
                     {
-                        resourceStream = await ModifyHtml(path, resourceStream, mode, appVersion, localizationCulture, enableMinification).ConfigureAwait(false);
+                        resourceStream = await ModifyHtml(path, resourceStream, mode, appVersion, localizationCulture).ConfigureAwait(false);
                     }
                 }
             }
@@ -140,20 +136,14 @@ namespace MediaBrowser.WebDashboard.Api
         /// <summary>
         /// Modifies the HTML by adding common meta tags, css and js.
         /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="sourceStream">The source stream.</param>
-        /// <param name="mode">The mode.</param>
-        /// <param name="appVersion">The application version.</param>
-        /// <param name="localizationCulture">The localization culture.</param>
-        /// <param name="enableMinification">if set to <c>true</c> [enable minification].</param>
         /// <returns>Task{Stream}.</returns>
-        public async Task<Stream> ModifyHtml(string path, Stream sourceStream, string mode, string appVersion, string localizationCulture, bool enableMinification)
+        public async Task<Stream> ModifyHtml(string path, Stream sourceStream, string mode, string appVersion, string localizationCulture)
         {
             using (sourceStream)
             {
                 string html;
 
-                using (var memoryStream = new MemoryStream())
+                using (var memoryStream = _memoryStreamFactory.CreateNew())
                 {
                     await sourceStream.CopyToAsync(memoryStream).ConfigureAwait(false);
 
@@ -202,7 +192,7 @@ namespace MediaBrowser.WebDashboard.Api
 
                 var bytes = Encoding.UTF8.GetBytes(html);
 
-                return new MemoryStream(bytes);
+                return _memoryStreamFactory.CreateNew(bytes);
             }
         }
 
@@ -332,9 +322,9 @@ namespace MediaBrowser.WebDashboard.Api
         /// Gets all CSS.
         /// </summary>
         /// <returns>Task{Stream}.</returns>
-        private async Task<Stream> GetAllCss(bool enableMinification)
+        private async Task<Stream> GetAllCss()
         {
-            var memoryStream = new MemoryStream();
+            var memoryStream = _memoryStreamFactory.CreateNew();
 
             var files = new[]
                                   {
-- 
cgit v1.2.3


From 921ec9cd11b71171cb69fa538e9d1ec1f2ffbbd5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 26 Nov 2016 19:40:15 -0500
Subject: save additional info to recording nfo's

---
 .../Data/SqliteItemRepository.cs                   |  13 +-
 .../HttpServer/HttpListenerHost.cs                 |   6 +-
 .../LiveTv/EmbyTV/EmbyTV.cs                        | 201 ++++++++++++++++++---
 Emby.Server.Implementations/Sync/SyncRepository.cs |  20 +-
 MediaBrowser.Api/Library/LibraryService.cs         |  17 +-
 .../Entities/InternalItemsQuery.cs                 |   1 +
 6 files changed, 219 insertions(+), 39 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 727a9c4bb..c6e5a6dcf 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -170,7 +170,9 @@ namespace Emby.Server.Implementations.Data
 
                                 createMediaStreamsTableCommand,
 
-                                "create index if not exists idx_mediastreams1 on mediastreams(ItemId)"
+                                "create index if not exists idx_mediastreams1 on mediastreams(ItemId)",
+
+                                "pragma shrink_memory"
 
                                };
 
@@ -3591,6 +3593,15 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
+            if (!string.IsNullOrWhiteSpace(query.ExternalId))
+            {
+                whereClauses.Add("ExternalId=@ExternalId");
+                if (statement != null)
+                {
+                    statement.TryBind("@ExternalId", query.ExternalId);
+                }
+            }
+
             if (!string.IsNullOrWhiteSpace(query.Name))
             {
                 whereClauses.Add("CleanName=@Name");
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index c1758127a..8a5ae2c3a 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -414,9 +414,9 @@ namespace Emby.Server.Implementations.HttpServer
                     httpRes.StatusCode = 200;
                     httpRes.AddHeader("Access-Control-Allow-Origin", "*");
                     httpRes.AddHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
-                    httpRes.AddHeader("Access-Control-Allow-Headers",
-                        "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
-                    httpRes.ContentType = "text/html";
+                    httpRes.AddHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
+                    httpRes.ContentType = "text/plain";
+                    Write(httpRes, string.Empty);
                     return;
                 }
 
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 1fe5d87ce..36a4dc608 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1601,6 +1601,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             try
             {
+                var program = string.IsNullOrWhiteSpace(timer.ProgramId) ? null : _libraryManager.GetItemList(new InternalItemsQuery
+                {
+                    IncludeItemTypes = new[] { typeof(LiveTvProgram).Name },
+                    Limit = 1,
+                    ExternalId = timer.ProgramId
+
+                }).FirstOrDefault();
+
                 if (timer.IsSports)
                 {
                     AddGenre(timer.Genres, "Sports");
@@ -1615,14 +1623,37 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     AddGenre(timer.Genres, "News");
                 }
 
+                // dummy this up
+                if (program == null)
+                {
+                    program = new LiveTvProgram
+                    {
+                        Name = timer.Name,
+                        HomePageUrl = timer.HomePageUrl,
+                        ShortOverview = timer.ShortOverview,
+                        Overview = timer.Overview,
+                        Genres = timer.Genres,
+                        CommunityRating = timer.CommunityRating,
+                        OfficialRating = timer.OfficialRating,
+                        ProductionYear = timer.ProductionYear,
+                        PremiereDate = timer.OriginalAirDate,
+                        IndexNumber = timer.EpisodeNumber,
+                        ParentIndexNumber = timer.SeasonNumber
+                    };
+                }
+
                 if (timer.IsProgramSeries)
                 {
-                    SaveSeriesNfo(timer, recordingPath, seriesPath);
-                    SaveVideoNfo(timer, recordingPath, false);
+                    SaveSeriesNfo(timer, seriesPath);
+                    SaveVideoNfo(timer, recordingPath, program, false);
                 }
                 else if (!timer.IsMovie || timer.IsSports || timer.IsNews)
                 {
-                    SaveVideoNfo(timer, recordingPath, true);
+                    SaveVideoNfo(timer, recordingPath, program, true);
+                }
+                else
+                {
+                    SaveVideoNfo(timer, recordingPath, program, false);
                 }
             }
             catch (Exception ex)
@@ -1631,7 +1662,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private void SaveSeriesNfo(TimerInfo timer, string recordingPath, string seriesPath)
+        private void SaveSeriesNfo(TimerInfo timer, string seriesPath)
         {
             var nfoPath = Path.Combine(seriesPath, "tvshow.nfo");
 
@@ -1676,7 +1707,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         }
 
         public const string DateAddedFormat = "yyyy-MM-dd HH:mm:ss";
-        private void SaveVideoNfo(TimerInfo timer, string recordingPath, bool lockData)
+        private void SaveVideoNfo(TimerInfo timer, string recordingPath, BaseItem item, bool lockData)
         {
             var nfoPath = Path.ChangeExtension(recordingPath, ".nfo");
 
@@ -1694,6 +1725,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     CloseOutput = false
                 };
 
+                var options = _config.GetNfoConfiguration();
+
                 using (XmlWriter writer = XmlWriter.Create(stream, settings))
                 {
                     writer.WriteStartDocument(true);
@@ -1707,45 +1740,64 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                             writer.WriteElementString("title", timer.EpisodeTitle);
                         }
 
-                        if (timer.OriginalAirDate.HasValue)
+                        if (item.PremiereDate.HasValue)
                         {
-                            var formatString = _config.GetNfoConfiguration().ReleaseDateFormat;
+                            var formatString = options.ReleaseDateFormat;
 
-                            writer.WriteElementString("aired", timer.OriginalAirDate.Value.ToLocalTime().ToString(formatString));
+                            writer.WriteElementString("aired", item.PremiereDate.Value.ToLocalTime().ToString(formatString));
                         }
 
-                        if (timer.EpisodeNumber.HasValue)
+                        if (item.IndexNumber.HasValue)
                         {
-                            writer.WriteElementString("episode", timer.EpisodeNumber.Value.ToString(CultureInfo.InvariantCulture));
+                            writer.WriteElementString("episode", item.IndexNumber.Value.ToString(CultureInfo.InvariantCulture));
                         }
 
-                        if (timer.SeasonNumber.HasValue)
+                        if (item.ParentIndexNumber.HasValue)
                         {
-                            writer.WriteElementString("season", timer.SeasonNumber.Value.ToString(CultureInfo.InvariantCulture));
+                            writer.WriteElementString("season", item.ParentIndexNumber.Value.ToString(CultureInfo.InvariantCulture));
                         }
                     }
                     else
                     {
                         writer.WriteStartElement("movie");
 
-                        if (!string.IsNullOrWhiteSpace(timer.Name))
+                        if (!string.IsNullOrWhiteSpace(item.Name))
+                        {
+                            writer.WriteElementString("title", item.Name);
+                        }
+
+                        if (!string.IsNullOrWhiteSpace(item.OriginalTitle))
+                        {
+                            writer.WriteElementString("originaltitle", item.OriginalTitle);
+                        }
+
+                        if (item.PremiereDate.HasValue)
                         {
-                            writer.WriteElementString("title", timer.Name);
+                            var formatString = options.ReleaseDateFormat;
+
+                            writer.WriteElementString("premiered", item.PremiereDate.Value.ToLocalTime().ToString(formatString));
+                            writer.WriteElementString("releasedate", item.PremiereDate.Value.ToLocalTime().ToString(formatString));
                         }
                     }
 
                     writer.WriteElementString("dateadded", DateTime.UtcNow.ToLocalTime().ToString(DateAddedFormat));
 
-                    if (timer.ProductionYear.HasValue)
+                    if (item.ProductionYear.HasValue)
                     {
-                        writer.WriteElementString("year", timer.ProductionYear.Value.ToString(CultureInfo.InvariantCulture));
+                        writer.WriteElementString("year", item.ProductionYear.Value.ToString(CultureInfo.InvariantCulture));
                     }
-                    if (!string.IsNullOrEmpty(timer.OfficialRating))
+
+                    if (!string.IsNullOrEmpty(item.OfficialRating))
                     {
-                        writer.WriteElementString("mpaa", timer.OfficialRating);
+                        writer.WriteElementString("mpaa", item.OfficialRating);
                     }
 
-                    var overview = (timer.Overview ?? string.Empty)
+                    if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
+                    {
+                        writer.WriteElementString("mpaadescription", item.OfficialRatingDescription);
+                    }
+
+                    var overview = (item.Overview ?? string.Empty)
                         .StripHtml()
                         .Replace("&quot;", "'");
 
@@ -1756,24 +1808,116 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         writer.WriteElementString("lockdata", true.ToString().ToLower());
                     }
 
-                    if (timer.CommunityRating.HasValue)
+                    if (item.CommunityRating.HasValue)
                     {
-                        writer.WriteElementString("rating", timer.CommunityRating.Value.ToString(CultureInfo.InvariantCulture));
+                        writer.WriteElementString("rating", item.CommunityRating.Value.ToString(CultureInfo.InvariantCulture));
                     }
 
-                    foreach (var genre in timer.Genres)
+                    foreach (var genre in item.Genres)
                     {
                         writer.WriteElementString("genre", genre);
                     }
 
-                    if (!string.IsNullOrWhiteSpace(timer.ShortOverview))
+                    if (!string.IsNullOrWhiteSpace(item.ShortOverview))
                     {
-                        writer.WriteElementString("outline", timer.ShortOverview);
+                        writer.WriteElementString("outline", item.ShortOverview);
                     }
 
-                    if (!string.IsNullOrWhiteSpace(timer.HomePageUrl))
+                    if (!string.IsNullOrWhiteSpace(item.HomePageUrl))
+                    {
+                        writer.WriteElementString("website", item.HomePageUrl);
+                    }
+
+                    var people = item.Id == Guid.Empty ? new List<PersonInfo>() : _libraryManager.GetPeople(item);
+
+                    var directors = people
+                        .Where(i => IsPersonType(i, PersonType.Director))
+                        .Select(i => i.Name)
+                        .ToList();
+
+                    foreach (var person in directors)
                     {
-                        writer.WriteElementString("website", timer.HomePageUrl);
+                        writer.WriteElementString("director", person);
+                    }
+
+                    var writers = people
+                        .Where(i => IsPersonType(i, PersonType.Writer))
+                        .Select(i => i.Name)
+                        .Distinct(StringComparer.OrdinalIgnoreCase)
+                        .ToList();
+
+                    foreach (var person in writers)
+                    {
+                        writer.WriteElementString("writer", person);
+                    }
+
+                    foreach (var person in writers)
+                    {
+                        writer.WriteElementString("credits", person);
+                    }
+
+                    var rt = item.GetProviderId(MetadataProviders.RottenTomatoes);
+
+                    if (!string.IsNullOrEmpty(rt))
+                    {
+                        writer.WriteElementString("rottentomatoesid", rt);
+                    }
+
+                    var tmdbCollection = item.GetProviderId(MetadataProviders.TmdbCollection);
+
+                    if (!string.IsNullOrEmpty(tmdbCollection))
+                    {
+                        writer.WriteElementString("collectionnumber", tmdbCollection);
+                    }
+
+                    var imdb = item.GetProviderId(MetadataProviders.Imdb);
+                    if (!string.IsNullOrEmpty(imdb))
+                    {
+                        if (item is Series)
+                        {
+                            writer.WriteElementString("imdb_id", imdb);
+                        }
+                        else
+                        {
+                            writer.WriteElementString("imdbid", imdb);
+                        }
+                    }
+
+                    var tvdb = item.GetProviderId(MetadataProviders.Tvdb);
+                    if (!string.IsNullOrEmpty(tvdb))
+                    {
+                        writer.WriteElementString("tvdbid", tvdb);
+                    }
+
+                    var tmdb = item.GetProviderId(MetadataProviders.Tmdb);
+                    if (!string.IsNullOrEmpty(tmdb))
+                    {
+                        writer.WriteElementString("tmdbid", tmdb);
+                    }
+
+                    if (item.CriticRating.HasValue)
+                    {
+                        writer.WriteElementString("criticrating", item.CriticRating.Value.ToString(CultureInfo.InvariantCulture));
+                    }
+
+                    if (!string.IsNullOrEmpty(item.CriticRatingSummary))
+                    {
+                        writer.WriteElementString("criticratingsummary", item.CriticRatingSummary);
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(item.Tagline))
+                    {
+                        writer.WriteElementString("tagline", item.Tagline);
+                    }
+
+                    foreach (var studio in item.Studios)
+                    {
+                        writer.WriteElementString("studio", studio);
+                    }
+
+                    if (item.VoteCount.HasValue)
+                    {
+                        writer.WriteElementString("votes", item.VoteCount.Value.ToString(CultureInfo.InvariantCulture));
                     }
 
                     writer.WriteEndElement();
@@ -1782,6 +1926,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
+        private static bool IsPersonType(PersonInfo person, string type)
+        {
+            return string.Equals(person.Type, type, StringComparison.OrdinalIgnoreCase) || string.Equals(person.Role, type, StringComparison.OrdinalIgnoreCase);
+        }
+
         private void AddGenre(List<string> genres, string genre)
         {
             if (!genres.Contains(genre, StringComparer.OrdinalIgnoreCase))
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index d8bec1ce3..8cce7a8bf 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -229,7 +229,6 @@ namespace Emby.Server.Implementations.Sync
                         commandText = "update SyncJobs set TargetId=?,Name=?,Profile=?,Quality=?,Bitrate=?,Status=?,Progress=?,UserId=?,ItemIds=?,Category=?,ParentId=?,UnwatchedOnly=?,ItemLimit=?,SyncNewContent=?,DateCreated=?,DateLastModified=?,ItemCount=? where Id=?";
                     }
 
-                    paramList.Add(job.Id.ToGuidParamValue());
                     paramList.Add(job.TargetId);
                     paramList.Add(job.Name);
                     paramList.Add(job.Profile);
@@ -249,6 +248,15 @@ namespace Emby.Server.Implementations.Sync
                     paramList.Add(job.DateLastModified.ToDateTimeParamValue());
                     paramList.Add(job.ItemCount);
 
+                    if (insert)
+                    {
+                        paramList.Insert(0, job.Id.ToGuidParamValue());
+                    }
+                    else
+                    {
+                        paramList.Add(job.Id.ToGuidParamValue());
+                    }
+
                     connection.RunInTransaction(conn =>
                     {
                         conn.Execute(commandText, paramList.ToArray());
@@ -698,7 +706,6 @@ namespace Emby.Server.Implementations.Sync
                     }
 
                     var paramList = new List<object>();
-                    paramList.Add(jobItem.Id.ToGuidParamValue());
                     paramList.Add(jobItem.ItemId);
                     paramList.Add(jobItem.ItemName);
                     paramList.Add(jobItem.MediaSourceId);
@@ -716,6 +723,15 @@ namespace Emby.Server.Implementations.Sync
                     paramList.Add(jobItem.JobItemIndex);
                     paramList.Add(jobItem.ItemDateModifiedTicks);
 
+                    if (insert)
+                    {
+                        paramList.Insert(0, jobItem.Id.ToGuidParamValue());
+                    }
+                    else
+                    {
+                        paramList.Add(jobItem.Id.ToGuidParamValue());
+                    }
+
                     connection.RunInTransaction(conn =>
                     {
                         conn.Execute(commandText, paramList.ToArray());
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 695718a25..15c1cbe82 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -680,14 +680,17 @@ namespace MediaBrowser.Api.Library
         /// <param name="request">The request.</param>
         public void Post(RefreshLibrary request)
         {
-            try
-            {
-                _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None);
-            }
-            catch (Exception ex)
+            Task.Run(() =>
             {
-                Logger.ErrorException("Error refreshing library", ex);
-            }
+                try
+                {
+                    _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None);
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error refreshing library", ex);
+                }
+            });
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index be6e95ddd..17ef81db9 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -141,6 +141,7 @@ namespace MediaBrowser.Controller.Entities
         public SeriesStatus[] SeriesStatuses { get; set; }
         public string AlbumArtistStartsWithOrGreater { get; set; }
         public string ExternalSeriesId { get; set; }
+        public string ExternalId { get; set; }
 
         public string[] AlbumNames { get; set; }
         public string[] ArtistNames { get; set; }
-- 
cgit v1.2.3


From 26ef23d628c6f84baca5491203e1fe2a9a82d6b9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 27 Nov 2016 14:36:56 -0500
Subject: update caching headers

---
 .../IO/ManagedFileSystem.cs                        | 30 +++++++++++---
 Emby.Server.Core/ApplicationHost.cs                |  2 +-
 .../Data/BaseSqliteRepository.cs                   | 17 ++++++--
 .../Data/SqliteDisplayPreferencesRepository.cs     | 10 ++---
 .../Data/SqliteItemRepository.cs                   | 46 ++++++++++++++++++++--
 .../Data/SqliteUserDataRepository.cs               |  8 ++++
 .../HttpServer/HttpResultFactory.cs                | 13 ++++--
 Emby.Server.Implementations/Sync/SyncRepository.cs |  8 ++++
 MediaBrowser.Model/IO/IFileSystem.cs               | 13 +-----
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs         |  1 -
 MediaBrowser.Providers/Manager/MetadataService.cs  | 36 +++++++----------
 MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs   | 22 ++++++-----
 12 files changed, 139 insertions(+), 67 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Common.Implementations/IO/ManagedFileSystem.cs b/Emby.Common.Implementations/IO/ManagedFileSystem.cs
index 4fb70d4e2..b5943e17b 100644
--- a/Emby.Common.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Common.Implementations/IO/ManagedFileSystem.cs
@@ -397,16 +397,34 @@ namespace Emby.Common.Implementations.IO
 
         private FileAccess GetFileAccess(FileAccessMode mode)
         {
-            var val = (int)mode;
-
-            return (FileAccess)val;
+            switch (mode)
+            {
+                case FileAccessMode.ReadWrite:
+                    return FileAccess.ReadWrite;
+                case FileAccessMode.Write:
+                    return FileAccess.Write;
+                case FileAccessMode.Read:
+                    return FileAccess.Read;
+                default:
+                    throw new Exception("Unrecognized FileAccessMode");
+            }
         }
 
         private FileShare GetFileShare(FileShareMode mode)
         {
-            var val = (int)mode;
-
-            return (FileShare)val;
+            switch (mode)
+            {
+                case FileShareMode.ReadWrite:
+                    return FileShare.ReadWrite;
+                case FileShareMode.Write:
+                    return FileShare.Write;
+                case FileShareMode.Read:
+                    return FileShare.Read;
+                case FileShareMode.None:
+                    return FileShare.None;
+                default:
+                    throw new Exception("Unrecognized FileShareMode");
+            }
         }
 
         public void SetHidden(string path, bool isHidden)
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 7e5d6e31c..90848d930 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -551,7 +551,7 @@ namespace Emby.Server.Core
             DisplayPreferencesRepository = displayPreferencesRepo;
             RegisterSingleInstance(DisplayPreferencesRepository);
 
-            var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo);
+            var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo, TimerFactory);
             ItemRepository = itemRepo;
             RegisterSingleInstance(ItemRepository);
 
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 5c60a6f86..308b8356f 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -88,11 +88,14 @@ namespace Emby.Server.Implementations.Data
 
             var queries = new List<string>
             {
-                "PRAGMA temp_store = memory",
-                //"PRAGMA journal_mode=WAL"
                 //"PRAGMA cache size=-10000"
             };
 
+            if (EnableTempStoreMemory)
+            {
+                queries.Add("PRAGMA temp_store = memory");
+            }
+
             //var cacheSize = CacheSize;
             //if (cacheSize.HasValue)
             //{
@@ -116,7 +119,7 @@ namespace Emby.Server.Implementations.Data
                     db.ExecuteAll(string.Join(";", queries.ToArray()));
                 }
             }
-            else
+            else if (queries.Count > 0)
             {
                 db.ExecuteAll(string.Join(";", queries.ToArray()));
             }
@@ -124,6 +127,14 @@ namespace Emby.Server.Implementations.Data
             return db;
         }
 
+        protected virtual bool EnableTempStoreMemory
+        {
+            get
+            {
+                return false;
+            }
+        }
+
         protected virtual int? CacheSize
         {
             get
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 17afbcfa9..1bd64b21d 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -63,8 +63,8 @@ namespace Emby.Server.Implementations.Data
 
                 string[] queries = {
 
-                               "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
-                                "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
+                    "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
+                    "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
                                };
 
                 connection.RunQueries(queries);
@@ -107,10 +107,10 @@ namespace Emby.Server.Implementations.Data
 
         private void SaveDisplayPreferences(DisplayPreferences displayPreferences, Guid userId, string client, IDatabaseConnection connection)
         {
-            using (var statement = connection.PrepareStatement("replace into userdisplaypreferences (id, userid, client, data) values (@id, @userid, @client, @data)"))
-            {
-                var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider);
+            var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider);
 
+            using (var statement = connection.PrepareStatement("replace into userdisplaypreferences (id, userid, client, data) values (@id, @userId, @client, @data)"))
+            {
                 statement.TryBind("@id", displayPreferences.Id.ToGuidParamValue());
                 statement.TryBind("@userId", userId.ToGuidParamValue());
                 statement.TryBind("@client", client);
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index c6e5a6dcf..29aacc059 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -30,6 +30,7 @@ using MediaBrowser.Server.Implementations.Playlists;
 using MediaBrowser.Model.Reflection;
 using SQLitePCL.pretty;
 using MediaBrowser.Model.System;
+using MediaBrowser.Model.Threading;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -68,11 +69,13 @@ namespace Emby.Server.Implementations.Data
         private readonly IMemoryStreamFactory _memoryStreamProvider;
         private readonly IFileSystem _fileSystem;
         private readonly IEnvironmentInfo _environmentInfo;
+        private readonly ITimerFactory _timerFactory;
+        private ITimer _shrinkMemoryTimer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
-        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo)
+        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo, ITimerFactory timerFactory)
             : base(logger)
         {
             if (config == null)
@@ -89,6 +92,7 @@ namespace Emby.Server.Implementations.Data
             _memoryStreamProvider = memoryStreamProvider;
             _fileSystem = fileSystem;
             _environmentInfo = environmentInfo;
+            _timerFactory = timerFactory;
             _typeMapper = new TypeMapper(assemblyInfo);
 
             _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews");
@@ -119,6 +123,14 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
+        protected override bool EnableTempStoreMemory
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private SQLiteDatabaseConnection _backgroundConnection;
         protected override void CloseConnection()
         {
@@ -129,6 +141,12 @@ namespace Emby.Server.Implementations.Data
                 _backgroundConnection.Dispose();
                 _backgroundConnection = null;
             }
+
+            if (_shrinkMemoryTimer != null)
+            {
+                _shrinkMemoryTimer.Dispose();
+                _shrinkMemoryTimer = null;
+            }
         }
 
         /// <summary>
@@ -364,13 +382,35 @@ namespace Emby.Server.Implementations.Data
 
                 connection.RunQueries(postQueries);
 
-                //SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
                 //await Vacuum(_connection).ConfigureAwait(false);
             }
 
             userDataRepo.Initialize(WriteLock);
 
             _backgroundConnection = CreateConnection(true);
+
+            _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
+        }
+
+        private void OnShrinkMemoryTimerCallback(object state)
+        {
+            try
+            {
+                using (WriteLock.Write())
+                {
+                    using (var connection = CreateConnection())
+                    {
+                        connection.RunQueries(new string[]
+                        {
+                            "pragma shrink_memory"
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error running shrink memory", ex);
+            }
         }
 
         private readonly string[] _retriveItemColumns =
@@ -666,7 +706,7 @@ namespace Emby.Server.Implementations.Data
         {
             var requiresReset = false;
 
-            var statements = db.PrepareAll(string.Join(";",  new string[]
+            var statements = db.PrepareAll(string.Join(";", new string[]
             {
                 GetSaveItemCommandText(),
                 "delete from AncestorIds where ItemId=@ItemId",
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 4c1b8fcd9..b01f215e0 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -84,6 +84,14 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
+        protected override bool EnableTempStoreMemory
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private void ImportUserDataIfNeeded(IDatabaseConnection connection)
         {
             if (!_fileSystem.FileExists(_importFile))
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index 313db6a75..995dc7b7b 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -735,7 +735,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// <returns><c>true</c> if [is not modified] [the specified cache key]; otherwise, <c>false</c>.</returns>
         private bool IsNotModified(IRequest requestContext, Guid? cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
         {
-            var isNotModified = true;
+            //var isNotModified = true;
 
             var ifModifiedSinceHeader = requestContext.Headers.Get("If-Modified-Since");
 
@@ -745,18 +745,23 @@ namespace Emby.Server.Implementations.HttpServer
 
                 if (DateTime.TryParse(ifModifiedSinceHeader, out ifModifiedSince))
                 {
-                    isNotModified = IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified);
+                    if (IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified))
+                    {
+                        return true;
+                    }
                 }
             }
 
             var ifNoneMatchHeader = requestContext.Headers.Get("If-None-Match");
 
             // Validate If-None-Match
-            if (isNotModified && (cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader)))
+            if ((cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader)))
             {
                 Guid ifNoneMatch;
 
-                if (Guid.TryParse(ifNoneMatchHeader ?? string.Empty, out ifNoneMatch))
+                ifNoneMatchHeader = (ifNoneMatchHeader ?? string.Empty).Trim('\"');
+
+                if (Guid.TryParse(ifNoneMatchHeader, out ifNoneMatch))
                 {
                     if (cacheKey.HasValue && cacheKey.Value == ifNoneMatch)
                     {
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index 8cce7a8bf..b2d9fbcc9 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -83,6 +83,14 @@ namespace Emby.Server.Implementations.Sync
             }
         }
 
+        protected override bool EnableTempStoreMemory
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private const string BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
         private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks from SyncJobItems";
 
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index 22e1e7758..62bb66ea8 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -369,7 +369,6 @@ namespace MediaBrowser.Model.IO
         Append = 6
     }
 
-    [Flags]
     public enum FileAccessMode
     {
         //
@@ -388,7 +387,6 @@ namespace MediaBrowser.Model.IO
         ReadWrite = 3
     }
 
-    [Flags]
     public enum FileShareMode
     {
         //
@@ -417,16 +415,7 @@ namespace MediaBrowser.Model.IO
         //     or another process) will fail until the file is closed. However, even if this
         //     flag is specified, additional permissions might still be needed to access the
         //     file.
-        ReadWrite = 3,
-        //
-        // Summary:
-        //     Allows subsequent deleting of a file.
-        Delete = 4,
-        //
-        // Summary:
-        //     Makes the file handle inheritable by child processes. This is not directly supported
-        //     by Win32.
-        Inheritable = 16
+        ReadWrite = 3
     }
 
 }
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 8f7e94cf0..c5e140032 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -32,7 +32,6 @@ namespace MediaBrowser.Model.LiveTv
         public LiveTvOptions()
         {
             EnableMovieProviders = true;
-            EnableRecordingSubfolders = true;
             TunerHosts = new List<TunerHostInfo>();
             ListingProviders = new List<ListingsProviderInfo>();
             MediaLocationsCreated = new string[] { };
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 9f8dca434..9c6d6a482 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -78,16 +78,15 @@ namespace MediaBrowser.Providers.Manager
 
             bool hasRefreshedMetadata = true;
             bool hasRefreshedImages = true;
+            var isFirstRefresh = item.DateLastRefreshed == default(DateTime);
 
             // Next run metadata providers
             if (refreshOptions.MetadataRefreshMode != MetadataRefreshMode.None)
             {
-                var providers = GetProviders(item, refreshOptions, requiresRefresh)
+                var providers = GetProviders(item, refreshOptions, isFirstRefresh, requiresRefresh)
                     .ToList();
 
-                var dateLastRefresh = item.DateLastRefreshed;
-
-                if (providers.Count > 0 || dateLastRefresh == default(DateTime))
+                if (providers.Count > 0 || isFirstRefresh)
                 {
                     if (item.BeforeMetadataRefresh())
                     {
@@ -110,11 +109,7 @@ namespace MediaBrowser.Providers.Manager
                     var result = await RefreshWithProviders(metadataResult, id, refreshOptions, providers, itemImageProvider, cancellationToken).ConfigureAwait(false);
 
                     updateType = updateType | result.UpdateType;
-                    if (result.Failures == 0)
-                    {
-                        hasRefreshedMetadata = true;
-                    }
-                    else
+                    if (result.Failures > 0)
                     {
                         hasRefreshedMetadata = false;
                     }
@@ -138,19 +133,13 @@ namespace MediaBrowser.Providers.Manager
                     var result = await itemImageProvider.RefreshImages(itemOfType, libraryOptions, providers, refreshOptions, config, cancellationToken).ConfigureAwait(false);
 
                     updateType = updateType | result.UpdateType;
-                    if (result.Failures == 0)
-                    {
-                        hasRefreshedImages = true;
-                    }
-                    else
+                    if (result.Failures > 0)
                     {
                         hasRefreshedImages = false;
                     }
                 }
             }
 
-            var isFirstRefresh = item.DateLastRefreshed == default(DateTime);
-
             var beforeSaveResult = await BeforeSave(itemOfType, isFirstRefresh || refreshOptions.ReplaceAllMetadata || refreshOptions.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || requiresRefresh, updateType).ConfigureAwait(false);
             updateType = updateType | beforeSaveResult;
 
@@ -373,15 +362,18 @@ namespace MediaBrowser.Providers.Manager
         /// Gets the providers.
         /// </summary>
         /// <returns>IEnumerable{`0}.</returns>
-        protected IEnumerable<IMetadataProvider> GetProviders(IHasMetadata item, MetadataRefreshOptions options, bool requiresRefresh)
+        protected IEnumerable<IMetadataProvider> GetProviders(IHasMetadata item, MetadataRefreshOptions options, bool isFirstRefresh, bool requiresRefresh)
         {
             // Get providers to refresh
             var providers = ((ProviderManager)ProviderManager).GetMetadataProviders<TItemType>(item).ToList();
 
-            var dateLastRefresh = item.DateLastRefreshed;
+            var metadataRefreshMode = options.MetadataRefreshMode;
 
             // Run all if either of these flags are true
-            var runAllProviders = options.ReplaceAllMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || dateLastRefresh == default(DateTime) || requiresRefresh;
+            var runAllProviders = options.ReplaceAllMetadata ||
+                metadataRefreshMode == MetadataRefreshMode.FullRefresh || 
+                (isFirstRefresh && metadataRefreshMode >= MetadataRefreshMode.Default) ||
+                (requiresRefresh && metadataRefreshMode >= MetadataRefreshMode.Default);
 
             if (!runAllProviders)
             {
@@ -404,6 +396,9 @@ namespace MediaBrowser.Providers.Manager
                 }
                 else
                 {
+                    var anyRemoteProvidersChanged = providersWithChanges.OfType<IRemoteMetadataProvider>()
+                        .Any();
+
                     providers = providers.Where(i =>
                     {
                         // If any provider reports a change, always run local ones as well
@@ -412,9 +407,6 @@ namespace MediaBrowser.Providers.Manager
                             return true;
                         }
 
-                        var anyRemoteProvidersChanged = providersWithChanges.OfType<IRemoteMetadataProvider>()
-                            .Any();
-
                         // If any remote providers changed, run them all so that priorities can be honored
                         if (i is IRemoteMetadataProvider)
                         {
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 84dd095cd..125ac5291 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -911,17 +911,14 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
             var image = item.GetImageInfo(ImageType.Primary, 0);
 
-            if (image != null && image.IsLocalFile)
+            if (image != null)
             {
-                writer.WriteElementString("poster", GetPathToSave(image.Path, libraryManager, config));
+                writer.WriteElementString("poster", GetImagePathToSave(image, libraryManager, config));
             }
 
             foreach (var backdrop in item.GetImages(ImageType.Backdrop))
             {
-                if (backdrop.IsLocalFile)
-                {
-                    writer.WriteElementString("fanart", GetPathToSave(backdrop.Path, libraryManager, config));
-                }
+                writer.WriteElementString("fanart", GetImagePathToSave(backdrop, libraryManager, config));
             }
 
             writer.WriteEndElement();
@@ -1012,9 +1009,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
                     var personEntity = libraryManager.GetPerson(person.Name);
                     var image = personEntity.GetImageInfo(ImageType.Primary, 0);
 
-                    if (image != null && image.IsLocalFile)
+                    if (image != null)
                     {
-                        writer.WriteElementString("thumb", GetPathToSave(image.Path, libraryManager, config));
+                        writer.WriteElementString("thumb", GetImagePathToSave(image, libraryManager, config));
                     }
                 }
                 catch (Exception)
@@ -1026,9 +1023,14 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
         }
 
-        private static string GetPathToSave(string path, ILibraryManager libraryManager, IServerConfigurationManager config)
+        private static string GetImagePathToSave(ItemImageInfo image, ILibraryManager libraryManager, IServerConfigurationManager config)
         {
-            return libraryManager.GetPathAfterNetworkSubstitution(path);
+            if (!image.IsLocalFile)
+            {
+                return image.Path;
+            }
+
+            return libraryManager.GetPathAfterNetworkSubstitution(image.Path);
         }
 
         private static bool IsPersonType(PersonInfo person, string type)
-- 
cgit v1.2.3


From 56b24da15165ef4c4b7107b673bab5b191d76afe Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 28 Nov 2016 00:38:41 -0500
Subject: update response stream parsing

---
 .../HttpServer/SocketSharp/WebSocketSharpResponse.cs     | 12 ++++++++----
 Emby.Server.Implementations/packages.config              |  2 +-
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs          |  3 ++-
 ServiceStack/HttpResponseExtensionsInternal.cs           |  2 +-
 SocketHttpListener.Portable/Net/HttpConnection.cs        |  4 +++-
 SocketHttpListener.Portable/Net/HttpListenerResponse.cs  | 16 ++++++++++++++++
 SocketHttpListener.Portable/Net/ResponseStream.cs        |  2 +-
 7 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
index dc049cbde..36f795411 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using MediaBrowser.Model.Logging;
+using SocketHttpListener.Net;
 using HttpListenerResponse = SocketHttpListener.Net.HttpListenerResponse;
 using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse;
 using IRequest = MediaBrowser.Model.Services.IRequest;
@@ -101,12 +102,15 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
                 var outputStream = response.OutputStream;
 
                 // This is needed with compression
-                //if (!string.IsNullOrWhiteSpace(GetHeader("Content-Encoding")))
+                if (outputStream is ResponseStream)
                 {
-                    outputStream.Flush();
-                }
+                    //if (!string.IsNullOrWhiteSpace(GetHeader("Content-Encoding")))
+                    {
+                        outputStream.Flush();
+                    }
 
-                outputStream.Dispose();
+                    outputStream.Dispose();
+                }
                 response.Close();
             }
             catch (Exception ex)
diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config
index 5d75af7a2..8464b9b37 100644
--- a/Emby.Server.Implementations/packages.config
+++ b/Emby.Server.Implementations/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Emby.XmlTv" version="1.0.1" targetFramework="portable45-net45+win8" />
+  <package id="Emby.XmlTv" version="1.0.2" targetFramework="portable45-net45+win8" />
   <package id="MediaBrowser.Naming" version="1.0.2" targetFramework="portable45-net45+win8" />
   <package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" />
   <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="portable45-net45+win8" />
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 8d1c0a61e..690acb163 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -153,7 +153,8 @@ namespace MediaBrowser.Api.Playback.Hls
 
                     var newDuration = "#EXT-X-TARGETDURATION:" + segmentLength.ToString(UsCulture);
 
-                    text = text.Replace("#EXT-X-TARGETDURATION:" + (segmentLength + 1).ToString(UsCulture), newDuration, StringComparison.OrdinalIgnoreCase);
+                    text = text.Replace("#EXT-X-TARGETDURATION:" + (segmentLength - 1).ToString(UsCulture), newDuration, StringComparison.OrdinalIgnoreCase);
+                    //text = text.Replace("#EXT-X-TARGETDURATION:" + (segmentLength + 1).ToString(UsCulture), newDuration, StringComparison.OrdinalIgnoreCase);
 
                     return text;
                 }
diff --git a/ServiceStack/HttpResponseExtensionsInternal.cs b/ServiceStack/HttpResponseExtensionsInternal.cs
index f78647721..feb18081a 100644
--- a/ServiceStack/HttpResponseExtensionsInternal.cs
+++ b/ServiceStack/HttpResponseExtensionsInternal.cs
@@ -130,7 +130,7 @@ namespace ServiceStack
             {
                 foreach (var responseHeaders in responseOptions.Headers)
                 {
-                    if (responseHeaders.Key == "Content-Length")
+                    if (string.Equals(responseHeaders.Key, "Content-Length", StringComparison.OrdinalIgnoreCase))
                     {
                         response.SetContentLength(long.Parse(responseHeaders.Value));
                         continue;
diff --git a/SocketHttpListener.Portable/Net/HttpConnection.cs b/SocketHttpListener.Portable/Net/HttpConnection.cs
index b09d02254..4b54fc013 100644
--- a/SocketHttpListener.Portable/Net/HttpConnection.cs
+++ b/SocketHttpListener.Portable/Net/HttpConnection.cs
@@ -209,7 +209,9 @@ namespace SocketHttpListener.Net
             // TODO: can we get this stream before reading the input?
             if (o_stream == null)
             {
-                if (context.Response.SendChunked || isExpect100Continue || context.Response.ContentLength64 <= 0)
+                context.Response.DetermineIfChunked();
+
+                if (context.Response.SendChunked || isExpect100Continue || context.Request.IsWebSocketRequest)
                 {
                     o_stream = new ResponseStream(stream, context.Response, _memoryStreamFactory, _textEncoding);
                 }
diff --git a/SocketHttpListener.Portable/Net/HttpListenerResponse.cs b/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
index 880473c0a..c1182de34 100644
--- a/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
+++ b/SocketHttpListener.Portable/Net/HttpListenerResponse.cs
@@ -362,6 +362,22 @@ namespace SocketHttpListener.Net
             return false;
         }
 
+        public void DetermineIfChunked()
+        {
+            if (chunked)
+            {
+                return ;
+            }
+
+            Version v = context.Request.ProtocolVersion;
+            if (!cl_set && !chunked && v >= HttpVersion.Version11)
+                chunked = true;
+            if (!chunked && string.Equals(headers["Transfer-Encoding"], "chunked"))
+            {
+                chunked = true;
+            }
+        }
+
         internal void SendHeaders(bool closing, MemoryStream ms)
         {
             Encoding encoding = content_encoding;
diff --git a/SocketHttpListener.Portable/Net/ResponseStream.cs b/SocketHttpListener.Portable/Net/ResponseStream.cs
index 7a6425dea..6067a89ec 100644
--- a/SocketHttpListener.Portable/Net/ResponseStream.cs
+++ b/SocketHttpListener.Portable/Net/ResponseStream.cs
@@ -14,7 +14,7 @@ namespace SocketHttpListener.Net
     // Update: we send a single packet for the first non-chunked Write
     // What happens when we set content-length to X and write X-1 bytes then close?
     // what if we don't set content-length at all?
-    class ResponseStream : Stream
+    public class ResponseStream : Stream
     {
         HttpListenerResponse response;
         bool disposed;
-- 
cgit v1.2.3


From 401a6b8f4a84f378f0f6682ee7aecccc6ab30935 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 4 Dec 2016 16:30:38 -0500
Subject: add request logging

---
 Emby.Common.Implementations/Net/SocketFactory.cs   |  26 ++--
 Emby.Common.Implementations/Net/UdpSocket.cs       |  46 +++---
 .../Networking/NetworkManager.cs                   |   2 +-
 Emby.Dlna/ConnectionManager/ControlHandler.cs      |   4 +-
 Emby.Dlna/ContentDirectory/ControlHandler.cs       |  45 ++++--
 Emby.Dlna/Emby.Dlna.csproj                         |   1 -
 Emby.Dlna/Main/DlnaEntryPoint.cs                   |   6 +-
 Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs |   6 +-
 Emby.Dlna/Server/Headers.cs                        | 169 ---------------------
 Emby.Dlna/Service/BaseControlHandler.cs            |  17 +--
 .../HttpServer/HttpListenerHost.cs                 |   2 +-
 ServiceStack/HttpHandlerFactory.cs                 |   9 +-
 12 files changed, 96 insertions(+), 237 deletions(-)
 delete mode 100644 Emby.Dlna/Server/Headers.cs

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Common.Implementations/Net/SocketFactory.cs b/Emby.Common.Implementations/Net/SocketFactory.cs
index c65593242..124252097 100644
--- a/Emby.Common.Implementations/Net/SocketFactory.cs
+++ b/Emby.Common.Implementations/Net/SocketFactory.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
+using Emby.Common.Implementations.Networking;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 
@@ -18,11 +19,6 @@ namespace Emby.Common.Implementations.Net
         // but that wasn't really the point so kept to YAGNI principal for now, even if the 
         // interfaces are a bit ugly, specific and make assumptions.
 
-        /// <summary>
-        /// Used by RSSDP components to create implementations of the <see cref="IUdpSocket"/> interface, to perform platform agnostic socket communications.
-        /// </summary>
-        private IPAddress _LocalIP;
-
         private readonly ILogger _logger;
 
         public SocketFactory(ILogger logger)
@@ -33,7 +29,6 @@ namespace Emby.Common.Implementations.Net
             }
 
             _logger = logger;
-            _LocalIP = IPAddress.Any;
         }
 
         public ISocket CreateSocket(IpAddressFamily family, MediaBrowser.Model.Net.SocketType socketType, MediaBrowser.Model.Net.ProtocolType protocolType, bool dualMode)
@@ -66,7 +61,7 @@ namespace Emby.Common.Implementations.Net
             try
             {
                 retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-                return new UdpSocket(retVal, localPort, _LocalIP);
+                return new UdpSocket(retVal, localPort, IPAddress.Any);
             }
             catch
             {
@@ -80,9 +75,8 @@ namespace Emby.Common.Implementations.Net
         /// <summary>
         /// Creates a new UDP socket that is a member of the SSDP multicast local admin group and binds it to the specified local port.
         /// </summary>
-        /// <param name="localPort">An integer specifying the local port to bind the socket to.</param>
         /// <returns>An implementation of the <see cref="IUdpSocket"/> interface used by RSSDP components to perform socket operations.</returns>
-        public IUdpSocket CreateSsdpUdpSocket(int localPort)
+        public IUdpSocket CreateSsdpUdpSocket(IpAddressInfo localIpAddress, int localPort)
         {
             if (localPort < 0) throw new ArgumentException("localPort cannot be less than zero.", "localPort");
 
@@ -91,8 +85,11 @@ namespace Emby.Common.Implementations.Net
             {
                 retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
                 retVal.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, 4);
-                retVal.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse("239.255.255.250"), _LocalIP));
-                return new UdpSocket(retVal, localPort, _LocalIP);
+
+                var localIp = NetworkManager.ToIPAddress(localIpAddress);
+
+                retVal.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse("239.255.255.250"), localIp));
+                return new UdpSocket(retVal, localPort, localIp);
             }
             catch
             {
@@ -134,10 +131,13 @@ namespace Emby.Common.Implementations.Net
                 //retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
                 retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
                 retVal.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, multicastTimeToLive);
-                retVal.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse(ipAddress), _LocalIP));
+
+                var localIp = IPAddress.Any;
+
+                retVal.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse(ipAddress), localIp));
                 retVal.MulticastLoopback = true;
 
-                return new UdpSocket(retVal, localPort, _LocalIP);
+                return new UdpSocket(retVal, localPort, localIp);
             }
             catch
             {
diff --git a/Emby.Common.Implementations/Net/UdpSocket.cs b/Emby.Common.Implementations/Net/UdpSocket.cs
index 367d2242c..b2af9d162 100644
--- a/Emby.Common.Implementations/Net/UdpSocket.cs
+++ b/Emby.Common.Implementations/Net/UdpSocket.cs
@@ -20,7 +20,6 @@ namespace Emby.Common.Implementations.Net
 
         private Socket _Socket;
         private int _LocalPort;
-
         #endregion
 
         #region Constructors
@@ -31,12 +30,19 @@ namespace Emby.Common.Implementations.Net
 
             _Socket = socket;
             _LocalPort = localPort;
+            LocalIPAddress = NetworkManager.ToIpAddressInfo(ip);
 
             _Socket.Bind(new IPEndPoint(ip, _LocalPort));
         }
 
         #endregion
 
+        public IpAddressInfo LocalIPAddress
+        {
+            get;
+            private set;
+        }
+
         #region IUdpSocket Members
 
         public Task<SocketReceiveResult> ReceiveAsync()
@@ -50,18 +56,18 @@ namespace Emby.Common.Implementations.Net
             state.TaskCompletionSource = tcs;
 
 #if NETSTANDARD1_6
-            _Socket.ReceiveFromAsync(new ArraySegment<Byte>(state.Buffer),SocketFlags.None, state.EndPoint)
+            _Socket.ReceiveFromAsync(new ArraySegment<Byte>(state.Buffer),SocketFlags.None, state.RemoteEndPoint)
                 .ContinueWith((task, asyncState) =>
                 {
                     if (task.Status != TaskStatus.Faulted)
                     {
                         var receiveState = asyncState as AsyncReceiveState;
-                        receiveState.EndPoint = task.Result.RemoteEndPoint;
-                        ProcessResponse(receiveState, () => task.Result.ReceivedBytes);
+                        receiveState.RemoteEndPoint = task.Result.RemoteEndPoint;
+                        ProcessResponse(receiveState, () => task.Result.ReceivedBytes, LocalIPAddress);
                     }
                 }, state);
 #else
-            _Socket.BeginReceiveFrom(state.Buffer, 0, state.Buffer.Length, SocketFlags.None, ref state.EndPoint, ProcessResponse, state);
+            _Socket.BeginReceiveFrom(state.Buffer, 0, state.Buffer.Length, SocketFlags.None, ref state.RemoteEndPoint, ProcessResponse, state);
 #endif
 
             return tcs.Task;
@@ -74,6 +80,8 @@ namespace Emby.Common.Implementations.Net
             if (buffer == null) throw new ArgumentNullException("messageData");
             if (endPoint == null) throw new ArgumentNullException("endPoint");
 
+            var ipEndPoint = NetworkManager.ToIPEndPoint(endPoint);
+
 #if NETSTANDARD1_6
 
             if (size != buffer.Length)
@@ -83,14 +91,14 @@ namespace Emby.Common.Implementations.Net
                 buffer = copy;
             }
 
-            _Socket.SendTo(buffer, new IPEndPoint(IPAddress.Parse(endPoint.IpAddress.ToString()), endPoint.Port));
+            _Socket.SendTo(buffer, ipEndPoint);
             return Task.FromResult(true);
 #else
             var taskSource = new TaskCompletionSource<bool>();
 
             try
             {
-                _Socket.BeginSendTo(buffer, 0, size, SocketFlags.None, new System.Net.IPEndPoint(IPAddress.Parse(endPoint.IpAddress.ToString()), endPoint.Port), result =>
+                _Socket.BeginSendTo(buffer, 0, size, SocketFlags.None, ipEndPoint, result =>
                 {
                     try
                     {
@@ -109,7 +117,7 @@ namespace Emby.Common.Implementations.Net
                 taskSource.TrySetException(ex);
             }
 
-            //_Socket.SendTo(messageData, new System.Net.IPEndPoint(IPAddress.Parse(endPoint.IPAddress), endPoint.Port));
+            //_Socket.SendTo(messageData, new System.Net.IPEndPoint(IPAddress.Parse(RemoteEndPoint.IPAddress), RemoteEndPoint.Port));
 
             return taskSource.Task;
 #endif
@@ -133,19 +141,20 @@ namespace Emby.Common.Implementations.Net
 
         #region Private Methods
 
-        private static void ProcessResponse(AsyncReceiveState state, Func<int> receiveData)
+        private static void ProcessResponse(AsyncReceiveState state, Func<int> receiveData, IpAddressInfo localIpAddress)
         {
             try
             {
                 var bytesRead = receiveData();
 
-                var ipEndPoint = state.EndPoint as IPEndPoint;
+                var ipEndPoint = state.RemoteEndPoint as IPEndPoint;
                 state.TaskCompletionSource.SetResult(
-                    new SocketReceiveResult()
+                    new SocketReceiveResult
                     {
                         Buffer = state.Buffer,
                         ReceivedBytes = bytesRead,
-                        RemoteEndPoint = ToIpEndPointInfo(ipEndPoint)
+                        RemoteEndPoint = ToIpEndPointInfo(ipEndPoint),
+                        LocalIPAddress = localIpAddress
                     }
                 );
             }
@@ -182,15 +191,16 @@ namespace Emby.Common.Implementations.Net
             var state = asyncResult.AsyncState as AsyncReceiveState;
             try
             {
-                var bytesRead = state.Socket.EndReceiveFrom(asyncResult, ref state.EndPoint);
+                var bytesRead = state.Socket.EndReceiveFrom(asyncResult, ref state.RemoteEndPoint);
 
-                var ipEndPoint = state.EndPoint as IPEndPoint;
+                var ipEndPoint = state.RemoteEndPoint as IPEndPoint;
                 state.TaskCompletionSource.SetResult(
                     new SocketReceiveResult
                     {
                         Buffer = state.Buffer,
                         ReceivedBytes = bytesRead,
-                        RemoteEndPoint = ToIpEndPointInfo(ipEndPoint)
+                        RemoteEndPoint = ToIpEndPointInfo(ipEndPoint),
+                        LocalIPAddress = LocalIPAddress
                     }
                 );
             }
@@ -211,13 +221,13 @@ namespace Emby.Common.Implementations.Net
 
         private class AsyncReceiveState
         {
-            public AsyncReceiveState(Socket socket, EndPoint endPoint)
+            public AsyncReceiveState(Socket socket, EndPoint remoteEndPoint)
             {
                 this.Socket = socket;
-                this.EndPoint = endPoint;
+                this.RemoteEndPoint = remoteEndPoint;
             }
 
-            public EndPoint EndPoint;
+            public EndPoint RemoteEndPoint;
             public byte[] Buffer = new byte[8192];
 
             public Socket Socket { get; private set; }
diff --git a/Emby.Common.Implementations/Networking/NetworkManager.cs b/Emby.Common.Implementations/Networking/NetworkManager.cs
index a4f8f7ced..b9100f9db 100644
--- a/Emby.Common.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Common.Implementations/Networking/NetworkManager.cs
@@ -27,7 +27,7 @@ namespace Emby.Common.Implementations.Networking
         private List<IpAddressInfo> _localIpAddresses;
         private readonly object _localIpAddressSyncLock = new object();
 
-        public IEnumerable<IpAddressInfo> GetLocalIpAddresses()
+        public List<IpAddressInfo> GetLocalIpAddresses()
         {
             const int cacheMinutes = 5;
 
diff --git a/Emby.Dlna/ConnectionManager/ControlHandler.cs b/Emby.Dlna/ConnectionManager/ControlHandler.cs
index 0bc44db17..ae983c5e7 100644
--- a/Emby.Dlna/ConnectionManager/ControlHandler.cs
+++ b/Emby.Dlna/ConnectionManager/ControlHandler.cs
@@ -14,7 +14,7 @@ namespace Emby.Dlna.ConnectionManager
     {
         private readonly DeviceProfile _profile;
 
-        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, Headers methodParams)
+        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams)
         {
             if (string.Equals(methodName, "GetProtocolInfo", StringComparison.OrdinalIgnoreCase))
             {
@@ -26,7 +26,7 @@ namespace Emby.Dlna.ConnectionManager
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetProtocolInfo()
         {
-            return new Headers(true)
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "Source", _profile.ProtocolInfo },
                 { "Sink", "" }
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
index d77919e47..98a151f29 100644
--- a/Emby.Dlna/ContentDirectory/ControlHandler.cs
+++ b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -65,7 +65,7 @@ namespace Emby.Dlna.ContentDirectory
             _didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress, accessToken, userDataManager, localization, mediaSourceManager, Logger, libraryManager, mediaEncoder);
         }
 
-        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, Headers methodParams)
+        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams)
         {
             var deviceId = "test";
 
@@ -118,17 +118,20 @@ namespace Emby.Dlna.ContentDirectory
             _userDataManager.SaveUserData(user.Id, item, userdata, UserDataSaveReason.TogglePlayed,
                 CancellationToken.None);
 
-            return new Headers();
+            return new Dictionary<string,string>(StringComparer.OrdinalIgnoreCase);
         }
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetSearchCapabilities()
         {
-            return new Headers(true) { { "SearchCaps", "res@resolution,res@size,res@duration,dc:title,dc:creator,upnp:actor,upnp:artist,upnp:genre,upnp:album,dc:date,upnp:class,@id,@refID,@protocolInfo,upnp:author,dc:description,pv:avKeywords" } };
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "SearchCaps", "res@resolution,res@size,res@duration,dc:title,dc:creator,upnp:actor,upnp:artist,upnp:genre,upnp:album,dc:date,upnp:class,@id,@refID,@protocolInfo,upnp:author,dc:description,pv:avKeywords" }
+            };
         }
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetSortCapabilities()
         {
-            return new Headers(true)
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "SortCaps", "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating" }
             };
@@ -136,7 +139,7 @@ namespace Emby.Dlna.ContentDirectory
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetSortExtensionCapabilities()
         {
-            return new Headers(true)
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "SortExtensionCaps", "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating" }
             };
@@ -144,14 +147,14 @@ namespace Emby.Dlna.ContentDirectory
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetSystemUpdateID()
         {
-            var headers = new Headers(true);
+            var headers = new Dictionary<string,string>(StringComparer.OrdinalIgnoreCase);
             headers.Add("Id", _systemUpdateId.ToString(_usCulture));
             return headers;
         }
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetFeatureList()
         {
-            return new Headers(true)
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "FeatureList", GetFeatureListXml() }
             };
@@ -159,7 +162,7 @@ namespace Emby.Dlna.ContentDirectory
 
         private IEnumerable<KeyValuePair<string, string>> HandleXGetFeatureList()
         {
-            return new Headers(true)
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "FeatureList", GetFeatureListXml() }
             };
@@ -183,12 +186,24 @@ namespace Emby.Dlna.ContentDirectory
             return builder.ToString();
         }
 
-        private async Task<IEnumerable<KeyValuePair<string, string>>> HandleBrowse(Headers sparams, User user, string deviceId)
+        public string GetValueOrDefault(IDictionary<string, string> sparams, string key, string defaultValue)
+        {
+            string val;
+
+            if (sparams.TryGetValue(key, out val))
+            {
+                return val;
+            }
+
+            return defaultValue;
+        }
+
+        private async Task<IEnumerable<KeyValuePair<string, string>>> HandleBrowse(IDictionary<string, string> sparams, User user, string deviceId)
         {
             var id = sparams["ObjectID"];
             var flag = sparams["BrowseFlag"];
-            var filter = new Filter(sparams.GetValueOrDefault("Filter", "*"));
-            var sortCriteria = new SortCriteria(sparams.GetValueOrDefault("SortCriteria", ""));
+            var filter = new Filter(GetValueOrDefault(sparams, "Filter", "*"));
+            var sortCriteria = new SortCriteria(GetValueOrDefault(sparams, "SortCriteria", ""));
 
             var provided = 0;
 
@@ -294,11 +309,11 @@ namespace Emby.Dlna.ContentDirectory
                 };
         }
 
-        private async Task<IEnumerable<KeyValuePair<string, string>>> HandleSearch(Headers sparams, User user, string deviceId)
+        private async Task<IEnumerable<KeyValuePair<string, string>>> HandleSearch(IDictionary<string, string> sparams, User user, string deviceId)
         {
-            var searchCriteria = new SearchCriteria(sparams.GetValueOrDefault("SearchCriteria", ""));
-            var sortCriteria = new SortCriteria(sparams.GetValueOrDefault("SortCriteria", ""));
-            var filter = new Filter(sparams.GetValueOrDefault("Filter", "*"));
+            var searchCriteria = new SearchCriteria(GetValueOrDefault(sparams, "SearchCriteria", ""));
+            var sortCriteria = new SortCriteria(GetValueOrDefault(sparams, "SortCriteria", ""));
+            var filter = new Filter(GetValueOrDefault(sparams, "Filter", "*"));
 
             // sort example: dc:title, dc:date
 
diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
index 0441cb3be..4d1aacfec 100644
--- a/Emby.Dlna/Emby.Dlna.csproj
+++ b/Emby.Dlna/Emby.Dlna.csproj
@@ -152,7 +152,6 @@
     <Compile Include="Profiles\XboxOneProfile.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server\DescriptionXmlBuilder.cs" />
-    <Compile Include="Server\Headers.cs" />
     <Compile Include="Server\UpnpDevice.cs" />
     <Compile Include="Service\BaseControlHandler.cs" />
     <Compile Include="Service\BaseService.cs" />
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index 170b4cee0..858b1ae9e 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -54,6 +54,7 @@ namespace Emby.Dlna.Main
         private readonly ITimerFactory _timerFactory;
         private readonly ISocketFactory _socketFactory;
         private readonly IEnvironmentInfo _environmentInfo;
+        private readonly INetworkManager _networkManager;
 
         private ISsdpCommunicationsServer _communicationsServer;
 
@@ -69,7 +70,7 @@ namespace Emby.Dlna.Main
             IUserDataManager userDataManager,
             ILocalizationManager localization,
             IMediaSourceManager mediaSourceManager,
-            IDeviceDiscovery deviceDiscovery, IMediaEncoder mediaEncoder, ISocketFactory socketFactory, ITimerFactory timerFactory, IEnvironmentInfo environmentInfo)
+            IDeviceDiscovery deviceDiscovery, IMediaEncoder mediaEncoder, ISocketFactory socketFactory, ITimerFactory timerFactory, IEnvironmentInfo environmentInfo, INetworkManager networkManager)
         {
             _config = config;
             _appHost = appHost;
@@ -87,6 +88,7 @@ namespace Emby.Dlna.Main
             _socketFactory = socketFactory;
             _timerFactory = timerFactory;
             _environmentInfo = environmentInfo;
+            _networkManager = networkManager;
             _logger = logManager.GetLogger("Dlna");
         }
 
@@ -156,7 +158,7 @@ namespace Emby.Dlna.Main
             {
                 if (_communicationsServer == null)
                 {
-                    _communicationsServer = new SsdpCommunicationsServer(_socketFactory)
+                    _communicationsServer = new SsdpCommunicationsServer(_socketFactory, _networkManager, _logger)
                     {
                         IsShared = true
                     };
diff --git a/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs b/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs
index 5e232aeac..daf46b106 100644
--- a/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs
+++ b/Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs
@@ -11,7 +11,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
 {
     public class ControlHandler : BaseControlHandler
     {
-        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, Headers methodParams)
+        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams)
         {
             if (string.Equals(methodName, "IsAuthorized", StringComparison.OrdinalIgnoreCase))
                 return HandleIsAuthorized();
@@ -23,7 +23,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
 
         private IEnumerable<KeyValuePair<string, string>> HandleIsAuthorized()
         {
-            return new Headers(true)
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "Result", "1" }
             };
@@ -31,7 +31,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
 
         private IEnumerable<KeyValuePair<string, string>> HandleIsValidated()
         {
-            return new Headers(true)
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "Result", "1" }
             };
diff --git a/Emby.Dlna/Server/Headers.cs b/Emby.Dlna/Server/Headers.cs
deleted file mode 100644
index 47dd8e321..000000000
--- a/Emby.Dlna/Server/Headers.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Emby.Dlna.Server
-{
-    public class Headers : IDictionary<string, string>
-    {
-        private readonly bool _asIs = false;
-        private readonly Dictionary<string, string> _dict = new Dictionary<string, string>();
-        private readonly static Regex Validator = new Regex(@"^[a-z\d][a-z\d_.-]+$", RegexOptions.IgnoreCase);
-
-        public Headers(bool asIs)
-        {
-            _asIs = asIs;
-        }
-
-        public Headers()
-            : this(asIs: false)
-        {
-        }
-
-        public int Count
-        {
-            get
-            {
-                return _dict.Count;
-            }
-        }
-        public string HeaderBlock
-        {
-            get
-            {
-                var hb = new StringBuilder();
-                foreach (var h in this)
-                {
-                    hb.AppendFormat("{0}: {1}\r\n", h.Key, h.Value);
-                }
-                return hb.ToString();
-            }
-        }
-        public bool IsReadOnly
-        {
-            get
-            {
-                return false;
-            }
-        }
-        public ICollection<string> Keys
-        {
-            get
-            {
-                return _dict.Keys;
-            }
-        }
-        public ICollection<string> Values
-        {
-            get
-            {
-                return _dict.Values;
-            }
-        }
-
-
-        public string this[string key]
-        {
-            get
-            {
-                return _dict[Normalize(key)];
-            }
-            set
-            {
-                _dict[Normalize(key)] = value;
-            }
-        }
-
-
-        private string Normalize(string header)
-        {
-            if (!_asIs)
-            {
-                header = header.ToLower();
-            }
-            header = header.Trim();
-            if (!Validator.IsMatch(header))
-            {
-                throw new ArgumentException("Invalid header: " + header);
-            }
-            return header;
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return _dict.GetEnumerator();
-        }
-
-        public void Add(KeyValuePair<string, string> item)
-        {
-            Add(item.Key, item.Value);
-        }
-
-        public void Add(string key, string value)
-        {
-            _dict.Add(Normalize(key), value);
-        }
-
-        public void Clear()
-        {
-            _dict.Clear();
-        }
-
-        public bool Contains(KeyValuePair<string, string> item)
-        {
-            var p = new KeyValuePair<string, string>(Normalize(item.Key), item.Value);
-            return _dict.Contains(p);
-        }
-
-        public bool ContainsKey(string key)
-        {
-            return _dict.ContainsKey(Normalize(key));
-        }
-
-        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-        {
-            return _dict.GetEnumerator();
-        }
-
-        public bool Remove(string key)
-        {
-            return _dict.Remove(Normalize(key));
-        }
-
-        public bool Remove(KeyValuePair<string, string> item)
-        {
-            return Remove(item.Key);
-        }
-
-        public override string ToString()
-        {
-            return string.Format("({0})", string.Join(", ", (from x in _dict
-                                                             select string.Format("{0}={1}", x.Key, x.Value))));
-        }
-
-        public bool TryGetValue(string key, out string value)
-        {
-            return _dict.TryGetValue(Normalize(key), out value);
-        }
-
-        public string GetValueOrDefault(string key, string defaultValue)
-        {
-            string val;
-
-            if (TryGetValue(key, out val))
-            {
-                return val;
-            }
-
-            return defaultValue;
-        }
-    }
-}
diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index 4ce047172..3092589c1 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Xml;
 using Emby.Dlna.Didl;
+using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Model.Xml;
 
 namespace Emby.Dlna.Service
@@ -185,8 +186,7 @@ namespace Emby.Dlna.Service
                     {
                         using (var subReader = reader.ReadSubtree())
                         {
-                            result.Headers = ParseFirstBodyChild(subReader);
-
+                            ParseFirstBodyChild(subReader, result.Headers);
                             return result;
                         }
                     }
@@ -204,10 +204,8 @@ namespace Emby.Dlna.Service
             return result;
         }
 
-        private Headers ParseFirstBodyChild(XmlReader reader)
+        private void ParseFirstBodyChild(XmlReader reader, IDictionary<string,string> headers)
         {
-            var result = new Headers();
-
             reader.MoveToContent();
             reader.Read();
 
@@ -216,25 +214,24 @@ namespace Emby.Dlna.Service
             {
                 if (reader.NodeType == XmlNodeType.Element)
                 {
-                    result.Add(reader.LocalName, reader.ReadElementContentAsString());
+                    // TODO: Should we be doing this here, or should it be handled earlier when decoding the request?
+                    headers[reader.LocalName.RemoveDiacritics()] = reader.ReadElementContentAsString();
                 }
                 else
                 {
                     reader.Read();
                 }
             }
-
-            return result;
         }
 
         private class ControlRequestInfo
         {
             public string LocalName;
             public string NamespaceURI;
-            public Headers Headers = new Headers();
+            public IDictionary<string, string> Headers = new Dictionary<string,string>(StringComparer.OrdinalIgnoreCase);
         }
 
-        protected abstract IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, Headers methodParams);
+        protected abstract IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams);
 
         private void LogRequest(ControlRequest request)
         {
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 8a5ae2c3a..0e1f5a551 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -518,7 +518,7 @@ namespace Emby.Server.Implementations.HttpServer
                     return;
                 }
 
-                var handler = HttpHandlerFactory.GetHandler(httpReq);
+                var handler = HttpHandlerFactory.GetHandler(httpReq, _logger);
 
                 if (handler != null)
                 {
diff --git a/ServiceStack/HttpHandlerFactory.cs b/ServiceStack/HttpHandlerFactory.cs
index d48bfeb5f..5f4892d51 100644
--- a/ServiceStack/HttpHandlerFactory.cs
+++ b/ServiceStack/HttpHandlerFactory.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Services;
 using ServiceStack.Host;
 
@@ -9,12 +10,16 @@ namespace ServiceStack
     public class HttpHandlerFactory
     {
         // Entry point for HttpListener
-        public static RestHandler GetHandler(IHttpRequest httpReq)
+        public static RestHandler GetHandler(IHttpRequest httpReq, ILogger logger)
         {
             var pathInfo = httpReq.PathInfo;
 
             var pathParts = pathInfo.TrimStart('/').Split('/');
-            if (pathParts.Length == 0) return null;
+            if (pathParts.Length == 0)
+            {
+                logger.Error("Path parts empty for PathInfo: {0}, Url: {1}", pathInfo, httpReq.RawUrl);
+                return null;
+            }
 
             string contentType;
             var restPath = RestHandler.FindMatchingRestPath(httpReq.HttpMethod, pathInfo, out contentType);
-- 
cgit v1.2.3


From e1b880a5a072764cabace79cd6d1d65315ec65e4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 13 Dec 2016 02:36:30 -0500
Subject: update series queries

---
 .../Activity/ActivityRepository.cs                 |  15 +-
 .../Data/BaseSqliteRepository.cs                   |   2 +
 .../Data/SqliteItemRepository.cs                   | 261 +++++++++++----------
 .../Data/SqliteUserDataRepository.cs               |  12 +-
 Emby.Server.Implementations/Dto/DtoService.cs      | 105 ++++++---
 .../FileOrganization/EpisodeFileOrganizer.cs       |   6 +
 .../SocketSharp/WebSocketSharpListener.cs          |   3 +-
 .../Library/LibraryManager.cs                      |  58 +++--
 .../Library/UserDataManager.cs                     |   7 +-
 .../Notifications/SqliteNotificationsRepository.cs |  20 +-
 .../Security/AuthenticationRepository.cs           |  12 +-
 MediaBrowser.Api/BaseApiService.cs                 |  32 ++-
 MediaBrowser.Api/ItemLookupService.cs              |  15 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |   3 +-
 .../Entities/CollectionFolder.cs                   |  68 ++++--
 MediaBrowser.Controller/Entities/Folder.cs         |  36 +--
 MediaBrowser.Controller/Entities/IHasUserData.cs   |   6 +-
 MediaBrowser.Controller/Library/ILibraryManager.cs |   2 +
 .../Library/IUserDataManager.cs                    |   6 +-
 MediaBrowser.Model/Querying/ItemFields.cs          |   2 +
 RSSDP/SsdpDevicePublisherBase.cs                   |   8 +-
 21 files changed, 418 insertions(+), 261 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 7ac0e680c..5f6518a14 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -84,9 +84,6 @@ namespace Emby.Server.Implementations.Activity
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var list = new List<ActivityLogEntry>();
-                    var result = new QueryResult<ActivityLogEntry>();
-
                     var commandText = BaseActivitySelectText;
                     var whereClauses = new List<string>();
 
@@ -127,8 +124,11 @@ namespace Emby.Server.Implementations.Activity
                     statementTexts.Add(commandText);
                     statementTexts.Add("select count (Id) from ActivityLogEntries" + whereTextWithoutPaging);
 
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<ActivityLogEntry>();
+                        var result = new QueryResult<ActivityLogEntry>();
+
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
 
                         using (var statement = statements[0])
@@ -153,10 +153,11 @@ namespace Emby.Server.Implementations.Activity
 
                             result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
                         }
-                    }, ReadTransactionMode);
 
-                    result.Items = list.ToArray();
-                    return result;
+                        result.Items = list.ToArray();
+                        return result;
+
+                    }, ReadTransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 9e60a43aa..2fc721f83 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -43,6 +43,7 @@ namespace Emby.Server.Implementations.Data
             //CheckOk(rc);
 
             rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD, 1);
+            //rc = raw.sqlite3_config(raw.SQLITE_CONFIG_SERIALIZED, 1);
             //CheckOk(rc);
 
             rc = raw.sqlite3_enable_shared_cache(1);
@@ -94,6 +95,7 @@ namespace Emby.Server.Implementations.Data
             var queries = new List<string>
             {
                 //"PRAGMA cache size=-10000"
+                //"PRAGMA read_uncommitted = true"
             };
 
             if (EnableTempStoreMemory)
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 42cbf1965..803ebeca0 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -328,6 +328,8 @@ namespace Emby.Server.Implementations.Data
                 "drop table if exists Images",
                 "drop index if exists idx_Images",
                 "drop index if exists idx_TypeSeriesPresentationUniqueKey",
+                "drop index if exists idx_SeriesPresentationUniqueKey",
+                "drop index if exists idx_TypeSeriesPresentationUniqueKey2",
 
                 "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)",
                 "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)",
@@ -343,8 +345,9 @@ namespace Emby.Server.Implementations.Data
                 // series
                 "create index if not exists idx_TypeSeriesPresentationUniqueKey1 on TypedBaseItems(Type,SeriesPresentationUniqueKey,PresentationUniqueKey,SortName)",
 
-                // series next up
-                "create index if not exists idx_SeriesPresentationUniqueKey on TypedBaseItems(SeriesPresentationUniqueKey)",
+                // series counts
+                // seriesdateplayed sort order
+                "create index if not exists idx_TypeSeriesPresentationUniqueKey3 on TypedBaseItems(SeriesPresentationUniqueKey,Type,IsFolder,IsVirtualItem)",
 
                 // live tv programs
                 "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)",
@@ -2079,25 +2082,29 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            var list = new List<ChapterInfo>();
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
+                    return connection.RunInTransaction(db =>
                     {
-                        statement.TryBind("@ItemId", id);
+                        var list = new List<ChapterInfo>();
 
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = PrepareStatementSafe(db, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
                         {
-                            list.Add(GetChapter(row));
+                            statement.TryBind("@ItemId", id);
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(GetChapter(row));
+                            }
                         }
-                    }
+
+                        return list;
+
+                    }, ReadTransactionMode);
                 }
             }
-
-            return list;
         }
 
         /// <summary>
@@ -2470,32 +2477,33 @@ namespace Emby.Server.Implementations.Data
 
             //commandText += GetGroupBy(query);
 
-            int count = 0;
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    return connection.RunInTransaction(db =>
                     {
-                        if (EnableJoinUserData(query))
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        BindSimilarParams(query, statement);
+                            BindSimilarParams(query, statement);
 
-                        // Running this again will bind the params
-                        GetWhereClauses(query, statement);
+                            // Running this again will bind the params
+                            GetWhereClauses(query, statement);
 
-                        count = statement.ExecuteQuery().SelectScalarInt().First();
-                    }
+                            var count = statement.ExecuteQuery().SelectScalarInt().First();
+                            LogQueryTime("GetCount", commandText, now);
+                            return count;
+                        }
+
+                    }, ReadTransactionMode);
                 }
 
-                LogQueryTime("GetCount", commandText, now);
             }
-
-            return count;
         }
 
         public List<BaseItem> GetItemList(InternalItemsQuery query)
@@ -2511,8 +2519,6 @@ namespace Emby.Server.Implementations.Data
 
             var now = DateTime.UtcNow;
 
-            var list = new List<BaseItem>();
-
             // Hack for right now since we currently don't support filtering out these duplicates within a query
             if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
             {
@@ -2553,53 +2559,59 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    return connection.RunInTransaction(db =>
                     {
-                        if (EnableJoinUserData(query))
+                        var list = new List<BaseItem>();
+
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        BindSimilarParams(query, statement);
+                            BindSimilarParams(query, statement);
 
-                        // Running this again will bind the params
-                        GetWhereClauses(query, statement);
+                            // Running this again will bind the params
+                            GetWhereClauses(query, statement);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            var item = GetItem(row, query);
-                            if (item != null)
+                            foreach (var row in statement.ExecuteQuery())
                             {
-                                list.Add(item);
+                                var item = GetItem(row, query);
+                                if (item != null)
+                                {
+                                    list.Add(item);
+                                }
                             }
                         }
-                    }
-                }
 
-                LogQueryTime("GetItemList", commandText, now);
-            }
+                        // Hack for right now since we currently don't support filtering out these duplicates within a query
+                        if (query.EnableGroupByMetadataKey)
+                        {
+                            var limit = query.Limit ?? int.MaxValue;
+                            limit -= 4;
+                            var newList = new List<BaseItem>();
 
-            // Hack for right now since we currently don't support filtering out these duplicates within a query
-            if (query.EnableGroupByMetadataKey)
-            {
-                var limit = query.Limit ?? int.MaxValue;
-                limit -= 4;
-                var newList = new List<BaseItem>();
+                            foreach (var item in list)
+                            {
+                                AddItem(newList, item);
 
-                foreach (var item in list)
-                {
-                    AddItem(newList, item);
+                                if (newList.Count >= limit)
+                                {
+                                    break;
+                                }
+                            }
 
-                    if (newList.Count >= limit)
-                    {
-                        break;
-                    }
-                }
+                            list = newList;
+                        }
 
-                list = newList;
-            }
+                        LogQueryTime("GetItemList", commandText, now);
 
-            return list;
+                        return list;
+
+                    }, ReadTransactionMode);
+                }
+            }
         }
 
         private void AddItem(List<BaseItem> items, BaseItem newItem)
@@ -2637,7 +2649,7 @@ namespace Emby.Server.Implementations.Data
             var slowThreshold = 1000;
 
 #if DEBUG
-            slowThreshold = 50;
+            slowThreshold = 2;
 #endif
 
             if (elapsed >= slowThreshold)
@@ -2718,7 +2730,6 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            var result = new QueryResult<BaseItem>();
             var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
 
             var statementTexts = new List<string>();
@@ -2748,8 +2759,9 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var result = new QueryResult<BaseItem>();
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
                             .ToList();
 
@@ -2796,12 +2808,12 @@ namespace Emby.Server.Implementations.Data
                             }
                         }
 
-                    }, ReadTransactionMode);
+                        LogQueryTime("GetItems", commandText, now);
 
-                    LogQueryTime("GetItems", commandText, now);
+                        result.Items = list.ToArray();
+                        return result;
 
-                    result.Items = list.ToArray();
-                    return result;
+                    }, ReadTransactionMode);
                 }
             }
         }
@@ -2962,34 +2974,38 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            var list = new List<Guid>();
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    return connection.RunInTransaction(db =>
                     {
-                        if (EnableJoinUserData(query))
+                        var list = new List<Guid>();
+
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        BindSimilarParams(query, statement);
+                            BindSimilarParams(query, statement);
 
-                        // Running this again will bind the params
-                        GetWhereClauses(query, statement);
+                            // Running this again will bind the params
+                            GetWhereClauses(query, statement);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            list.Add(row[0].ReadGuid());
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(row[0].ReadGuid());
+                            }
                         }
-                    }
-                }
 
-                LogQueryTime("GetItemList", commandText, now);
+                        LogQueryTime("GetItemList", commandText, now);
 
-                return list;
+                        return list;
+
+                    }, ReadTransactionMode);
+                }
             }
         }
 
@@ -3153,10 +3169,10 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var result = new QueryResult<Guid>();
-
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var result = new QueryResult<Guid>();
+
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
                             .ToList();
 
@@ -3199,12 +3215,12 @@ namespace Emby.Server.Implementations.Data
                             }
                         }
 
-                    }, ReadTransactionMode);
+                        LogQueryTime("GetItemIds", commandText, now);
 
-                    LogQueryTime("GetItemIds", commandText, now);
+                        result.Items = list.ToArray();
+                        return result;
 
-                    result.Items = list.ToArray();
-                    return result;
+                    }, ReadTransactionMode);
                 }
             }
         }
@@ -4653,13 +4669,13 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " order by ListOrder";
 
-            var list = new List<string>();
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<string>();
                         using (var statement = PrepareStatementSafe(db, commandText))
                         {
                             // Run this again to bind the params
@@ -4670,9 +4686,9 @@ namespace Emby.Server.Implementations.Data
                                 list.Add(row.GetString(0));
                             }
                         }
+                        return list;
                     }, ReadTransactionMode);
                 }
-                return list;
             }
         }
 
@@ -4696,14 +4712,14 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " order by ListOrder";
 
-            var list = new List<PersonInfo>();
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<PersonInfo>();
+
                         using (var statement = PrepareStatementSafe(db, commandText))
                         {
                             // Run this again to bind the params
@@ -4714,11 +4730,11 @@ namespace Emby.Server.Implementations.Data
                                 list.Add(GetPerson(row));
                             }
                         }
+
+                        return list;
                     }, ReadTransactionMode);
                 }
             }
-
-            return list;
         }
 
         private List<string> GetPeopleWhereClauses(InternalPeopleQuery query, IStatement statement)
@@ -4899,8 +4915,6 @@ namespace Emby.Server.Implementations.Data
                 ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) :
                 ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")");
 
-            var list = new List<string>();
-
             var commandText = "Select Value From ItemValues where " + typeClause;
 
             if (withItemTypes.Count > 0)
@@ -4920,8 +4934,10 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<string>();
+
                         using (var statement = PrepareStatementSafe(db, commandText))
                         {
                             foreach (var row in statement.ExecuteQuery())
@@ -4932,12 +4948,13 @@ namespace Emby.Server.Implementations.Data
                                 }
                             }
                         }
+
+                        LogQueryTime("GetItemValueNames", commandText, now);
+
+                        return list;
                     }, ReadTransactionMode);
                 }
             }
-            LogQueryTime("GetItemValueNames", commandText, now);
-
-            return list;
         }
 
         private QueryResult<Tuple<BaseItem, ItemCounts>> GetItemValues(InternalItemsQuery query, int[] itemValueTypes, string returnType)
@@ -5081,9 +5098,6 @@ namespace Emby.Server.Implementations.Data
 
             var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
 
-            var list = new List<Tuple<BaseItem, ItemCounts>>();
-            var result = new QueryResult<Tuple<BaseItem, ItemCounts>>();
-
             var statementTexts = new List<string>();
             if (!isReturningZeroItems)
             {
@@ -5102,8 +5116,11 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<Tuple<BaseItem, ItemCounts>>();
+                        var result = new QueryResult<Tuple<BaseItem, ItemCounts>>();
+
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
 
                         if (!isReturningZeroItems)
@@ -5167,17 +5184,18 @@ namespace Emby.Server.Implementations.Data
                                 LogQueryTime("GetItemValues", commandText, now);
                             }
                         }
+
+                        if (result.TotalRecordCount == 0)
+                        {
+                            result.TotalRecordCount = list.Count;
+                        }
+                        result.Items = list.ToArray();
+
+                        return result;
+
                     }, ReadTransactionMode);
                 }
             }
-
-            if (result.TotalRecordCount == 0)
-            {
-                result.TotalRecordCount = list.Count;
-            }
-            result.Items = list.ToArray();
-
-            return result;
         }
 
         private ItemCounts GetItemCounts(IReadOnlyList<IResultSetValue> reader, int countStartColumn, List<string> typesToCount)
@@ -5390,8 +5408,6 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("query");
             }
 
-            var list = new List<MediaStream>();
-
             var cmdText = "select " + string.Join(",", _mediaStreamSaveColumns) + " from mediastreams where";
 
             cmdText += " ItemId=@ItemId";
@@ -5412,8 +5428,10 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<MediaStream>();
+
                         using (var statement = PrepareStatementSafe(db, cmdText))
                         {
                             statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
@@ -5433,11 +5451,12 @@ namespace Emby.Server.Implementations.Data
                                 list.Add(GetMediaStream(row));
                             }
                         }
+
+                        return list;
+
                     }, ReadTransactionMode);
                 }
             }
-
-            return list;
         }
 
         public async Task SaveMediaStreams(Guid id, List<MediaStream> streams, CancellationToken cancellationToken)
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 7afb5720e..7767ae892 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -300,9 +300,7 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    UserItemData result = null;
-
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
                         using (var statement = db.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
                         {
@@ -311,13 +309,13 @@ namespace Emby.Server.Implementations.Data
 
                             foreach (var row in statement.ExecuteQuery())
                             {
-                                result = ReadRow(row);
-                                break;
+                                return ReadRow(row);
                             }
                         }
-                    }, ReadTransactionMode);
 
-                    return result;
+                        return null;
+
+                    }, ReadTransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 2b2c3e000..d0c473777 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -459,12 +459,21 @@ namespace Emby.Server.Implementations.Dto
 
                 if (dtoOptions.EnableUserData)
                 {
-                    dto.UserData = await _userDataRepository.GetUserDataDto(item, dto, user).ConfigureAwait(false);
+                    dto.UserData = await _userDataRepository.GetUserDataDto(item, dto, user, dtoOptions.Fields).ConfigureAwait(false);
                 }
 
                 if (!dto.ChildCount.HasValue && item.SourceType == SourceType.Library)
                 {
-                    dto.ChildCount = GetChildCount(folder, user);
+                    // For these types we can try to optimize and assume these values will be equal
+                    if (item is MusicAlbum || item is Season)
+                    {
+                        dto.ChildCount = dto.RecursiveItemCount;
+                    }
+
+                    if (dtoOptions.Fields.Contains(ItemFields.ChildCount))
+                    {
+                        dto.ChildCount = dto.ChildCount ?? GetChildCount(folder, user);
+                    }
                 }
 
                 if (fields.Contains(ItemFields.CumulativeRunTimeTicks))
@@ -1151,28 +1160,29 @@ namespace Emby.Server.Implementations.Dto
             {
                 dto.Artists = hasArtist.Artists;
 
-                var artistItems = _libraryManager.GetArtists(new InternalItemsQuery
-                {
-                    EnableTotalRecordCount = false,
-                    ItemIds = new[] { item.Id.ToString("N") }
-                });
-
-                dto.ArtistItems = artistItems.Items
-                    .Select(i =>
-                    {
-                        var artist = i.Item1;
-                        return new NameIdPair
-                        {
-                            Name = artist.Name,
-                            Id = artist.Id.ToString("N")
-                        };
-                    })
-                    .ToList();
+                //var artistItems = _libraryManager.GetArtists(new InternalItemsQuery
+                //{
+                //    EnableTotalRecordCount = false,
+                //    ItemIds = new[] { item.Id.ToString("N") }
+                //});
+
+                //dto.ArtistItems = artistItems.Items
+                //    .Select(i =>
+                //    {
+                //        var artist = i.Item1;
+                //        return new NameIdPair
+                //        {
+                //            Name = artist.Name,
+                //            Id = artist.Id.ToString("N")
+                //        };
+                //    })
+                //    .ToList();
 
                 // Include artists that are not in the database yet, e.g., just added via metadata editor
-                var foundArtists = artistItems.Items.Select(i => i.Item1.Name).ToList();
+                //var foundArtists = artistItems.Items.Select(i => i.Item1.Name).ToList();
+                dto.ArtistItems = new List<NameIdPair>();
                 dto.ArtistItems.AddRange(hasArtist.Artists
-                    .Except(foundArtists, new DistinctNameComparer())
+                    //.Except(foundArtists, new DistinctNameComparer())
                     .Select(i =>
                     {
                         // This should not be necessary but we're seeing some cases of it
@@ -1201,23 +1211,48 @@ namespace Emby.Server.Implementations.Dto
             {
                 dto.AlbumArtist = hasAlbumArtist.AlbumArtists.FirstOrDefault();
 
-                var artistItems = _libraryManager.GetAlbumArtists(new InternalItemsQuery
-                {
-                    EnableTotalRecordCount = false,
-                    ItemIds = new[] { item.Id.ToString("N") }
-                });
-
-                dto.AlbumArtists = artistItems.Items
+                //var artistItems = _libraryManager.GetAlbumArtists(new InternalItemsQuery
+                //{
+                //    EnableTotalRecordCount = false,
+                //    ItemIds = new[] { item.Id.ToString("N") }
+                //});
+
+                //dto.AlbumArtists = artistItems.Items
+                //    .Select(i =>
+                //    {
+                //        var artist = i.Item1;
+                //        return new NameIdPair
+                //        {
+                //            Name = artist.Name,
+                //            Id = artist.Id.ToString("N")
+                //        };
+                //    })
+                //    .ToList();
+
+                dto.AlbumArtists = new List<NameIdPair>();
+                dto.AlbumArtists.AddRange(hasAlbumArtist.AlbumArtists
+                    //.Except(foundArtists, new DistinctNameComparer())
                     .Select(i =>
                     {
-                        var artist = i.Item1;
-                        return new NameIdPair
+                        // This should not be necessary but we're seeing some cases of it
+                        if (string.IsNullOrWhiteSpace(i))
                         {
-                            Name = artist.Name,
-                            Id = artist.Id.ToString("N")
-                        };
-                    })
-                    .ToList();
+                            return null;
+                        }
+
+                        var artist = _libraryManager.GetArtist(i);
+                        if (artist != null)
+                        {
+                            return new NameIdPair
+                            {
+                                Name = artist.Name,
+                                Id = artist.Id.ToString("N")
+                            };
+                        }
+
+                        return null;
+
+                    }).Where(i => i != null));
             }
 
             // Add video info
diff --git a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index cc2dcb6fd..5bb21d02a 100644
--- a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -519,6 +519,12 @@ namespace Emby.Server.Implementations.FileOrganization
 
         private void PerformFileSorting(TvFileOrganizationOptions options, FileOrganizationResult result)
         {
+            // We should probably handle this earlier so that we never even make it this far
+            if (string.Equals(result.OriginalPath, result.TargetPath, StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
             _libraryMonitor.ReportFileSystemChangeBeginning(result.TargetPath);
 
             _fileSystem.CreateDirectory(Path.GetDirectoryName(result.TargetPath));
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index 94cc383a7..4606d0e31 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -76,7 +76,8 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
 
         private void ProcessContext(HttpListenerContext context)
         {
-            Task.Factory.StartNew(() => InitTask(context));
+            //Task.Factory.StartNew(() => InitTask(context), TaskCreationOptions.DenyChildAttach | TaskCreationOptions.PreferFairness);
+            Task.Run(() => InitTask(context));
         }
 
         private Task InitTask(HttpListenerContext context)
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index ad91988e5..1ff61286f 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -817,7 +817,31 @@ namespace Emby.Server.Implementations.Library
 
             return _userRootFolder;
         }
-        
+
+        public Guid? FindIdByPath(string path, bool? isFolder)
+        {
+            // If this returns multiple items it could be tricky figuring out which one is correct. 
+            // In most cases, the newest one will be and the others obsolete but not yet cleaned up
+
+            var query = new InternalItemsQuery
+            {
+                Path = path,
+                IsFolder = isFolder,
+                SortBy = new[] { ItemSortBy.DateCreated },
+                SortOrder = SortOrder.Descending,
+                Limit = 1
+            };
+
+            var id = GetItemIds(query);
+
+            if (id.Count == 0)
+            {
+                return null;
+            }
+
+            return id[0];
+        }
+
         public BaseItem FindByPath(string path, bool? isFolder)
         {
             // If this returns multiple items it could be tricky figuring out which one is correct. 
@@ -1430,7 +1454,7 @@ namespace Emby.Server.Implementations.Library
             }))
             {
                 // Optimize by querying against top level views
-                query.TopParentIds = parents.SelectMany(i => GetTopParentsForQuery(i, query.User)).Select(i => i.Id.ToString("N")).ToArray();
+                query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).Select(i => i.ToString("N")).ToArray();
                 query.AncestorIds = new string[] { };
             }
         }
@@ -1489,7 +1513,7 @@ namespace Emby.Server.Implementations.Library
             }))
             {
                 // Optimize by querying against top level views
-                query.TopParentIds = parents.SelectMany(i => GetTopParentsForQuery(i, query.User)).Select(i => i.Id.ToString("N")).ToArray();
+                query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).Select(i => i.ToString("N")).ToArray();
             }
             else
             {
@@ -1515,11 +1539,11 @@ namespace Emby.Server.Implementations.Library
 
                 }, CancellationToken.None).Result.ToList();
 
-                query.TopParentIds = userViews.SelectMany(i => GetTopParentsForQuery(i, user)).Select(i => i.Id.ToString("N")).ToArray();
+                query.TopParentIds = userViews.SelectMany(i => GetTopParentIdsForQuery(i, user)).Select(i => i.ToString("N")).ToArray();
             }
         }
 
-        private IEnumerable<BaseItem> GetTopParentsForQuery(BaseItem item, User user)
+        private IEnumerable<Guid> GetTopParentIdsForQuery(BaseItem item, User user)
         {
             var view = item as UserView;
 
@@ -1527,7 +1551,7 @@ namespace Emby.Server.Implementations.Library
             {
                 if (string.Equals(view.ViewType, CollectionType.LiveTv))
                 {
-                    return new[] { view };
+                    return new[] { view.Id };
                 }
                 if (string.Equals(view.ViewType, CollectionType.Channels))
                 {
@@ -1537,7 +1561,7 @@ namespace Emby.Server.Implementations.Library
 
                     }, CancellationToken.None).Result;
 
-                    return channelResult.Items;
+                    return channelResult.Items.Select(i =>  i.Id);
                 }
 
                 // Translate view into folders
@@ -1546,18 +1570,18 @@ namespace Emby.Server.Implementations.Library
                     var displayParent = GetItemById(view.DisplayParentId);
                     if (displayParent != null)
                     {
-                        return GetTopParentsForQuery(displayParent, user);
+                        return GetTopParentIdsForQuery(displayParent, user);
                     }
-                    return new BaseItem[] { };
+                    return new Guid[] { };
                 }
                 if (view.ParentId != Guid.Empty)
                 {
                     var displayParent = GetItemById(view.ParentId);
                     if (displayParent != null)
                     {
-                        return GetTopParentsForQuery(displayParent, user);
+                        return GetTopParentIdsForQuery(displayParent, user);
                     }
-                    return new BaseItem[] { };
+                    return new Guid[] { };
                 }
 
                 // Handle grouping
@@ -1568,23 +1592,23 @@ namespace Emby.Server.Implementations.Library
                         .OfType<CollectionFolder>()
                         .Where(i => string.IsNullOrWhiteSpace(i.CollectionType) || string.Equals(i.CollectionType, view.ViewType, StringComparison.OrdinalIgnoreCase))
                         .Where(i => user.IsFolderGrouped(i.Id))
-                        .SelectMany(i => GetTopParentsForQuery(i, user));
+                        .SelectMany(i => GetTopParentIdsForQuery(i, user));
                 }
-                return new BaseItem[] { };
+                return new Guid[] { };
             }
 
             var collectionFolder = item as CollectionFolder;
             if (collectionFolder != null)
             {
-                return collectionFolder.GetPhysicalParents();
+                return collectionFolder.PhysicalFolderIds;
             }
-
+            
             var topParent = item.GetTopParent();
             if (topParent != null)
             {
-                return new[] { topParent };
+                return new[] { topParent.Id };
             }
-            return new BaseItem[] { };
+            return new Guid[] { };
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index f4a30fc00..5a14edf13 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -12,6 +12,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Querying;
 
 namespace Emby.Server.Implementations.Library
 {
@@ -186,16 +187,16 @@ namespace Emby.Server.Implementations.Library
             var userData = GetUserData(user.Id, item);
             var dto = GetUserItemDataDto(userData);
 
-            await item.FillUserDataDtoValues(dto, userData, null, user).ConfigureAwait(false);
+            await item.FillUserDataDtoValues(dto, userData, null, user, new List<ItemFields>()).ConfigureAwait(false);
             return dto;
         }
 
-        public async Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user)
+        public async Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user, List<ItemFields> fields)
         {
             var userData = GetUserData(user.Id, item);
             var dto = GetUserItemDataDto(userData);
 
-            await item.FillUserDataDtoValues(dto, userData, itemDto, user).ConfigureAwait(false);
+            await item.FillUserDataDtoValues(dto, userData, itemDto, user, fields).ConfigureAwait(false);
             return dto;
         }
 
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 43e19da65..f18278cb2 100644
--- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -65,9 +65,9 @@ namespace Emby.Server.Implementations.Notifications
 
             var whereClause = " where " + string.Join(" And ", clauses.ToArray());
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection(true))
                 {
                     result.TotalRecordCount = connection.Query("select count(Id) from Notifications" + whereClause, paramList.ToArray()).SelectScalarInt().First();
 
@@ -106,9 +106,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             var result = new NotificationsSummary();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection(true))
                 {
                     using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead"))
                     {
@@ -223,9 +223,9 @@ namespace Emby.Server.Implementations.Notifications
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -286,9 +286,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -308,9 +308,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(conn =>
                     {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index 392db6935..7199f4f4d 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -206,10 +206,10 @@ namespace Emby.Server.Implementations.Security
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var result = new QueryResult<AuthenticationInfo>();
-
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var result = new QueryResult<AuthenticationInfo>();
+
                         var statementTexts = new List<string>();
                         statementTexts.Add(commandText);
                         statementTexts.Add("select count (Id) from AccessTokens" + whereTextWithoutPaging);
@@ -236,10 +236,10 @@ namespace Emby.Server.Implementations.Security
                             }
                         }
 
-                    }, ReadTransactionMode);
+                        result.Items = list.ToArray();
+                        return result;
 
-                    result.Items = list.ToArray();
-                    return result;
+                    }, ReadTransactionMode);
                 }
             }
         }
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 73a2bedb9..7a8951396 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -121,7 +121,9 @@ namespace MediaBrowser.Api
         {
             var options = new DtoOptions();
 
-            options.DeviceId = authContext.GetAuthorizationInfo(Request).DeviceId;
+            var authInfo = authContext.GetAuthorizationInfo(Request);
+
+            options.DeviceId = authInfo.DeviceId;
 
             var hasFields = request as IHasItemFields;
             if (hasFields != null)
@@ -129,6 +131,34 @@ namespace MediaBrowser.Api
                 options.Fields = hasFields.GetItemFields().ToList();
             }
 
+            var client = authInfo.Client ?? string.Empty;
+            if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 ||
+                client.IndexOf("wmc", StringComparison.OrdinalIgnoreCase) != -1 ||
+                client.IndexOf("media center", StringComparison.OrdinalIgnoreCase) != -1 ||
+                client.IndexOf("classic", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                options.Fields.Add(Model.Querying.ItemFields.RecursiveItemCount);
+            }
+
+            if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("wmc", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("media center", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("classic", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("roku", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("samsung", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                options.Fields.Add(Model.Querying.ItemFields.ChildCount);
+            }
+
+            if (client.IndexOf("web", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("mobile", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("ios", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("android", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("theater", StringComparison.OrdinalIgnoreCase) == -1)
+            {
+                options.Fields.Add(Model.Querying.ItemFields.ChildCount);
+            }
+
             var hasDtoOptions = request as IHasDtoOptions;
             if (hasDtoOptions != null)
             {
diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index 0ae1fbff4..b5c51bfef 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -14,8 +14,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
@@ -88,6 +86,12 @@ namespace MediaBrowser.Api
     {
     }
 
+    [Route("/Items/RemoteSearch/Book", "POST")]
+    [Authenticated]
+    public class GetBookRemoteSearchResults : RemoteSearchQuery<BookInfo>, IReturn<List<RemoteSearchResult>>
+    {
+    }
+
     [Route("/Items/RemoteSearch/Image", "GET", Summary = "Gets a remote image")]
     public class GetRemoteSearchImage
     {
@@ -147,6 +151,13 @@ namespace MediaBrowser.Api
             return ToOptimizedResult(result);
         }
 
+        public async Task<object> Post(GetBookRemoteSearchResults request)
+        {
+            var result = await _providerManager.GetRemoteSearchResults<Book, BookInfo>(request, CancellationToken.None).ConfigureAwait(false);
+
+            return ToOptimizedResult(result);
+        }
+
         public async Task<object> Post(GetMovieRemoteSearchResults request)
         {
             var result = await _providerManager.GetRemoteSearchResults<Movie, MovieInfo>(request, CancellationToken.None).ConfigureAwait(false);
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 9f4503466..2aa53d651 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -30,6 +30,7 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Providers;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Controller.Entities
@@ -2191,7 +2192,7 @@ namespace MediaBrowser.Controller.Entities
             return path;
         }
 
-        public virtual Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user)
+        public virtual Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List<ItemFields> itemFields)
         {
             if (RunTimeTicks.HasValue)
             {
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index ebc55ca8a..c505aefb3 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -27,6 +27,7 @@ namespace MediaBrowser.Controller.Entities
         public CollectionFolder()
         {
             PhysicalLocationsList = new List<string>();
+            PhysicalFolderIds = new List<Guid>();
         }
 
         [IgnoreDataMember]
@@ -153,6 +154,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         public List<string> PhysicalLocationsList { get; set; }
+        public List<Guid> PhysicalFolderIds { get; set; }
 
         protected override IEnumerable<FileSystemMetadata> GetFileSystemChildren(IDirectoryService directoryService)
         {
@@ -176,6 +178,18 @@ namespace MediaBrowser.Controller.Entities
                 }
             }
 
+            if (!changed)
+            {
+                var folderIds = PhysicalFolderIds.ToList();
+
+                var newFolderIds = GetPhysicalFolders(false).Select(i => i.Id).ToList();
+
+                if (!folderIds.SequenceEqual(newFolderIds))
+                {
+                    changed = true;
+                }
+            }
+
             return changed;
         }
 
@@ -186,6 +200,31 @@ namespace MediaBrowser.Controller.Entities
             return changed;
         }
 
+        protected override bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)
+        {
+            var physicalFolders = GetPhysicalFolders(false)
+                .ToList();
+
+            var linkedChildren = physicalFolders
+                .SelectMany(c => c.LinkedChildren)
+                .ToList();
+
+            var changed = !linkedChildren.SequenceEqual(LinkedChildren, new LinkedChildComparer());
+
+            LinkedChildren = linkedChildren;
+
+            var folderIds = PhysicalFolderIds.ToList();
+            var newFolderIds = physicalFolders.Select(i => i.Id).ToList();
+
+            if (!folderIds.SequenceEqual(newFolderIds))
+            {
+                changed = true;
+                PhysicalFolderIds = newFolderIds.ToList();
+            }
+
+            return changed;
+        }
+
         internal override bool IsValidFromResolver(BaseItem newItem)
         {
             var newCollectionFolder = newItem as CollectionFolder;
@@ -260,26 +299,6 @@ namespace MediaBrowser.Controller.Entities
             return Task.FromResult(true);
         }
 
-        /// <summary>
-        /// Our children are actually just references to the ones in the physical root...
-        /// </summary>
-        /// <value>The linked children.</value>
-        [IgnoreDataMember]
-        public override List<LinkedChild> LinkedChildren
-        {
-            get { return GetLinkedChildrenInternal(); }
-            set
-            {
-                base.LinkedChildren = value;
-            }
-        }
-        private List<LinkedChild> GetLinkedChildrenInternal()
-        {
-            return GetPhysicalParents()
-                .SelectMany(c => c.LinkedChildren)
-                .ToList();
-        }
-
         /// <summary>
         /// Our children are actually just references to the ones in the physical root...
         /// </summary>
@@ -292,11 +311,16 @@ namespace MediaBrowser.Controller.Entities
 
         private IEnumerable<BaseItem> GetActualChildren()
         {
-            return GetPhysicalParents().SelectMany(c => c.Children);
+            return GetPhysicalFolders(true).SelectMany(c => c.Children);
         }
 
-        public IEnumerable<Folder> GetPhysicalParents()
+        private IEnumerable<Folder> GetPhysicalFolders(bool enableCache)
         {
+            if (enableCache)
+            {
+                return PhysicalFolderIds.Select(i => LibraryManager.GetItemById(i)).OfType<Folder>();
+            }
+
             var rootChildren = LibraryManager.RootFolder.Children
                 .OfType<Folder>()
                 .ToList();
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 4705f03fa..a84e9a5d2 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1222,7 +1222,7 @@ namespace MediaBrowser.Controller.Entities
         /// Refreshes the linked children.
         /// </summary>
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        private bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)
+        protected virtual bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)
         {
             var currentManualLinks = LinkedChildren.Where(i => i.Type == LinkedChildType.Manual).ToList();
             var currentShortcutLinks = LinkedChildren.Where(i => i.Type == LinkedChildType.Shortcut).ToList();
@@ -1410,23 +1410,24 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        public override async Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user)
+        public override async Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List<ItemFields> itemFields)
         {
             if (!SupportsUserDataFromChildren)
             {
                 return;
             }
 
-            var recursiveItemCount = GetRecursiveChildCount(user);
-
             if (itemDto != null)
             {
-                itemDto.RecursiveItemCount = recursiveItemCount;
+                if (itemFields.Contains(ItemFields.RecursiveItemCount))
+                {
+                    itemDto.RecursiveItemCount = GetRecursiveChildCount(user);
+                }
             }
 
-            if (recursiveItemCount > 0 && SupportsPlayedStatus)
+            if (SupportsPlayedStatus)
             {
-                var unplayedQueryResult = recursiveItemCount > 0 ? await GetItems(new InternalItemsQuery(user)
+                var unplayedQueryResult = await GetItems(new InternalItemsQuery(user)
                 {
                     Recursive = true,
                     IsFolder = false,
@@ -1435,21 +1436,24 @@ namespace MediaBrowser.Controller.Entities
                     Limit = 0,
                     IsPlayed = false
 
-                }).ConfigureAwait(false) : new QueryResult<BaseItem>();
+                }).ConfigureAwait(false);
 
                 double unplayedCount = unplayedQueryResult.TotalRecordCount;
 
-                var unplayedPercentage = (unplayedCount / recursiveItemCount) * 100;
-                dto.PlayedPercentage = 100 - unplayedPercentage;
-                dto.Played = dto.PlayedPercentage.Value >= 100;
                 dto.UnplayedItemCount = unplayedQueryResult.TotalRecordCount;
-            }
 
-            if (itemDto != null)
-            {
-                if (this is Season || this is MusicAlbum)
+                if (itemDto != null && itemDto.RecursiveItemCount.HasValue)
+                {
+                    if (itemDto.RecursiveItemCount.Value > 0)
+                    {
+                        var unplayedPercentage = (unplayedCount/itemDto.RecursiveItemCount.Value)*100;
+                        dto.PlayedPercentage = 100 - unplayedPercentage;
+                        dto.Played = dto.PlayedPercentage.Value >= 100;
+                    }
+                }
+                else
                 {
-                    itemDto.ChildCount = recursiveItemCount;
+                    dto.Played = (dto.UnplayedItemCount ?? 0) == 0;
                 }
             }
         }
diff --git a/MediaBrowser.Controller/Entities/IHasUserData.cs b/MediaBrowser.Controller/Entities/IHasUserData.cs
index c21e170ae..0b3b7dc8d 100644
--- a/MediaBrowser.Controller/Entities/IHasUserData.cs
+++ b/MediaBrowser.Controller/Entities/IHasUserData.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -14,10 +15,7 @@ namespace MediaBrowser.Controller.Entities
         /// <summary>
         /// Fills the user data dto values.
         /// </summary>
-        /// <param name="dto">The dto.</param>
-        /// <param name="userData">The user data.</param>
-        /// <param name="user">The user.</param>
-        Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user);
+        Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List<ItemFields> fields);
 
         bool EnableRememberingTrackSelections { get; }
 
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index d297fd006..bf9a07626 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -62,6 +62,8 @@ namespace MediaBrowser.Controller.Library
         /// <returns>BaseItem.</returns>
         BaseItem FindByPath(string path, bool? isFolder);
 
+        Guid? FindIdByPath(string path, bool? isFolder);
+
         /// <summary>
         /// Gets the artist.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/IUserDataManager.cs b/MediaBrowser.Controller/Library/IUserDataManager.cs
index 86c52c4c3..5940c7e29 100644
--- a/MediaBrowser.Controller/Library/IUserDataManager.cs
+++ b/MediaBrowser.Controller/Library/IUserDataManager.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Model.Entities;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Controller.Library
 {
@@ -37,12 +38,9 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Gets the user data dto.
         /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>UserItemDataDto.</returns>
         Task<UserItemDataDto> GetUserDataDto(IHasUserData item, User user);
 
-        Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user);
+        Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user, List<ItemFields> fields);
 
         /// <summary>
         /// Get all user data for the given user
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index bf1d4991c..e36abf16e 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -171,6 +171,8 @@
         /// </summary>
         PrimaryImageAspectRatio,
 
+        RecursiveItemCount,
+
         /// <summary>
         /// The revenue
         /// </summary>
diff --git a/RSSDP/SsdpDevicePublisherBase.cs b/RSSDP/SsdpDevicePublisherBase.cs
index 260c00896..8ab35d661 100644
--- a/RSSDP/SsdpDevicePublisherBase.cs
+++ b/RSSDP/SsdpDevicePublisherBase.cs
@@ -291,7 +291,7 @@ namespace Rssdp.Infrastructure
                 if (devices != null)
                 {
                     var deviceList = devices.ToList();
-                    WriteTrace(String.Format("Sending {0} search responses", deviceList.Count));
+                    //WriteTrace(String.Format("Sending {0} search responses", deviceList.Count));
 
                     foreach (var device in deviceList)
                     {
@@ -300,7 +300,7 @@ namespace Rssdp.Infrastructure
                 }
                 else
                 {
-                    WriteTrace(String.Format("Sending 0 search responses."));
+                    //WriteTrace(String.Format("Sending 0 search responses."));
                 }
             });
         }
@@ -413,7 +413,7 @@ namespace Rssdp.Infrastructure
 
                 //DisposeRebroadcastTimer();
 
-                WriteTrace("Begin Sending Alive Notifications For All Devices");
+                //WriteTrace("Begin Sending Alive Notifications For All Devices");
 
                 _LastNotificationTime = DateTime.Now;
 
@@ -430,7 +430,7 @@ namespace Rssdp.Infrastructure
                     SendAliveNotifications(device, true);
                 }
 
-                WriteTrace("Completed Sending Alive Notifications For All Devices");
+                //WriteTrace("Completed Sending Alive Notifications For All Devices");
             }
             catch (ObjectDisposedException ex)
             {
-- 
cgit v1.2.3


From 524e7facc87e746745af9095a3f100dcec1799b6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 13 Dec 2016 18:38:26 -0500
Subject: fix socket errors on linux under .net core

---
 Emby.Common.Implementations/Net/SocketFactory.cs   | 12 ++---
 .../Networking/NetworkManager.cs                   |  2 +-
 .../HttpServer/SocketSharp/SharpWebSocket.cs       | 12 +----
 MediaBrowser.Api/BaseApiService.cs                 |  3 +-
 SocketHttpListener.Portable/WebSocket.cs           | 55 +++++++++-------------
 src/Emby.Server/Program.cs                         |  9 ++--
 6 files changed, 39 insertions(+), 54 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer')

diff --git a/Emby.Common.Implementations/Net/SocketFactory.cs b/Emby.Common.Implementations/Net/SocketFactory.cs
index 1f41ffff5..70c7ba845 100644
--- a/Emby.Common.Implementations/Net/SocketFactory.cs
+++ b/Emby.Common.Implementations/Net/SocketFactory.cs
@@ -125,15 +125,15 @@ namespace Emby.Common.Implementations.Net
 
             try
             {
-#if NETSTANDARD1_3
-				// The ExclusiveAddressUse socket option is a Windows-specific option that, when set to "true," tells Windows not to allow another socket to use the same local address as this socket
-				// See https://github.com/dotnet/corefx/pull/11509 for more details
-				if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows))
+#if NET46
+				retVal.ExclusiveAddressUse = false;
+#else
+                // The ExclusiveAddressUse socket option is a Windows-specific option that, when set to "true," tells Windows not to allow another socket to use the same local address as this socket
+                // See https://github.com/dotnet/corefx/pull/11509 for more details
+                if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows))
 				{
 					retVal.ExclusiveAddressUse = false;
 				}
-#else
-                retVal.ExclusiveAddressUse = false;
 #endif
                 //retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
                 retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
diff --git a/Emby.Common.Implementations/Networking/NetworkManager.cs b/Emby.Common.Implementations/Networking/NetworkManager.cs
index a4e6d47d4..4485e8b14 100644
--- a/Emby.Common.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Common.Implementations/Networking/NetworkManager.cs
@@ -245,7 +245,7 @@ namespace Emby.Common.Implementations.Networking
                     //}
 
                     return ipProperties.UnicastAddresses
-                        .Where(i => i.IsDnsEligible)
+                        //.Where(i => i.IsDnsEligible)
                         .Select(i => i.Address)
                         .Where(i => i.AddressFamily == AddressFamily.InterNetwork)
                         .ToList();
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
index 0a312f7b9..9823a2ff5 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -102,11 +102,7 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         /// <returns>Task.</returns>
         public Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken)
         {
-            var completionSource = new TaskCompletionSource<bool>();
-
-            WebSocket.SendAsync(bytes, res => completionSource.TrySetResult(true));
-
-            return completionSource.Task;
+            return WebSocket.SendAsync(bytes);
         }
 
         /// <summary>
@@ -118,11 +114,7 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         /// <returns>Task.</returns>
         public Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken)
         {
-            var completionSource = new TaskCompletionSource<bool>();
-
-            WebSocket.SendAsync(text, res => completionSource.TrySetResult(true));
-
-            return completionSource.Task;
+            return WebSocket.SendAsync(text);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 7a8951396..07ec6d955 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -151,9 +151,10 @@ namespace MediaBrowser.Api
             }
 
             if (client.IndexOf("web", StringComparison.OrdinalIgnoreCase) == -1 &&
+
+                // covers both emby mobile and emby for android mobile
                 client.IndexOf("mobile", StringComparison.OrdinalIgnoreCase) == -1 &&
                 client.IndexOf("ios", StringComparison.OrdinalIgnoreCase) == -1 &&
-                client.IndexOf("android", StringComparison.OrdinalIgnoreCase) == -1 &&
                 client.IndexOf("theater", StringComparison.OrdinalIgnoreCase) == -1)
             {
                 options.Fields.Add(Model.Querying.ItemFields.ChildCount);
diff --git a/SocketHttpListener.Portable/WebSocket.cs b/SocketHttpListener.Portable/WebSocket.cs
index 889880387..9966d3fcf 100644
--- a/SocketHttpListener.Portable/WebSocket.cs
+++ b/SocketHttpListener.Portable/WebSocket.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.IO;
 using SocketHttpListener.Net.WebSockets;
@@ -621,26 +622,22 @@ namespace SocketHttpListener
             }
         }
 
-        private void sendAsync(Opcode opcode, Stream stream, Action<bool> completed)
+        private Task sendAsync(Opcode opcode, Stream stream)
         {
-            Func<Opcode, Stream, bool> sender = send;
-            sender.BeginInvoke(
-              opcode,
-              stream,
-              ar =>
-              {
-                  try
-                  {
-                      var sent = sender.EndInvoke(ar);
-                      if (completed != null)
-                          completed(sent);
-                  }
-                  catch (Exception ex)
-                  {
-                      error("An exception has occurred while callback.", ex);
-                  }
-              },
-              null);
+            var completionSource = new TaskCompletionSource<bool>();
+            Task.Run(() =>
+           {
+               try
+               {
+                   send(opcode, stream);
+                   completionSource.TrySetResult(true);
+               }
+               catch (Exception ex)
+               {
+                   completionSource.TrySetException(ex);
+               }
+           });
+            return completionSource.Task;
         }
 
         // As server
@@ -833,22 +830,18 @@ namespace SocketHttpListener
         /// <param name="data">
         /// An array of <see cref="byte"/> that represents the binary data to send.
         /// </param>
-        /// <param name="completed">
         /// An Action&lt;bool&gt; delegate that references the method(s) called when the send is
         /// complete. A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
         /// complete successfully; otherwise, <c>false</c>.
-        /// </param>
-        public void SendAsync(byte[] data, Action<bool> completed)
+        public Task SendAsync(byte[] data)
         {
             var msg = _readyState.CheckIfOpen() ?? data.CheckIfValidSendData();
             if (msg != null)
             {
-                error(msg);
-
-                return;
+                throw new Exception(msg);
             }
 
-            sendAsync(Opcode.Binary, _memoryStreamFactory.CreateNew(data), completed);
+            return sendAsync(Opcode.Binary, _memoryStreamFactory.CreateNew(data));
         }
 
         /// <summary>
@@ -860,22 +853,18 @@ namespace SocketHttpListener
         /// <param name="data">
         /// A <see cref="string"/> that represents the text data to send.
         /// </param>
-        /// <param name="completed">
         /// An Action&lt;bool&gt; delegate that references the method(s) called when the send is
         /// complete. A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
         /// complete successfully; otherwise, <c>false</c>.
-        /// </param>
-        public void SendAsync(string data, Action<bool> completed)
+        public Task SendAsync(string data)
         {
             var msg = _readyState.CheckIfOpen() ?? data.CheckIfValidSendData();
             if (msg != null)
             {
-                error(msg);
-
-                return;
+                throw new Exception(msg);
             }
 
-            sendAsync(Opcode.Text, _memoryStreamFactory.CreateNew(Encoding.UTF8.GetBytes(data)), completed);
+            return sendAsync(Opcode.Text, _memoryStreamFactory.CreateNew(Encoding.UTF8.GetBytes(data)));
         }
 
         #endregion
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs
index 24e391c73..26141a0ce 100644
--- a/src/Emby.Server/Program.cs
+++ b/src/Emby.Server/Program.cs
@@ -215,9 +215,12 @@ namespace Emby.Server
 
             var initProgress = new Progress<double>();
 
-            // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
-            SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |
-                         ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
+            if (environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows)
+            {
+                // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
+                SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |
+                             ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
+            }
 
             var task = _appHost.Init(initProgress);
             Task.WaitAll(task);
-- 
cgit v1.2.3