Merge branch 'master' into transcoding-throttling

64 files changed, 953 insertions, 1147 deletions

diff --git a/Emby.Server.Implementations/Activity/ActivityManager.cs b/Emby.Server.Implementations/Activity/ActivityManager.cs
index b03c4d182..6712c4782 100644
--- a/Emby.Server.Implementations/Activity/ActivityManager.cs
+++ b/Emby.Server.Implementations/Activity/ActivityManager.cs
@@ -2,7 +2,6 @@
 #pragma warning disable SA1600
 
 using System;
-using System.Linq;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Events;
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 0bb1d832f..e2df8877a 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -599,7 +599,7 @@ namespace Emby.Server.Implementations
                 HttpsPort = ServerConfiguration.DefaultHttpsPort;
             }
 
-            JsonSerializer = new JsonSerializer(FileSystemManager);
+            JsonSerializer = new JsonSerializer();
 
             if (Plugins != null)
             {
@@ -1007,7 +1007,7 @@ namespace Emby.Server.Implementations
         {
             string dir = Path.Combine(ApplicationPaths.PluginsPath, args.Argument.name);
             var types = Directory.EnumerateFiles(dir, "*.dll", SearchOption.AllDirectories)
-                        .Select(x => Assembly.LoadFrom(x))
+                        .Select(Assembly.LoadFrom)
                         .SelectMany(x => x.ExportedTypes)
                         .Where(x => x.IsClass && !x.IsAbstract && !x.IsInterface && !x.IsGenericType)
                         .ToArray();
@@ -1707,29 +1707,6 @@ namespace Emby.Server.Implementations
             _plugins = list.ToArray();
         }
 
-        /// <summary>
-        /// This returns localhost in the case of no external dns, and the hostname if the
-        /// dns is prefixed with a valid Uri prefix.
-        /// </summary>
-        /// <param name="externalDns">The external dns prefix to get the hostname of.</param>
-        /// <returns>The hostname in <paramref name="externalDns"/>.</returns>
-        private static string GetHostnameFromExternalDns(string externalDns)
-        {
-            if (string.IsNullOrEmpty(externalDns))
-            {
-                return "localhost";
-            }
-
-            try
-            {
-                return new Uri(externalDns).Host;
-            }
-            catch
-            {
-                return externalDns;
-            }
-        }
-
         public virtual void LaunchUrl(string url)
         {
             if (!CanLaunchWebBrowser)
diff --git a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
index 36e0e5e26..6cbd04fea 100644
--- a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -35,14 +35,6 @@ namespace Emby.Server.Implementations.Channels
             return Task.CompletedTask;
         }
 
-        public static string GetUserDistinctValue(User user)
-        {
-            var channels = user.Policy.EnabledChannels
-                .OrderBy(i => i);
-
-            return string.Join("|", channels);
-        }
-
         private void CleanDatabase(CancellationToken cancellationToken)
         {
             var installedChannelIds = ((ChannelManager)_channelManager).GetInstalledChannelIds();
@@ -75,19 +67,23 @@ namespace Emby.Server.Implementations.Channels
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                _libraryManager.DeleteItem(item, new DeleteOptions
-                {
-                    DeleteFileLocation = false
-
-                }, false);
+                _libraryManager.DeleteItem(
+                    item,
+                    new DeleteOptions
+                    {
+                        DeleteFileLocation = false
+                    },
+                    false);
             }
 
             // Finally, delete the channel itself
-            _libraryManager.DeleteItem(channel, new DeleteOptions
-            {
-                DeleteFileLocation = false
-
-            }, false);
+            _libraryManager.DeleteItem(
+                channel,
+                new DeleteOptions
+                {
+                    DeleteFileLocation = false
+                },
+                false);
         }
     }
 }
diff --git a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index 039e2c138..03e6abcfb 100644
--- a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -28,18 +28,28 @@ namespace Emby.Server.Implementations.Channels
             _libraryManager = libraryManager;
         }
 
+        /// <inheritdoc />
         public string Name => "Refresh Channels";
 
+        /// <inheritdoc />
         public string Description => "Refreshes internet channel information.";
 
+        /// <inheritdoc />
         public string Category => "Internet Channels";
 
+        /// <inheritdoc />
         public bool IsHidden => ((ChannelManager)_channelManager).Channels.Length == 0;
 
+        /// <inheritdoc />
         public bool IsEnabled => true;
 
+        /// <inheritdoc />
         public bool IsLogged => true;
 
+        /// <inheritdoc />
+        public string Key => "RefreshInternetChannels";
+
+        /// <inheritdoc />
         public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
             var manager = (ChannelManager)_channelManager;
@@ -50,18 +60,18 @@ namespace Emby.Server.Implementations.Channels
                     .ConfigureAwait(false);
         }
 
-        /// <summary>
-        /// Creates the triggers that define when the task will run
-        /// </summary>
+        /// <inheritdoc />
         public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
         {
-            return new[] {
+            return new[]
+            {
 
                 // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks}
+                new TaskTriggerInfo
+                {
+                    Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks
+                }
             };
         }
-
-        public string Key => "RefreshInternetChannels";
     }
 }
diff --git a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
index 8006b8694..8b1407984 100644
--- a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
+++ b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
@@ -1,7 +1,6 @@
 #pragma warning disable CS1591
 #pragma warning disable SA1600
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Emby.Server.Implementations.Images;
diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 3d8d15d19..30b654886 100644
--- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using Emby.Server.Implementations.AppBase;
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index ef7317050..2bd0b840a 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -243,7 +243,7 @@ namespace Emby.Server.Implementations.Devices
 
             try
             {
-                using (var fs = _fileSystem.GetFileStream(path, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+                using (var fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
                 {
                     await stream.CopyToAsync(fs).ConfigureAwait(false);
                 }
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 03cbe00b7..f8560ca85 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -29,13 +29,13 @@
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.1" />
     <PackageReference Include="Mono.Nat" Version="2.0.0" />
-    <PackageReference Include="ServiceStack.Text.Core" Version="5.7.0" />
+    <PackageReference Include="ServiceStack.Text.Core" Version="5.8.0" />
     <PackageReference Include="sharpcompress" Version="0.24.0" />
-    <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.0.1" />
+    <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.1.0" />
     <PackageReference Include="System.Interactive.Async" Version="4.0.0" />
   </ItemGroup>
 
diff --git a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
deleted file mode 100644
index a6eb1152f..000000000
--- a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-#pragma warning disable CS1591
-#pragma warning disable SA1600
-
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.EntryPoints
-{
-    public class AutomaticRestartEntryPoint : IServerEntryPoint
-    {
-        private readonly IServerApplicationHost _appHost;
-        private readonly ILogger _logger;
-        private readonly ITaskManager _iTaskManager;
-        private readonly ISessionManager _sessionManager;
-        private readonly IServerConfigurationManager _config;
-        private readonly ILiveTvManager _liveTvManager;
-
-        private Timer _timer;
-
-        public AutomaticRestartEntryPoint(IServerApplicationHost appHost, ILogger logger, ITaskManager iTaskManager, ISessionManager sessionManager, IServerConfigurationManager config, ILiveTvManager liveTvManager)
-        {
-            _appHost = appHost;
-            _logger = logger;
-            _iTaskManager = iTaskManager;
-            _sessionManager = sessionManager;
-            _config = config;
-            _liveTvManager = liveTvManager;
-        }
-
-        public Task RunAsync()
-        {
-            if (_appHost.CanSelfRestart)
-            {
-                _appHost.HasPendingRestartChanged += _appHost_HasPendingRestartChanged;
-            }
-
-            return Task.CompletedTask;
-        }
-
-        void _appHost_HasPendingRestartChanged(object sender, EventArgs e)
-        {
-            DisposeTimer();
-
-            if (_appHost.HasPendingRestart)
-            {
-                _timer = new Timer(TimerCallback, null, TimeSpan.FromMinutes(15), TimeSpan.FromMinutes(15));
-            }
-        }
-
-        private async void TimerCallback(object state)
-        {
-            if (_config.Configuration.EnableAutomaticRestart)
-            {
-                var isIdle = await IsIdle().ConfigureAwait(false);
-
-                if (isIdle)
-                {
-                    DisposeTimer();
-
-                    _logger.LogInformation("Automatically restarting the system because it is idle and a restart is required.");
-
-                    try
-                    {
-                        _appHost.Restart();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error restarting server");
-                    }
-                }
-            }
-        }
-
-        private async Task<bool> IsIdle()
-        {
-            if (_iTaskManager.ScheduledTasks.Any(i => i.State != TaskState.Idle))
-            {
-                return false;
-            }
-
-            if (_liveTvManager.Services.Count == 1)
-            {
-                try
-                {
-                    var timers = await _liveTvManager.GetTimers(new TimerQuery(), CancellationToken.None).ConfigureAwait(false);
-                    if (timers.Items.Any(i => i.Status == RecordingStatus.InProgress))
-                    {
-                        return false;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error getting timers");
-                }
-            }
-
-            var now = DateTime.UtcNow;
-
-            return !_sessionManager.Sessions.Any(i => (now - i.LastActivityDate).TotalMinutes < 30);
-        }
-
-        public void Dispose()
-        {
-            _appHost.HasPendingRestartChanged -= _appHost_HasPendingRestartChanged;
-
-            DisposeTimer();
-        }
-
-        private void DisposeTimer()
-        {
-            if (_timer != null)
-            {
-                _timer.Dispose();
-                _timer = null;
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index f85d52dbc..06458baed 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -16,7 +16,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Extensions;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints
diff --git a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 9ee219854..529f83560 100644
--- a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -1,4 +1,4 @@
-using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Udp;
 using MediaBrowser.Controller;
@@ -12,7 +12,7 @@ namespace Emby.Server.Implementations.EntryPoints
     /// <summary>
     /// Class UdpServerEntryPoint.
     /// </summary>
-    public class UdpServerEntryPoint : IServerEntryPoint
+    public sealed class UdpServerEntryPoint : IServerEntryPoint
     {
         /// <summary>
         /// The port of the UDP server.
@@ -31,61 +31,44 @@ namespace Emby.Server.Implementations.EntryPoints
         /// The UDP server.
         /// </summary>
         private UdpServer _udpServer;
+        private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
+        private bool _disposed = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UdpServerEntryPoint" /> class.
         /// </summary>
         public UdpServerEntryPoint(
-            ILogger logger,
-            IServerApplicationHost appHost,
-            IJsonSerializer json,
-            ISocketFactory socketFactory)
+            ILogger<UdpServerEntryPoint> logger,
+            IServerApplicationHost appHost)
         {
             _logger = logger;
             _appHost = appHost;
-            _json = json;
-            _socketFactory = socketFactory;
-        }
 
-        /// <inheritdoc />
-        public Task RunAsync()
-        {
-            var udpServer = new UdpServer(_logger, _appHost, _json, _socketFactory);
-
-            try
-            {
-                udpServer.Start(PortNumber);
-
-                _udpServer = udpServer;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to start UDP Server");
-            }
 
-            return Task.CompletedTask;
         }
 
         /// <inheritdoc />
-        public void Dispose()
+        public async Task RunAsync()
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            _udpServer = new UdpServer(_logger, _appHost);
+            _udpServer.Start(PortNumber, _cancellationTokenSource.Token);
         }
 
-        /// <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)
+        /// <inheritdoc />
+        public void Dispose()
         {
-            if (dispose)
+            if (_disposed)
             {
-                if (_udpServer != null)
-                {
-                    _udpServer.Dispose();
-                }
+                return;
             }
+
+            _cancellationTokenSource.Cancel();
+            _udpServer.Dispose();
+
+            _cancellationTokenSource = null;
+            _udpServer = null;
+
+            _disposed = true;
         }
     }
 }
diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index 50233ea48..8a2bc83fb 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -197,7 +197,7 @@ namespace Emby.Server.Implementations.HttpClientManager
             if (File.Exists(responseCachePath)
                 && _fileSystem.GetLastWriteTimeUtc(responseCachePath).Add(cacheLength) > DateTime.UtcNow)
             {
-                var stream = _fileSystem.GetFileStream(responseCachePath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read, true);
+                var stream = new FileStream(responseCachePath, FileMode.Open, FileAccess.Read, FileShare.Read, IODefaults.FileStreamBufferSize, true);
 
                 return new HttpResponseInfo
                 {
@@ -220,7 +220,7 @@ namespace Emby.Server.Implementations.HttpClientManager
                 FileMode.Create,
                 FileAccess.Write,
                 FileShare.None,
-                StreamDefaults.DefaultFileStreamBufferSize,
+                IODefaults.FileStreamBufferSize,
                 true))
             {
                 await response.Content.CopyToAsync(fileStream).ConfigureAwait(false);
diff --git a/Emby.Server.Implementations/HttpServer/FileWriter.cs b/Emby.Server.Implementations/HttpServer/FileWriter.cs
index 1795651fd..d36f230d6 100644
--- a/Emby.Server.Implementations/HttpServer/FileWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/FileWriter.cs
@@ -72,7 +72,7 @@ namespace Emby.Server.Implementations.HttpServer
                 SetRangeValues();
             }
 
-            FileShare = FileShareMode.Read;
+            FileShare = FileShare.Read;
             Cookies = new List<Cookie>();
         }
 
@@ -94,7 +94,7 @@ namespace Emby.Server.Implementations.HttpServer
 
         public List<Cookie> Cookies { get; private set; }
 
-        public FileShareMode FileShare { get; set; }
+        public FileShare FileShare { get; set; }
 
         /// <summary>
         /// Gets the options.
@@ -222,17 +222,17 @@ namespace Emby.Server.Implementations.HttpServer
             }
         }
 
-        public async Task TransmitFile(Stream stream, string path, long offset, long count, FileShareMode fileShareMode, CancellationToken cancellationToken)
+        public async Task TransmitFile(Stream stream, string path, long offset, long count, FileShare fileShare, CancellationToken cancellationToken)
         {
-            var fileOpenOptions = FileOpenOptions.SequentialScan;
+            var fileOptions = FileOptions.SequentialScan;
 
             // use non-async filestream along with read due to https://github.com/dotnet/corefx/issues/6039
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                fileOpenOptions |= FileOpenOptions.Asynchronous;
+                fileOptions |= FileOptions.Asynchronous;
             }
 
-            using (var fs = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, fileShareMode, fileOpenOptions))
+            using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read, fileShare, IODefaults.FileStreamBufferSize, fileOptions))
             {
                 if (offset > 0)
                 {
@@ -245,7 +245,7 @@ namespace Emby.Server.Implementations.HttpServer
                 }
                 else
                 {
-                    await fs.CopyToAsync(stream, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+                    await fs.CopyToAsync(stream, IODefaults.CopyToBufferSize, cancellationToken).ConfigureAwait(false);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index cefcaa835..98a4f140e 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -440,7 +440,7 @@ namespace Emby.Server.Implementations.HttpServer
 
         public Task<object> GetStaticFileResult(IRequest requestContext,
             string path,
-            FileShareMode fileShare = FileShareMode.Read)
+            FileShare fileShare = FileShare.Read)
         {
             if (string.IsNullOrEmpty(path))
             {
@@ -464,7 +464,7 @@ namespace Emby.Server.Implementations.HttpServer
                 throw new ArgumentException("Path can't be empty.", nameof(options));
             }
 
-            if (fileShare != FileShareMode.Read && fileShare != FileShareMode.ReadWrite)
+            if (fileShare != FileShare.Read && fileShare != FileShare.ReadWrite)
             {
                 throw new ArgumentException("FileShare must be either Read or ReadWrite");
             }
@@ -492,9 +492,9 @@ namespace Emby.Server.Implementations.HttpServer
         /// <param name="path">The path.</param>
         /// <param name="fileShare">The file share.</param>
         /// <returns>Stream.</returns>
-        private Stream GetFileStream(string path, FileShareMode fileShare)
+        private Stream GetFileStream(string path, FileShare fileShare)
         {
-            return _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, fileShare);
+            return new FileStream(path, FileMode.Open, FileAccess.Read, fileShare);
         }
 
         public Task<object> GetStaticResult(IRequest requestContext,
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index e27081c45..da5a4d50e 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -17,7 +17,7 @@ using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;
 namespace Emby.Server.Implementations.IO
 {
     /// <summary>
-    /// Class ManagedFileSystem
+    /// Class ManagedFileSystem.
     /// </summary>
     public class ManagedFileSystem : IFileSystem
     {
@@ -80,20 +80,20 @@ namespace Emby.Server.Implementations.IO
 
         public virtual string MakeAbsolutePath(string folderPath, string filePath)
         {
-            if (string.IsNullOrWhiteSpace(filePath)
-                // stream
-                || filePath.Contains("://"))
+            // path is actually a stream
+            if (string.IsNullOrWhiteSpace(filePath) || filePath.Contains("://", StringComparison.Ordinal))
             {
                 return filePath;
             }
 
             if (filePath.Length > 3 && filePath[1] == ':' && filePath[2] == '/')
             {
-                return filePath; // absolute local path
+                // absolute local path
+                return filePath;
             }
 
             // unc path
-            if (filePath.StartsWith("\\\\"))
+            if (filePath.StartsWith("\\\\", StringComparison.Ordinal))
             {
                 return filePath;
             }
@@ -101,13 +101,16 @@ namespace Emby.Server.Implementations.IO
             var firstChar = filePath[0];
             if (firstChar == '/')
             {
-                // For this we don't really know.
+                // for this we don't really know
                 return filePath;
             }
-            if (firstChar == '\\') //relative path
+
+            // relative path
+            if (firstChar == '\\')
             {
                 filePath = filePath.Substring(1);
             }
+
             try
             {
                 return Path.GetFullPath(Path.Combine(folderPath, filePath));
@@ -131,11 +134,7 @@ namespace Emby.Server.Implementations.IO
         /// </summary>
         /// <param name="shortcutPath">The shortcut path.</param>
         /// <param name="target">The target.</param>
-        /// <exception cref="ArgumentNullException">
-        /// shortcutPath
-        /// or
-        /// target
-        /// </exception>
+        /// <exception cref="ArgumentNullException">The shortcutPath or target is null.</exception>
         public virtual void CreateShortcut(string shortcutPath, string target)
         {
             if (string.IsNullOrEmpty(shortcutPath))
@@ -281,11 +280,11 @@ namespace Emby.Server.Implementations.IO
         }
 
         /// <summary>
-        /// Takes a filename and removes invalid characters
+        /// Takes a filename and removes invalid characters.
         /// </summary>
         /// <param name="filename">The filename.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="ArgumentNullException">filename</exception>
+        /// <exception cref="ArgumentNullException">The filename is null.</exception>
         public virtual string GetValidFilename(string filename)
         {
             var builder = new StringBuilder(filename);
@@ -366,90 +365,9 @@ namespace Emby.Server.Implementations.IO
             return GetLastWriteTimeUtc(GetFileSystemInfo(path));
         }
 
-        /// <summary>
-        /// Gets the file stream.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="mode">The mode.</param>
-        /// <param name="access">The access.</param>
-        /// <param name="share">The share.</param>
-        /// <param name="isAsync">if set to <c>true</c> [is asynchronous].</param>
-        /// <returns>FileStream.</returns>
-        public virtual Stream GetFileStream(string path, FileOpenMode mode, FileAccessMode access, FileShareMode share, bool isAsync = false)
-        {
-            if (isAsync)
-            {
-                return GetFileStream(path, mode, access, share, FileOpenOptions.Asynchronous);
-            }
-
-            return GetFileStream(path, mode, access, share, FileOpenOptions.None);
-        }
-
-        public virtual Stream GetFileStream(string path, FileOpenMode mode, FileAccessMode access, FileShareMode share, FileOpenOptions fileOpenOptions)
-            => new FileStream(path, GetFileMode(mode), GetFileAccess(access), GetFileShare(share), 4096, GetFileOptions(fileOpenOptions));
-
-        private static FileOptions GetFileOptions(FileOpenOptions mode)
-        {
-            var val = (int)mode;
-            return (FileOptions)val;
-        }
-
-        private static FileMode GetFileMode(FileOpenMode mode)
-        {
-            switch (mode)
-            {
-                //case FileOpenMode.Append:
-                //    return FileMode.Append;
-                case FileOpenMode.Create:
-                    return FileMode.Create;
-                case FileOpenMode.CreateNew:
-                    return FileMode.CreateNew;
-                case FileOpenMode.Open:
-                    return FileMode.Open;
-                case FileOpenMode.OpenOrCreate:
-                    return FileMode.OpenOrCreate;
-                //case FileOpenMode.Truncate:
-                //    return FileMode.Truncate;
-                default:
-                    throw new Exception("Unrecognized FileOpenMode");
-            }
-        }
-
-        private static FileAccess GetFileAccess(FileAccessMode mode)
-        {
-            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 static FileShare GetFileShare(FileShareMode mode)
-        {
-            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 virtual void SetHidden(string path, bool isHidden)
         {
-            if (OperatingSystem.Id != MediaBrowser.Model.System.OperatingSystemId.Windows)
+            if (OperatingSystem.Id != OperatingSystemId.Windows)
             {
                 return;
             }
@@ -473,7 +391,7 @@ namespace Emby.Server.Implementations.IO
 
         public virtual void SetReadOnly(string path, bool isReadOnly)
         {
-            if (OperatingSystem.Id != MediaBrowser.Model.System.OperatingSystemId.Windows)
+            if (OperatingSystem.Id != OperatingSystemId.Windows)
             {
                 return;
             }
@@ -497,7 +415,7 @@ namespace Emby.Server.Implementations.IO
 
         public virtual void SetAttributes(string path, bool isHidden, bool isReadOnly)
         {
-            if (OperatingSystem.Id != MediaBrowser.Model.System.OperatingSystemId.Windows)
+            if (OperatingSystem.Id != OperatingSystemId.Windows)
             {
                 return;
             }
@@ -780,7 +698,7 @@ namespace Emby.Server.Implementations.IO
 
         public virtual void SetExecutable(string path)
         {
-            if (OperatingSystem.Id == MediaBrowser.Model.System.OperatingSystemId.Darwin)
+            if (OperatingSystem.Id == OperatingSystemId.Darwin)
             {
                 RunProcess("chmod", "+x \"" + path + "\"", Path.GetDirectoryName(path));
             }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index ae3cdece9..d983c1dc6 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -36,7 +36,6 @@ using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Net;
@@ -54,6 +53,9 @@ namespace Emby.Server.Implementations.Library
     /// </summary>
     public class LibraryManager : ILibraryManager
     {
+        private NamingOptions _namingOptions;
+        private string[] _videoFileExtensions;
+
         /// <summary>
         /// Gets or sets the postscan tasks.
         /// </summary>
@@ -708,10 +710,10 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Creates the root media folder
+        /// Creates the root media folder.
         /// </summary>
         /// <returns>AggregateFolder.</returns>
-        /// <exception cref="InvalidOperationException">Cannot create the root folder until plugins have loaded</exception>
+        /// <exception cref="InvalidOperationException">Cannot create the root folder until plugins have loaded.</exception>
         public AggregateFolder CreateRootFolder()
         {
             var rootFolderPath = ConfigurationManager.ApplicationPaths.RootFolderPath;
@@ -822,7 +824,6 @@ namespace Emby.Server.Implementations.Library
         {
             // 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
-
             if (string.IsNullOrEmpty(path))
             {
                 throw new ArgumentNullException(nameof(path));
@@ -842,7 +843,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Person
+        /// Gets the person.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{Person}.</returns>
@@ -852,7 +853,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Studio
+        /// Gets the studio.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{Studio}.</returns>
@@ -877,7 +878,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Genre
+        /// Gets the genre.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{Genre}.</returns>
@@ -887,7 +888,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets the genre.
+        /// Gets the music genre.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>Task{MusicGenre}.</returns>
@@ -897,7 +898,7 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Gets a Year
+        /// Gets the year.
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>Task{Year}.</returns>
@@ -1074,9 +1075,9 @@ namespace Emby.Server.Implementations.Library
 
             var innerProgress = new ActionableProgress<double>();
 
-            innerProgress.RegisterAction(pct => progress.Report(pct * .96));
+            innerProgress.RegisterAction(pct => progress.Report(pct * pct * 0.96));
 
-            // Now validate the entire media library
+            // Validate the entire media library
             await RootFolder.ValidateChildren(innerProgress, cancellationToken, new MetadataRefreshOptions(new DirectoryService(_fileSystem)), recursive: true).ConfigureAwait(false);
 
             progress.Report(96);
@@ -1085,7 +1086,6 @@ namespace Emby.Server.Implementations.Library
 
             innerProgress.RegisterAction(pct => progress.Report(96 + (pct * .04)));
 
-            // Run post-scan tasks
             await RunPostScanTasks(innerProgress, cancellationToken).ConfigureAwait(false);
 
             progress.Report(100);
@@ -1136,7 +1136,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Error running postscan task");
+                    _logger.LogError(ex, "Error running post-scan task");
                 }
 
                 numComplete++;
@@ -2382,7 +2382,7 @@ namespace Emby.Server.Implementations.Library
 
         public int? GetSeasonNumberFromPath(string path)
         {
-            return new SeasonPathParser().Parse(path, true, true).SeasonNumber;
+            return SeasonPathParser.Parse(path, true, true).SeasonNumber;
         }
 
         public bool FillMissingEpisodeNumbersFromPath(Episode episode, bool forceRefresh)
@@ -2509,20 +2509,10 @@ namespace Emby.Server.Implementations.Library
 
         public NamingOptions GetNamingOptions()
         {
-            return GetNamingOptionsInternal();
-        }
-
-        private NamingOptions _namingOptions;
-        private string[] _videoFileExtensions;
-
-        private NamingOptions GetNamingOptionsInternal()
-        {
             if (_namingOptions == null)
             {
-                var options = new NamingOptions();
-
-                _namingOptions = options;
-                _videoFileExtensions = _namingOptions.VideoFileExtensions.ToArray();
+                _namingOptions = new NamingOptions();
+                _videoFileExtensions = _namingOptions.VideoFileExtensions;
             }
 
             return _namingOptions;
@@ -2533,11 +2523,10 @@ namespace Emby.Server.Implementations.Library
             var resolver = new VideoResolver(GetNamingOptions());
 
             var result = resolver.CleanDateTime(name);
-            var cleanName = resolver.CleanString(result.Name);
 
             return new ItemLookupInfo
             {
-                Name = cleanName.Name,
+                Name = resolver.TryCleanString(result.Name, out var newName) ? newName.ToString() : result.Name,
                 Year = result.Year
             };
         }
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 38add1be8..e310065b2 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -146,7 +146,7 @@ namespace Emby.Server.Implementations.Library
             });
         }
 
-        public async Task<List<MediaSourceInfo>> GetPlayackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
+        public async Task<List<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
         {
             var mediaSources = GetStaticMediaSources(item, enablePathSubstitution, user);
 
@@ -308,7 +308,7 @@ namespace Emby.Server.Implementations.Library
                 return await GetLiveStream(liveStreamId, cancellationToken).ConfigureAwait(false);
             }
 
-            var sources = await GetPlayackMediaSources(item, null, false, enablePathSubstitution, cancellationToken).ConfigureAwait(false);
+            var sources = await GetPlaybackMediaSources(item, null, false, enablePathSubstitution, cancellationToken).ConfigureAwait(false);
 
             return sources.FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
         }
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 4a2d210d5..9f858f98d 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -76,7 +76,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         }
 
         /// <summary>
-        /// Determine if the supplied file data points to a music album
+        /// Determine if the supplied file data points to a music album.
         /// </summary>
         public bool IsMusicAlbum(string path, IDirectoryService directoryService, LibraryOptions libraryOptions)
         {
@@ -84,7 +84,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         }
 
         /// <summary>
-        /// Determine if the supplied resolve args should be considered a music album
+        /// Determine if the supplied resolve args should be considered a music album.
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns><c>true</c> if [is music album] [the specified args]; otherwise, <c>false</c>.</returns>
@@ -104,7 +104,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         }
 
         /// <summary>
-        /// Determine if the supplied list contains what we should consider music
+        /// Determine if the supplied list contains what we should consider music.
         /// </summary>
         private bool ContainsMusic(
             IEnumerable<FileSystemMetadata> list,
@@ -118,6 +118,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             var discSubfolderCount = 0;
             var notMultiDisc = false;
 
+            var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
+            var parser = new AlbumParser(namingOptions);
             foreach (var fileSystemInfo in list)
             {
                 if (fileSystemInfo.IsDirectory)
@@ -134,7 +136,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
                         if (hasMusic)
                         {
-                            if (IsMultiDiscFolder(path, libraryOptions))
+                            if (parser.IsMultiPart(path))
                             {
                                 logger.LogDebug("Found multi-disc folder: " + path);
                                 discSubfolderCount++;
@@ -165,15 +167,5 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
             return discSubfolderCount > 0;
         }
-
-        private bool IsMultiDiscFolder(string path, LibraryOptions libraryOptions)
-        {
-            var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
-
-            var parser = new AlbumParser(namingOptions);
-            var result = parser.ParseMultiPart(path);
-
-            return result.IsMultiPart;
-        }
     }
 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 6c7690055..08db168bc 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -21,6 +21,28 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
     /// </summary>
     public class MovieResolver : BaseVideoResolver<Video>, IMultiItemResolver
     {
+        private string[] _validCollectionTypes = new[]
+        {
+                CollectionType.Movies,
+                CollectionType.HomeVideos,
+                CollectionType.MusicVideos,
+                CollectionType.Movies,
+                CollectionType.Photos
+        };
+
+        private readonly IImageProcessor _imageProcessor;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovieResolver"/> class.
+        /// </summary>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="imageProcessor">The image processor.</param>
+        public MovieResolver(ILibraryManager libraryManager, IImageProcessor imageProcessor)
+            : base(libraryManager)
+        {
+            _imageProcessor = imageProcessor;
+        }
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
@@ -144,7 +166,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
             foreach (var video in resolverResult)
             {
-                var firstVideo = video.Files.First();
+                var firstVideo = video.Files[0];
 
                 var videoItem = new T
                 {
@@ -230,7 +252,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     // Owned items will be caught by the plain video resolver
                     if (args.Parent == null)
                     {
-                        //return FindMovie<Video>(args.Path, args.Parent, files, args.DirectoryService, collectionType);
+                        // return FindMovie<Video>(args.Path, args.Parent, files, args.DirectoryService, collectionType);
                         return null;
                     }
 
@@ -275,7 +297,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             {
                 item = ResolveVideo<Movie>(args, true);
             }
-
             else if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
             {
@@ -319,7 +340,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
         {
             if (item is Movie || item is MusicVideo)
             {
-                //we need to only look at the name of this actual item (not parents)
+                // We need to only look at the name of this actual item (not parents)
                 var justName = item.IsInMixedFolder ? Path.GetFileName(item.Path) : Path.GetFileName(item.ContainingFolderPath);
 
                 if (!string.IsNullOrEmpty(justName))
@@ -347,9 +368,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
         }
 
         /// <summary>
-        /// Finds a movie based on a child file system entries
+        /// Finds a movie based on a child file system entries.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
         /// <returns>Movie.</returns>
         private T FindMovie<T>(ItemResolveArgs args, string path, Folder parent, List<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, string collectionType, bool parseName)
             where T : Video, new()
@@ -377,6 +397,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                         Set3DFormat(movie);
                         return movie;
                     }
+
                     if (IsBluRayDirectory(child.FullName, filename, directoryService))
                     {
                         var movie = new T
@@ -407,9 +428,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             // TODO: Allow GetMultiDiscMovie in here
-            const bool supportsMultiVersion = true;
+            const bool SupportsMultiVersion = true;
 
-            var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
+            var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, SupportsMultiVersion, collectionType, parseName) ??
                 new MultiItemResolverResult();
 
             if (result.Items.Count == 1)
@@ -437,7 +458,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
         /// <summary>
         /// Gets the multi disc movie.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
         /// <param name="multiDiscFolders">The folders.</param>
         /// <param name="directoryService">The directory service.</param>
         /// <returns>``0.</returns>
@@ -451,7 +471,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 var subFileEntries = directoryService.GetFileSystemEntries(i);
 
                 var subfolders = subFileEntries
-                 .Where(e => e.IsDirectory)
+                    .Where(e => e.IsDirectory)
                     .ToList();
 
                 if (subfolders.Any(s => IsDvdDirectory(s.FullName, s.Name, directoryService)))
@@ -459,6 +479,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     videoTypes.Add(VideoType.Dvd);
                     return true;
                 }
+
                 if (subfolders.Any(s => IsBluRayDirectory(s.FullName, s.Name, directoryService)))
                 {
                     videoTypes.Add(VideoType.BluRay);
@@ -476,7 +497,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 }
 
                 return false;
-
             }).OrderBy(i => i).ToList();
 
             // If different video types were found, don't allow this
@@ -491,11 +511,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
-            var resolver = new StackResolver(namingOptions);
 
-            var result = resolver.ResolveDirectories(folderPaths);
+            var result = new StackResolver(namingOptions).ResolveDirectories(folderPaths).ToList();
 
-            if (result.Stacks.Count != 1)
+            if (result.Count != 1)
             {
                 return null;
             }
@@ -508,7 +527,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
                 VideoType = videoTypes[0],
 
-                Name = result.Stacks[0].Name
+                Name = result[0].Name
             };
 
             SetIsoType(returnVideo);
@@ -516,15 +535,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             return returnVideo;
         }
 
-        private string[] ValidCollectionTypes = new[]
-        {
-                CollectionType.Movies,
-                CollectionType.HomeVideos,
-                CollectionType.MusicVideos,
-                CollectionType.Movies,
-                CollectionType.Photos
-        };
-
         private bool IsInvalid(Folder parent, string collectionType)
         {
             if (parent != null)
@@ -540,20 +550,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 return false;
             }
 
-            return !ValidCollectionTypes.Contains(collectionType, StringComparer.OrdinalIgnoreCase);
-        }
-
-        private IImageProcessor _imageProcessor;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MovieResolver"/> class.
-        /// </summary>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="imageProcessor">The image processor.</param>
-        public MovieResolver(ILibraryManager libraryManager, IImageProcessor imageProcessor)
-            : base(libraryManager)
-        {
-            _imageProcessor = imageProcessor;
+            return !_validCollectionTypes.Contains(collectionType, StringComparer.OrdinalIgnoreCase);
         }
     }
 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index 3b9e48d97..3e88c0287 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -9,17 +9,12 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.Library.Resolvers.TV
 {
     /// <summary>
-    /// Class SeasonResolver
+    /// Class SeasonResolver.
     /// </summary>
     public class SeasonResolver : FolderResolver<Season>
     {
-        /// <summary>
-        /// The _config
-        /// </summary>
         private readonly IServerConfigurationManager _config;
-
         private readonly ILibraryManager _libraryManager;
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
         private readonly ILocalizationManager _localization;
         private readonly ILogger _logger;
 
@@ -45,14 +40,13 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// <returns>Season.</returns>
         protected override Season Resolve(ItemResolveArgs args)
         {
-            if (args.Parent is Series && args.IsDirectory)
+            if (args.Parent is Series series && args.IsDirectory)
             {
                 var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
-                var series = ((Series)args.Parent);
 
                 var path = args.Path;
 
-                var seasonParserResult = new SeasonPathParser().Parse(path, true, true);
+                var seasonParserResult = SeasonPathParser.Parse(path, true, true);
 
                 var season = new Season
                 {
@@ -74,7 +68,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                     {
                         if (episodeInfo.EpisodeNumber.HasValue && episodeInfo.SeasonNumber.HasValue)
                         {
-                            _logger.LogDebug("Found folder underneath series with episode number: {0}. Season {1}. Episode {2}",
+                            _logger.LogDebug(
+                                "Found folder underneath series with episode number: {0}. Season {1}. Episode {2}",
                                 path,
                                 episodeInfo.SeasonNumber.Value,
                                 episodeInfo.EpisodeNumber.Value);
@@ -90,7 +85,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                     season.Name = seasonNumber == 0 ?
                         args.LibraryOptions.SeasonZeroDisplayName :
-                        string.Format(_localization.GetLocalizedString("NameSeasonNumber"), seasonNumber.ToString(UsCulture), args.GetLibraryOptions().PreferredMetadataLanguage);
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            _localization.GetLocalizedString("NameSeasonNumber"),
+                            seasonNumber,
+                            args.GetLibraryOptions().PreferredMetadataLanguage);
 
                 }
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index e39d85bc9..4ee30b475 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -203,7 +203,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// <returns><c>true</c> if [is season folder] [the specified path]; otherwise, <c>false</c>.</returns>
         private static bool IsSeasonFolder(string path, bool isTvContentType, ILibraryManager libraryManager)
         {
-            var seasonNumber = new SeasonPathParser().Parse(path, isTvContentType, isTvContentType).SeasonNumber;
+            var seasonNumber = SeasonPathParser.Parse(path, isTvContentType, isTvContentType).SeasonNumber;
 
             return seasonNumber.HasValue;
         }
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 656eeb145..6e203f894 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -291,10 +291,11 @@ namespace Emby.Server.Implementations.Library
                     && authenticationProvider != null
                     && !(authenticationProvider is DefaultAuthenticationProvider))
                 {
-                    // We should trust the user that the authprovider says, not what was typed
+                    // Trust the username returned by the authentication provider
                     username = updatedUsername;
 
-                    // Search the database for the user again; the authprovider might have created it
+                    // Search the database for the user again
+                    // the authentication provider might have created it
                     user = Users
                         .FirstOrDefault(i => string.Equals(username, i.Name, StringComparison.OrdinalIgnoreCase));
 
@@ -667,7 +668,7 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentException("Invalid username", nameof(newName));
             }
 
-            if (user.Name.Equals(newName, StringComparison.OrdinalIgnoreCase))
+            if (user.Name.Equals(newName, StringComparison.Ordinal))
             {
                 throw new ArgumentException("The new and old names must be different.");
             }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
index 84e8c31f9..161cf6051 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
@@ -15,14 +15,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
     {
         private readonly ILogger _logger;
         private readonly IHttpClient _httpClient;
-        private readonly IFileSystem _fileSystem;
         private readonly IStreamHelper _streamHelper;
 
-        public DirectRecorder(ILogger logger, IHttpClient httpClient, IFileSystem fileSystem, IStreamHelper streamHelper)
+        public DirectRecorder(ILogger logger, IHttpClient httpClient, IStreamHelper streamHelper)
         {
             _logger = logger;
             _httpClient = httpClient;
-            _fileSystem = fileSystem;
             _streamHelper = streamHelper;
         }
 
@@ -45,7 +43,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             Directory.CreateDirectory(Path.GetDirectoryName(targetFile));
 
-            using (var output = _fileSystem.GetFileStream(targetFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+            using (var output = new FileStream(targetFile, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
                 onStarted();
 
@@ -81,7 +79,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 Directory.CreateDirectory(Path.GetDirectoryName(targetFile));
 
-                using (var output = _fileSystem.GetFileStream(targetFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+                using (var output = new FileStream(targetFile, FileMode.Create, FileAccess.Write, FileShare.Read))
                 {
                     onStarted();
 
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 3b6bfce6a..4ac48e537 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1,3 +1,6 @@
+#pragma warning disable SA1600
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -40,6 +43,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 {
     public class EmbyTV : ILiveTvService, ISupportsDirectStreamProvider, ISupportsNewTimerIds, IDisposable
     {
+        public const string DateAddedFormat = "yyyy-MM-dd HH:mm:ss";
+
+        private const int TunerDiscoveryDurationMs = 3000;
+
         private readonly IServerApplicationHost _appHost;
         private readonly ILogger _logger;
         private readonly IHttpClient _httpClient;
@@ -57,19 +64,21 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         private readonly IProviderManager _providerManager;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IProcessFactory _processFactory;
-        private IMediaSourceManager _mediaSourceManager;
-
-        public static EmbyTV Current;
-
-        public event EventHandler<GenericEventArgs<TimerInfo>> TimerCreated;
-        public event EventHandler<GenericEventArgs<string>> TimerCancelled;
+        private readonly IMediaSourceManager _mediaSourceManager;
+        private readonly IStreamHelper _streamHelper;
 
         private readonly ConcurrentDictionary<string, ActiveRecordingInfo> _activeRecordings =
             new ConcurrentDictionary<string, ActiveRecordingInfo>(StringComparer.OrdinalIgnoreCase);
 
-        private readonly IStreamHelper _streamHelper;
+        private readonly ConcurrentDictionary<string, EpgChannelData> _epgChannels =
+            new ConcurrentDictionary<string, EpgChannelData>(StringComparer.OrdinalIgnoreCase);
+
+        private readonly SemaphoreSlim _recordingDeleteSemaphore = new SemaphoreSlim(1, 1);
 
-        public EmbyTV(IServerApplicationHost appHost,
+        private bool _disposed = false;
+
+        public EmbyTV(
+            IServerApplicationHost appHost,
             IStreamHelper streamHelper,
             IMediaSourceManager mediaSourceManager,
             ILogger logger,
@@ -103,12 +112,40 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             _seriesTimerProvider = new SeriesTimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "seriestimers.json"));
             _timerProvider = new TimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "timers.json"));
-            _timerProvider.TimerFired += _timerProvider_TimerFired;
+            _timerProvider.TimerFired += OnTimerProviderTimerFired;
 
-            _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
+            _config.NamedConfigurationUpdated += OnNamedConfigurationUpdated;
         }
 
-        private void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
+        public event EventHandler<GenericEventArgs<TimerInfo>> TimerCreated;
+
+        public event EventHandler<GenericEventArgs<string>> TimerCancelled;
+
+        public static EmbyTV Current { get; private set; }
+
+        /// <inheritdoc />
+        public string Name => "Emby";
+
+        public string DataPath => Path.Combine(_config.CommonApplicationPaths.DataPath, "livetv");
+
+        /// <inheritdoc />
+        public string HomePageUrl => "https://github.com/jellyfin/jellyfin";
+
+        private string DefaultRecordingPath => Path.Combine(DataPath, "recordings");
+
+        private string RecordingPath
+        {
+            get
+            {
+                var path = GetConfiguration().RecordingPath;
+
+                return string.IsNullOrWhiteSpace(path)
+                    ? DefaultRecordingPath
+                    : path;
+            }
+        }
+
+        private void OnNamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
         {
             if (string.Equals(e.Key, "livetv", StringComparison.OrdinalIgnoreCase))
             {
@@ -116,11 +153,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public async Task Start()
+        public Task Start()
         {
             _timerProvider.RestartTimers();
 
-            await CreateRecordingFolders().ConfigureAwait(false);
+            return CreateRecordingFolders();
         }
 
         private async void OnRecordingFoldersChanged()
@@ -132,8 +169,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             try
             {
-                var recordingFolders = GetRecordingFolders();
-
+                var recordingFolders = GetRecordingFolders().ToArray();
                 var virtualFolders = _libraryManager.GetVirtualFolders()
                     .ToList();
 
@@ -241,26 +277,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public string Name => "Emby";
-
-        public string DataPath => Path.Combine(_config.CommonApplicationPaths.DataPath, "livetv");
-
-        private string DefaultRecordingPath => Path.Combine(DataPath, "recordings");
-
-        private string RecordingPath
-        {
-            get
-            {
-                var path = GetConfiguration().RecordingPath;
-
-                return string.IsNullOrWhiteSpace(path)
-                    ? DefaultRecordingPath
-                    : path;
-            }
-        }
-
-        public string HomePageUrl => "https://github.com/jellyfin/jellyfin";
-
         public async Task RefreshSeriesTimers(CancellationToken cancellationToken)
         {
             var seriesTimers = await GetSeriesTimersAsync(cancellationToken).ConfigureAwait(false);
@@ -339,7 +355,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (NotSupportedException)
                     {
-
                     }
                     catch (Exception ex)
                     {
@@ -351,7 +366,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return list;
         }
 
-        private async Task AddMetadata(IListingsProvider provider, ListingsProviderInfo info, List<ChannelInfo> tunerChannels, bool enableCache, CancellationToken cancellationToken)
+        private async Task AddMetadata(
+            IListingsProvider provider,
+            ListingsProviderInfo info,
+            IEnumerable<ChannelInfo> tunerChannels,
+            bool enableCache,
+            CancellationToken cancellationToken)
         {
             var epgChannels = await GetEpgChannels(provider, info, enableCache, cancellationToken).ConfigureAwait(false);
 
@@ -363,8 +383,9 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     if (!string.IsNullOrWhiteSpace(epgChannel.Name))
                     {
-                        //tunerChannel.Name = epgChannel.Name;
+                        // tunerChannel.Name = epgChannel.Name;
                     }
+
                     if (!string.IsNullOrWhiteSpace(epgChannel.ImageUrl))
                     {
                         tunerChannel.ImageUrl = epgChannel.ImageUrl;
@@ -373,10 +394,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private readonly ConcurrentDictionary<string, EpgChannelData> _epgChannels =
-            new ConcurrentDictionary<string, EpgChannelData>(StringComparer.OrdinalIgnoreCase);
-
-        private async Task<EpgChannelData> GetEpgChannels(IListingsProvider provider, ListingsProviderInfo info, bool enableCache, CancellationToken cancellationToken)
+        private async Task<EpgChannelData> GetEpgChannels(
+            IListingsProvider provider,
+            ListingsProviderInfo info,
+            bool enableCache,
+            CancellationToken cancellationToken)
         {
             if (!enableCache || !_epgChannels.TryGetValue(info.Id, out var result))
             {
@@ -394,59 +416,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return result;
         }
 
-        private class EpgChannelData
-        {
-            public EpgChannelData(List<ChannelInfo> channels)
-            {
-                ChannelsById = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
-                ChannelsByNumber = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
-                ChannelsByName = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
-
-                foreach (var channel in channels)
-                {
-                    ChannelsById[channel.Id] = channel;
-
-                    if (!string.IsNullOrEmpty(channel.Number))
-                    {
-                        ChannelsByNumber[channel.Number] = channel;
-                    }
-
-                    var normalizedName = NormalizeName(channel.Name ?? string.Empty);
-                    if (!string.IsNullOrWhiteSpace(normalizedName))
-                    {
-                        ChannelsByName[normalizedName] = channel;
-                    }
-                }
-            }
-
-            private Dictionary<string, ChannelInfo> ChannelsById { get; set; }
-            private Dictionary<string, ChannelInfo> ChannelsByNumber { get; set; }
-            private Dictionary<string, ChannelInfo> ChannelsByName { get; set; }
-
-            public ChannelInfo GetChannelById(string id)
-            {
-                ChannelInfo result = null;
-
-                ChannelsById.TryGetValue(id, out result);
-
-                return result;
-            }
-
-            public ChannelInfo GetChannelByNumber(string number)
-            {
-                ChannelsByNumber.TryGetValue(number, out var result);
-
-                return result;
-            }
-
-            public ChannelInfo GetChannelByName(string name)
-            {
-                ChannelsByName.TryGetValue(name, out var result);
-
-                return result;
-            }
-        }
-
         private async Task<ChannelInfo> GetEpgChannelFromTunerChannel(IListingsProvider provider, ListingsProviderInfo info, ChannelInfo tunerChannel, CancellationToken cancellationToken)
         {
             var epgChannels = await GetEpgChannels(provider, info, true, cancellationToken).ConfigureAwait(false);
@@ -458,11 +427,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             foreach (NameValuePair mapping in mappings)
             {
-                if (StringHelper.EqualsIgnoreCase(mapping.Name, channelId))
+                if (string.Equals(mapping.Name, channelId, StringComparison.OrdinalIgnoreCase))
                 {
                     return mapping.Value;
                 }
             }
+
             return channelId;
         }
 
@@ -476,7 +446,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return GetEpgChannelFromTunerChannel(info.ChannelMappings, tunerChannel, epgChannels);
         }
 
-        private ChannelInfo GetEpgChannelFromTunerChannel(NameValuePair[] mappings, ChannelInfo tunerChannel, EpgChannelData epgChannelData)
+        private ChannelInfo GetEpgChannelFromTunerChannel(
+            NameValuePair[] mappings,
+            ChannelInfo tunerChannel,
+            EpgChannelData epgChannelData)
         {
             if (!string.IsNullOrWhiteSpace(tunerChannel.Id))
             {
@@ -537,7 +510,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (!string.IsNullOrWhiteSpace(tunerChannel.Name))
             {
-                var normalizedName = NormalizeName(tunerChannel.Name);
+                var normalizedName = EpgChannelData.NormalizeName(tunerChannel.Name);
 
                 var channel = epgChannelData.GetChannelByName(normalizedName);
 
@@ -550,11 +523,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return null;
         }
 
-        private static string NormalizeName(string value)
-        {
-            return value.Replace(" ", string.Empty).Replace("-", string.Empty);
-        }
-
         public async Task<List<ChannelInfo>> GetChannelsForListingsProvider(ListingsProviderInfo listingsProvider, CancellationToken cancellationToken)
         {
             var list = new List<ChannelInfo>();
@@ -600,6 +568,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 _seriesTimerProvider.Delete(remove);
             }
+
             return Task.CompletedTask;
         }
 
@@ -689,6 +658,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 programInfo = GetProgramInfoFromCache(timer);
             }
+
             if (programInfo == null)
             {
                 _logger.LogInformation("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
@@ -703,10 +673,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             timer.IsManual = true;
             _timerProvider.Add(timer);
 
-            if (TimerCreated != null)
-            {
-                TimerCreated(this, new GenericEventArgs<TimerInfo>(timer));
-            }
+            TimerCreated?.Invoke(this, new GenericEventArgs<TimerInfo>(timer));
 
             return Task.FromResult(timer.Id);
         }
@@ -800,7 +767,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
 
             // Only update if not currently active
-            if (!_activeRecordings.TryGetValue(updatedTimer.Id, out var activeRecordingInfo))
+            if (!_activeRecordings.TryGetValue(updatedTimer.Id, out _))
             {
                 existingTimer.PrePaddingSeconds = updatedTimer.PrePaddingSeconds;
                 existingTimer.PostPaddingSeconds = updatedTimer.PostPaddingSeconds;
@@ -846,6 +813,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 return info.Path;
             }
+
             return null;
         }
 
@@ -870,9 +838,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     {
                         return null;
                     }
+
                     return recording;
                 }
             }
+
             return null;
         }
 
@@ -1061,13 +1031,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             mediaSource.Id = Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture) + "_" + mediaSource.Id;
 
-            //if (mediaSource.DateLiveStreamOpened.HasValue && enableStreamSharing)
-            //{
-            //    var ticks = (DateTime.UtcNow - mediaSource.DateLiveStreamOpened.Value).Ticks - TimeSpan.FromSeconds(10).Ticks;
-            //    ticks = Math.Max(0, ticks);
-            //    mediaSource.Path += "?t=" + ticks.ToString(CultureInfo.InvariantCulture) + "&s=" + mediaSource.DateLiveStreamOpened.Value.Ticks.ToString(CultureInfo.InvariantCulture);
-            //}
-
             return mediaSource;
         }
 
@@ -1091,7 +1054,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (NotImplementedException)
                 {
-
                 }
             }
 
@@ -1142,7 +1104,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return Task.CompletedTask;
         }
 
-        async void _timerProvider_TimerFired(object sender, GenericEventArgs<TimerInfo> e)
+        private async void OnTimerProviderTimerFired(object sender, GenericEventArgs<TimerInfo> e)
         {
             var timer = e.Argument;
 
@@ -1177,7 +1139,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (OperationCanceledException)
             {
-
             }
             catch (Exception ex)
             {
@@ -1221,7 +1182,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 if (timer.SeasonNumber.HasValue)
                 {
-                    folderName = string.Format("Season {0}", timer.SeasonNumber.Value.ToString(CultureInfo.InvariantCulture));
+                    folderName = string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Season {0}",
+                        timer.SeasonNumber.Value);
                     recordPath = Path.Combine(recordPath, folderName);
                 }
             }
@@ -1275,6 +1239,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     recordPath = Path.Combine(recordPath, "Sports");
                 }
+
                 recordPath = Path.Combine(recordPath, _fileSystem.GetValidFilename(timer.Name).Trim());
             }
             else
@@ -1283,6 +1248,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     recordPath = Path.Combine(recordPath, "Other");
                 }
+
                 recordPath = Path.Combine(recordPath, _fileSystem.GetValidFilename(timer.Name).Trim());
             }
 
@@ -1304,6 +1270,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 programInfo = GetProgramInfoFromCache(timer);
             }
+
             if (programInfo == null)
             {
                 _logger.LogInformation("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
@@ -1315,9 +1282,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 CopyProgramInfoToTimerInfo(programInfo, timer);
             }
 
-            string seriesPath = null;
             var remoteMetadata = await FetchInternetMetadata(timer, CancellationToken.None).ConfigureAwait(false);
-            var recordPath = GetRecordingPath(timer, remoteMetadata, out seriesPath);
+            var recordPath = GetRecordingPath(timer, remoteMetadata, out string seriesPath);
             var recordingStatus = RecordingStatus.New;
 
             string liveStreamId = null;
@@ -1326,19 +1292,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             try
             {
-                var allMediaSources = await _mediaSourceManager.GetPlayackMediaSources(channelItem, null, true, false, CancellationToken.None).ConfigureAwait(false);
+                var allMediaSources = await _mediaSourceManager.GetPlaybackMediaSources(channelItem, null, true, false, CancellationToken.None).ConfigureAwait(false);
 
                 var mediaStreamInfo = allMediaSources[0];
                 IDirectStreamProvider directStreamProvider = null;
 
                 if (mediaStreamInfo.RequiresOpening)
                 {
-                    var liveStreamResponse = await _mediaSourceManager.OpenLiveStreamInternal(new LiveStreamRequest
-                    {
-                        ItemId = channelItem.Id,
-                        OpenToken = mediaStreamInfo.OpenToken
-
-                    }, CancellationToken.None).ConfigureAwait(false);
+                    var liveStreamResponse = await _mediaSourceManager.OpenLiveStreamInternal(
+                        new LiveStreamRequest
+                        {
+                            ItemId = channelItem.Id,
+                            OpenToken = mediaStreamInfo.OpenToken
+                        },
+                        CancellationToken.None).ConfigureAwait(false);
 
                     mediaStreamInfo = liveStreamResponse.Item1.MediaSource;
                     liveStreamId = mediaStreamInfo.LiveStreamId;
@@ -1412,12 +1379,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (recordingStatus != RecordingStatus.Completed && DateTime.UtcNow < timer.EndDate && timer.RetryCount < 10)
             {
-                const int retryIntervalSeconds = 60;
-                _logger.LogInformation("Retrying recording in {0} seconds.", retryIntervalSeconds);
+                const int RetryIntervalSeconds = 60;
+                _logger.LogInformation("Retrying recording in {0} seconds.", RetryIntervalSeconds);
 
                 timer.Status = RecordingStatus.New;
                 timer.PrePaddingSeconds = 0;
-                timer.StartDate = DateTime.UtcNow.AddSeconds(retryIntervalSeconds);
+                timer.StartDate = DateTime.UtcNow.AddSeconds(RetryIntervalSeconds);
                 timer.RetryCount++;
                 _timerProvider.AddOrUpdate(timer);
             }
@@ -1538,6 +1505,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 return;
             }
+
             if (string.IsNullOrWhiteSpace(seriesPath))
             {
                 return;
@@ -1576,21 +1544,21 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 DeleteLibraryItemsForTimers(timersToDelete);
 
                 var librarySeries = _libraryManager.FindByPath(seriesPath, true) as Folder;
-
                 if (librarySeries == null)
                 {
                     return;
                 }
 
-                var episodesToDelete = librarySeries.GetItemList(new InternalItemsQuery
-                {
-                    OrderBy = new[] { (ItemSortBy.DateCreated, SortOrder.Descending) },
-                    IsVirtualItem = false,
-                    IsFolder = false,
-                    Recursive = true,
-                    DtoOptions = new DtoOptions(true)
+                var episodesToDelete = librarySeries.GetItemList(
+                    new InternalItemsQuery
+                    {
+                        OrderBy = new[] { (ItemSortBy.DateCreated, SortOrder.Descending) },
+                        IsVirtualItem = false,
+                        IsFolder = false,
+                        Recursive = true,
+                        DtoOptions = new DtoOptions(true)
 
-                })
+                    })
                     .Where(i => i.IsFileProtocol && File.Exists(i.Path))
                     .Skip(seriesTimer.KeepUpTo - 1)
                     .ToList();
@@ -1599,11 +1567,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     try
                     {
-                        _libraryManager.DeleteItem(item, new DeleteOptions
-                        {
-                            DeleteFileLocation = true
-
-                        }, true);
+                        _libraryManager.DeleteItem(
+                            item,
+                            new DeleteOptions
+                            {
+                                DeleteFileLocation = true
+                            },
+                            true);
                     }
                     catch (Exception ex)
                     {
@@ -1617,7 +1587,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private readonly SemaphoreSlim _recordingDeleteSemaphore = new SemaphoreSlim(1, 1);
         private void DeleteLibraryItemsForTimers(List<TimerInfo> timers)
         {
             foreach (var timer in timers)
@@ -1644,22 +1613,17 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (libraryItem != null)
             {
-                _libraryManager.DeleteItem(libraryItem, new DeleteOptions
-                {
-                    DeleteFileLocation = true
-
-                }, true);
+                _libraryManager.DeleteItem(
+                    libraryItem,
+                    new DeleteOptions
+                    {
+                        DeleteFileLocation = true
+                    },
+                    true);
             }
-            else
+            else if (File.Exists(timer.RecordingPath))
             {
-                try
-                {
-                    _fileSystem.DeleteFile(timer.RecordingPath);
-                }
-                catch (IOException)
-                {
-
-                }
+                _fileSystem.DeleteFile(timer.RecordingPath);
             }
 
             _timerProvider.Delete(timer);
@@ -1690,26 +1654,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 return true;
             }
 
-            var hasRecordingAtPath = _activeRecordings
+            return _activeRecordings
                 .Values
                 .ToList()
                 .Any(i => string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase) && !string.Equals(i.Timer.Id, timerId, StringComparison.OrdinalIgnoreCase));
-
-            if (hasRecordingAtPath)
-            {
-                return true;
-            }
-            return false;
         }
 
         private IRecorder GetRecorder(MediaSourceInfo mediaSource)
         {
             if (mediaSource.RequiresLooping || !(mediaSource.Container ?? string.Empty).EndsWith("ts", StringComparison.OrdinalIgnoreCase) || (mediaSource.Protocol != MediaProtocol.File && mediaSource.Protocol != MediaProtocol.Http))
             {
-                return new EncodedRecorder(_logger, _fileSystem, _mediaEncoder, _config.ApplicationPaths, _jsonSerializer, _processFactory, _config);
+                return new EncodedRecorder(_logger, _mediaEncoder, _config.ApplicationPaths, _jsonSerializer, _processFactory, _config);
             }
 
-            return new DirectRecorder(_logger, _httpClient, _fileSystem, _streamHelper);
+            return new DirectRecorder(_logger, _httpClient, _streamHelper);
         }
 
         private void OnSuccessfulRecording(TimerInfo timer, string path)
@@ -1756,17 +1714,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private void Process_Exited(object sender, EventArgs e)
         {
-            var process = (IProcess)sender;
-            try
+            using (var process = (IProcess)sender)
             {
                 _logger.LogInformation("Recording post-processing script completed with exit code {ExitCode}", process.ExitCode);
-            }
-            catch
-            {
 
+                process.Dispose();
             }
-
-            process.Dispose();
         }
 
         private async Task SaveRecordingImage(string recordingPath, LiveTvProgram program, ItemImageInfo image)
@@ -1776,44 +1729,16 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 image = await _libraryManager.ConvertImageToLocal(program, image, 0).ConfigureAwait(false);
             }
 
-            string imageSaveFilenameWithoutExtension = null;
-
-            switch (image.Type)
+            string imageSaveFilenameWithoutExtension = image.Type switch
             {
-                case ImageType.Primary:
-
-                    if (program.IsSeries)
-                    {
-                        imageSaveFilenameWithoutExtension = Path.GetFileNameWithoutExtension(recordingPath) + "-thumb";
-                    }
-                    else
-                    {
-                        imageSaveFilenameWithoutExtension = "poster";
-                    }
-
-                    break;
-                case ImageType.Logo:
-                    imageSaveFilenameWithoutExtension = "logo";
-                    break;
-                case ImageType.Thumb:
-                    if (program.IsSeries)
-                    {
-                        imageSaveFilenameWithoutExtension = Path.GetFileNameWithoutExtension(recordingPath) + "-thumb";
-                    }
-                    else
-                    {
-                        imageSaveFilenameWithoutExtension = "landscape";
-                    }
-
-                    break;
-                case ImageType.Backdrop:
-                    imageSaveFilenameWithoutExtension = "fanart";
-                    break;
-                default:
-                    break;
-            }
+                ImageType.Primary => program.IsSeries ? Path.GetFileNameWithoutExtension(recordingPath) + "-thumb" : "poster",
+                ImageType.Logo => "logo",
+                ImageType.Thumb => program.IsSeries ? Path.GetFileNameWithoutExtension(recordingPath) + "-thumb" : "landscape",
+                ImageType.Backdrop => "fanart",
+                _ => null
+            };
 
-            if (string.IsNullOrWhiteSpace(imageSaveFilenameWithoutExtension))
+            if (imageSaveFilenameWithoutExtension == null)
             {
                 return;
             }
@@ -1897,7 +1822,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     Limit = 1,
                     ExternalId = timer.ProgramId,
                     DtoOptions = new DtoOptions(true)
-
                 }).FirstOrDefault() as LiveTvProgram;
 
                 // dummy this up
@@ -1921,11 +1845,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     program.AddGenre("Sports");
                 }
+
                 if (timer.IsKids)
                 {
                     program.AddGenre("Kids");
                     program.AddGenre("Children");
                 }
+
                 if (timer.IsNews)
                 {
                     program.AddGenre("News");
@@ -1962,7 +1888,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 return;
             }
 
-            using (var stream = _fileSystem.GetFileStream(nfoPath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+            using (var stream = new FileStream(nfoPath, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
                 var settings = new XmlWriterSettings
                 {
@@ -1980,14 +1906,17 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     {
                         writer.WriteElementString("id", id);
                     }
+
                     if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out id))
                     {
                         writer.WriteElementString("imdb_id", id);
                     }
+
                     if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out id))
                     {
                         writer.WriteElementString("tmdbid", id);
                     }
+
                     if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Zap2It.ToString(), out id))
                     {
                         writer.WriteElementString("zap2itid", id);
@@ -2014,7 +1943,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public const string DateAddedFormat = "yyyy-MM-dd HH:mm:ss";
         private void SaveVideoNfo(TimerInfo timer, string recordingPath, BaseItem item, bool lockData)
         {
             var nfoPath = Path.ChangeExtension(recordingPath, ".nfo");
@@ -2024,7 +1952,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 return;
             }
 
-            using (var stream = _fileSystem.GetFileStream(nfoPath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+            using (var stream = new FileStream(nfoPath, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
                 var settings = new XmlWriterSettings
                 {
@@ -2056,7 +1984,9 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         {
                             var formatString = options.ReleaseDateFormat;
 
-                            writer.WriteElementString("aired", premiereDate.Value.ToLocalTime().ToString(formatString));
+                            writer.WriteElementString(
+                                "aired",
+                                premiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                         }
 
                         if (item.IndexNumber.HasValue)
@@ -2087,12 +2017,18 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         {
                             var formatString = options.ReleaseDateFormat;
 
-                            writer.WriteElementString("premiered", item.PremiereDate.Value.ToLocalTime().ToString(formatString));
-                            writer.WriteElementString("releasedate", item.PremiereDate.Value.ToLocalTime().ToString(formatString));
+                            writer.WriteElementString(
+                                "premiered",
+                                item.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
+                            writer.WriteElementString(
+                                "releasedate",
+                                item.PremiereDate.Value.ToLocalTime().ToString(formatString, CultureInfo.InvariantCulture));
                         }
                     }
 
-                    writer.WriteElementString("dateadded", DateTime.UtcNow.ToLocalTime().ToString(DateAddedFormat));
+                    writer.WriteElementString(
+                        "dateadded",
+                        DateTime.UtcNow.ToLocalTime().ToString(DateAddedFormat, CultureInfo.InvariantCulture));
 
                     if (item.ProductionYear.HasValue)
                     {
@@ -2106,7 +2042,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                     var overview = (item.Overview ?? string.Empty)
                         .StripHtml()
-                        .Replace("&quot;", "'");
+                        .Replace("&quot;", "'", StringComparison.Ordinal);
 
                     writer.WriteElementString("plot", overview);
 
@@ -2214,17 +2150,8 @@ 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))
-            {
-                genres.Add(genre);
-            }
-        }
+            => string.Equals(person.Type, type, StringComparison.OrdinalIgnoreCase)
+                || string.Equals(person.Role, type, StringComparison.OrdinalIgnoreCase);
 
         private LiveTvProgram GetProgramInfoFromCache(string programId)
         {
@@ -2283,25 +2210,19 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 return false;
             }
 
-            if (!seriesTimer.RecordAnyTime)
+            if (!seriesTimer.RecordAnyTime
+                && Math.Abs(seriesTimer.StartDate.TimeOfDay.Ticks - timer.StartDate.TimeOfDay.Ticks) >= TimeSpan.FromMinutes(10).Ticks)
             {
-                if (Math.Abs(seriesTimer.StartDate.TimeOfDay.Ticks - timer.StartDate.TimeOfDay.Ticks) >= TimeSpan.FromMinutes(10).Ticks)
-                {
-                    return true;
-                }
+                return true;
             }
 
-            //if (!seriesTimer.Days.Contains(timer.StartDate.ToLocalTime().DayOfWeek))
-            //{
-            //    return true;
-            //}
-
             if (seriesTimer.RecordNewOnly && timer.IsRepeat)
             {
                 return true;
             }
 
-            if (!seriesTimer.RecordAnyChannel && !string.Equals(timer.ChannelId, seriesTimer.ChannelId, StringComparison.OrdinalIgnoreCase))
+            if (!seriesTimer.RecordAnyChannel
+                && !string.Equals(timer.ChannelId, seriesTimer.ChannelId, StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }
@@ -2346,7 +2267,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             var allTimers = GetTimersForSeries(seriesTimer).ToList();
 
-
             var enabledTimersForSeries = new List<TimerInfo>();
             foreach (var timer in allTimers)
             {
@@ -2369,10 +2289,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     {
                         enabledTimersForSeries.Add(timer);
                     }
+
                     _timerProvider.Add(timer);
 
                     TimerCreated?.Invoke(this, new GenericEventArgs<TimerInfo>(timer));
                 }
+
                 // Only update if not currently active - test both new timer and existing in case Id's are different
                 // Id's could be different if the timer was created manually prior to series timer creation
                 else if (!_activeRecordings.TryGetValue(timer.Id, out _) && !_activeRecordings.TryGetValue(existingTimer.Id, out _))
@@ -2508,13 +2430,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 if (!tempChannelCache.TryGetValue(parent.ChannelId, out LiveTvChannel channel))
                 {
-                    channel = _libraryManager.GetItemList(new InternalItemsQuery
-                    {
-                        IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
-                        ItemIds = new[] { parent.ChannelId },
-                        DtoOptions = new DtoOptions()
-
-                    }).Cast<LiveTvChannel>().FirstOrDefault();
+                    channel = _libraryManager.GetItemList(
+                        new InternalItemsQuery
+                        {
+                            IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
+                            ItemIds = new[] { parent.ChannelId },
+                            DtoOptions = new DtoOptions()
+                        }).FirstOrDefault() as LiveTvChannel;
 
                     if (channel != null && !string.IsNullOrWhiteSpace(channel.ExternalId))
                     {
@@ -2567,13 +2489,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 if (!tempChannelCache.TryGetValue(programInfo.ChannelId, out LiveTvChannel channel))
                 {
-                    channel = _libraryManager.GetItemList(new InternalItemsQuery
-                    {
-                        IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
-                        ItemIds = new[] { programInfo.ChannelId },
-                        DtoOptions = new DtoOptions()
-
-                    }).Cast<LiveTvChannel>().FirstOrDefault();
+                    channel = _libraryManager.GetItemList(
+                        new InternalItemsQuery
+                        {
+                            IncludeItemTypes = new string[] { typeof(LiveTvChannel).Name },
+                            ItemIds = new[] { programInfo.ChannelId },
+                            DtoOptions = new DtoOptions()
+                        }).FirstOrDefault() as LiveTvChannel;
 
                     if (channel != null && !string.IsNullOrWhiteSpace(channel.ExternalId))
                     {
@@ -2618,10 +2540,10 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             foreach (var providerId in timerInfo.ProviderIds)
             {
-                var srch = "Series";
-                if (providerId.Key.StartsWith(srch, StringComparison.OrdinalIgnoreCase))
+                const string Search = "Series";
+                if (providerId.Key.StartsWith(Search, StringComparison.OrdinalIgnoreCase))
                 {
-                    seriesProviderIds[providerId.Key.Substring(srch.Length)] = providerId.Value;
+                    seriesProviderIds[providerId.Key.Substring(Search.Length)] = providerId.Value;
                 }
             }
 
@@ -2632,12 +2554,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             if ((program.EpisodeNumber.HasValue && program.SeasonNumber.HasValue) || !string.IsNullOrWhiteSpace(program.EpisodeTitle))
             {
-                var seriesIds = _libraryManager.GetItemIds(new InternalItemsQuery
-                {
-                    IncludeItemTypes = new[] { typeof(Series).Name },
-                    Name = program.Name
-
-                }).ToArray();
+                var seriesIds = _libraryManager.GetItemIds(
+                    new InternalItemsQuery
+                    {
+                        IncludeItemTypes = new[] { typeof(Series).Name },
+                        Name = program.Name
+                    }).ToArray();
 
                 if (seriesIds.Length == 0)
                 {
@@ -2666,59 +2588,70 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return false;
         }
 
-        private bool _disposed;
+        /// <inheritdoc />
         public void Dispose()
         {
-            _disposed = true;
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                _recordingDeleteSemaphore.Dispose();
+            }
+
             foreach (var pair in _activeRecordings.ToList())
             {
                 pair.Value.CancellationTokenSource.Cancel();
             }
+
+            _disposed = true;
         }
 
-        public List<VirtualFolderInfo> GetRecordingFolders()
+        public IEnumerable<VirtualFolderInfo> GetRecordingFolders()
         {
-            var list = new List<VirtualFolderInfo>();
-
             var defaultFolder = RecordingPath;
             var defaultName = "Recordings";
 
             if (Directory.Exists(defaultFolder))
             {
-                list.Add(new VirtualFolderInfo
+                yield return new VirtualFolderInfo
                 {
                     Locations = new string[] { defaultFolder },
                     Name = defaultName
-                });
+                };
             }
 
             var customPath = GetConfiguration().MovieRecordingPath;
-            if ((!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase)) && Directory.Exists(customPath))
+            if (!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase) && Directory.Exists(customPath))
             {
-                list.Add(new VirtualFolderInfo
+                yield return new VirtualFolderInfo
                 {
                     Locations = new string[] { customPath },
                     Name = "Recorded Movies",
                     CollectionType = CollectionType.Movies
-                });
+                };
             }
 
             customPath = GetConfiguration().SeriesRecordingPath;
-            if ((!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase)) && Directory.Exists(customPath))
+            if (!string.IsNullOrWhiteSpace(customPath) && !string.Equals(customPath, defaultFolder, StringComparison.OrdinalIgnoreCase) && Directory.Exists(customPath))
             {
-                list.Add(new VirtualFolderInfo
+                yield return new VirtualFolderInfo
                 {
                     Locations = new string[] { customPath },
                     Name = "Recorded Shows",
                     CollectionType = CollectionType.TvShows
-                });
+                };
             }
-
-            return list;
         }
 
-        private const int TunerDiscoveryDurationMs = 3000;
-
         public async Task<List<TunerHostInfo>> DiscoverTuners(bool newDevicesOnly, CancellationToken cancellationToken)
         {
             var list = new List<TunerHostInfo>();
@@ -2737,6 +2670,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     discoveredDevices = discoveredDevices.Where(d => !configuredDeviceIds.Contains(d.DeviceId, StringComparer.OrdinalIgnoreCase))
                             .ToList();
                 }
+
                 list.AddRange(discoveredDevices);
             }
 
@@ -2773,11 +2707,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private async Task<List<TunerHostInfo>> DiscoverDevices(ITunerHost host, int discoveryDuationMs, CancellationToken cancellationToken)
+        private async Task<List<TunerHostInfo>> DiscoverDevices(ITunerHost host, int discoveryDurationMs, CancellationToken cancellationToken)
         {
             try
             {
-                var discoveredDevices = await host.DiscoverDevices(discoveryDuationMs, cancellationToken).ConfigureAwait(false);
+                var discoveredDevices = await host.DiscoverDevices(discoveryDurationMs, cancellationToken).ConfigureAwait(false);
 
                 foreach (var device in discoveredDevices)
                 {
@@ -2794,11 +2728,4 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
     }
-    public static class ConfigurationExtension
-    {
-        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager manager)
-        {
-            return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
-        }
-    }
 }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index cc9c8e5d2..6e4ac2fec 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,7 +13,6 @@ using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
@@ -24,7 +22,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
     public class EncodedRecorder : IRecorder
     {
         private readonly ILogger _logger;
-        private readonly IFileSystem _fileSystem;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IServerApplicationPaths _appPaths;
         private bool _hasExited;
@@ -38,7 +35,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public EncodedRecorder(
             ILogger logger,
-            IFileSystem fileSystem,
             IMediaEncoder mediaEncoder,
             IServerApplicationPaths appPaths,
             IJsonSerializer json,
@@ -46,7 +42,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             IServerConfigurationManager config)
         {
             _logger = logger;
-            _fileSystem = fileSystem;
             _mediaEncoder = mediaEncoder;
             _appPaths = appPaths;
             _json = json;
@@ -107,7 +102,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             Directory.CreateDirectory(Path.GetDirectoryName(logFilePath));
 
             // FFMpeg writes debug/error info to stderr. This is useful when debugging so let's put it in the log directory.
-            _logFileStream = _fileSystem.GetFileStream(logFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true);
+            _logFileStream = new FileStream(logFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, true);
 
             var commandLineLogMessageBytes = Encoding.UTF8.GetBytes(_json.SerializeToString(mediaSource) + Environment.NewLine + Environment.NewLine + commandLineLogMessage + Environment.NewLine + Environment.NewLine);
             _logFileStream.Write(commandLineLogMessageBytes, 0, commandLineLogMessageBytes.Length);
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
new file mode 100644
index 000000000..498aa3c26
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs
@@ -0,0 +1,68 @@
+#pragma warning disable SA1600
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Controller.LiveTv;
+
+namespace Emby.Server.Implementations.LiveTv.EmbyTV
+{
+
+    internal class EpgChannelData
+    {
+        public EpgChannelData(IEnumerable<ChannelInfo> channels)
+        {
+            ChannelsById = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
+            ChannelsByNumber = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
+            ChannelsByName = new Dictionary<string, ChannelInfo>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var channel in channels)
+            {
+                ChannelsById[channel.Id] = channel;
+
+                if (!string.IsNullOrEmpty(channel.Number))
+                {
+                    ChannelsByNumber[channel.Number] = channel;
+                }
+
+                var normalizedName = NormalizeName(channel.Name ?? string.Empty);
+                if (!string.IsNullOrWhiteSpace(normalizedName))
+                {
+                    ChannelsByName[normalizedName] = channel;
+                }
+            }
+        }
+
+        private Dictionary<string, ChannelInfo> ChannelsById { get; set; }
+
+        private Dictionary<string, ChannelInfo> ChannelsByNumber { get; set; }
+
+        private Dictionary<string, ChannelInfo> ChannelsByName { get; set; }
+
+        public ChannelInfo GetChannelById(string id)
+        {
+            ChannelsById.TryGetValue(id, out var result);
+
+            return result;
+        }
+
+        public ChannelInfo GetChannelByNumber(string number)
+        {
+            ChannelsByNumber.TryGetValue(number, out var result);
+
+            return result;
+        }
+
+        public ChannelInfo GetChannelByName(string name)
+        {
+            ChannelsByName.TryGetValue(name, out var result);
+
+            return result;
+        }
+
+        public static string NormalizeName(string value)
+        {
+            return value.Replace(" ", string.Empty, StringComparison.Ordinal).Replace("-", string.Empty, StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs
new file mode 100644
index 000000000..83f5e8413
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs
@@ -0,0 +1,19 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+
+namespace Emby.Server.Implementations.LiveTv.EmbyTV
+{
+    /// <summary>
+    /// Class containing extension methods for working with the nfo configuration.
+    /// </summary>
+    public static class NfoConfigurationExtensions
+    {
+        /// <summary>
+        /// Gets the nfo configuration.
+        /// </summary>
+        /// <param name="configurationManager">The configuration manager.</param>
+        /// <returns>The nfo configuration.</returns>
+        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager configurationManager)
+         => configurationManager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index ee7db1413..e3f9df35a 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1,3 +1,6 @@
+#pragma warning disable SA1600
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -35,7 +38,7 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.LiveTv
 {
     /// <summary>
-    /// Class LiveTvManager
+    /// Class LiveTvManager.
     /// </summary>
     public class LiveTvManager : ILiveTvManager, IDisposable
     {
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
index 1d55e7992..862b9fdfe 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
@@ -96,7 +96,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 FileMode.Open,
                 FileAccess.Read,
                 FileShare.ReadWrite,
-                StreamDefaults.DefaultFileStreamBufferSize,
+                IODefaults.FileStreamBufferSize,
                 allowAsyncFileRead ? FileOptions.SequentialScan | FileOptions.Asynchronous : FileOptions.SequentialScan);
 
         public Task DeleteTempFiles()
@@ -199,7 +199,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 await StreamHelper.CopyToAsync(
                     inputStream,
                     stream,
-                    StreamDefaults.DefaultCopyToBufferSize,
+                    IODefaults.CopyToBufferSize,
                     emptyReadLimit,
                     cancellationToken).ConfigureAwait(false);
             }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index 3d2267e75..51f61bac7 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
@@ -10,7 +10,6 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Extensions;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.LiveTv.TunerHosts
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index 0d94f4b32..99244eb62 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -127,12 +127,12 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     Logger.LogInformation("Beginning {0} stream to {1}", GetType().Name, TempFilePath);
                     using (response)
                     using (var stream = response.Content)
-                    using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
+                    using (var fileStream = new FileStream(TempFilePath, FileMode.Create, FileAccess.Write, FileShare.Read))
                     {
                         await StreamHelper.CopyToAsync(
                             stream,
                             fileStream,
-                            StreamDefaults.DefaultCopyToBufferSize,
+                            IODefaults.CopyToBufferSize,
                             () => Resolve(openTaskCompletionSource),
                             cancellationToken).ConfigureAwait(false);
                     }
diff --git a/Emby.Server.Implementations/Localization/Core/ar.json b/Emby.Server.Implementations/Localization/Core/ar.json
index 4da3cdd3b..f0f165b22 100644
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -9,7 +9,7 @@
     "Channels": "القنوات",
     "ChapterNameValue": "الباب {0}",
     "Collections": "مجموعات",
-    "DeviceOfflineWithName": "تم قطع الاتصال بـ{0}",
+    "DeviceOfflineWithName": "تم قطع اتصال {0}",
     "DeviceOnlineWithName": "{0} متصل",
     "FailedLoginAttemptWithUserName": "عملية تسجيل الدخول فشلت من {0}",
     "Favorites": "التفضيلات",
@@ -75,8 +75,8 @@
     "Songs": "الأغاني",
     "StartupEmbyServerIsLoading": "سيرفر Jellyfin قيد التشغيل . الرجاء المحاولة بعد قليل.",
     "SubtitleDownloadFailureForItem": "عملية إنزال الترجمة فشلت لـ{0}",
-    "SubtitleDownloadFailureFromForItem": "الترجمات فشلت في التحميل من {0} لـ {1}",
-    "SubtitlesDownloadedForItem": "تم تحميل الترجمات لـ {0}",
+    "SubtitleDownloadFailureFromForItem": "الترجمات فشلت في التحميل من {0} الى {1}",
+    "SubtitlesDownloadedForItem": "تم تحميل الترجمات الى {0}",
     "Sync": "مزامنة",
     "System": "النظام",
     "TvShows": "البرامج التلفزيونية",
@@ -88,7 +88,7 @@
     "UserOfflineFromDevice": "تم قطع اتصال {0} من {1}",
     "UserOnlineFromDevice": "{0} متصل عبر {1}",
     "UserPasswordChangedWithName": "تم تغيير كلمة السر للمستخدم {0}",
-    "UserPolicyUpdatedWithName": "سياسة المستخدمين تم تحديثها لـ {0}",
+    "UserPolicyUpdatedWithName": "تم تحديث سياسة المستخدم {0}",
     "UserStartedPlayingItemWithValues": "قام {0} ببدء تشغيل {1} على {2}",
     "UserStoppedPlayingItemWithValues": "قام {0} بإيقاف تشغيل {1} على {2}",
     "ValueHasBeenAddedToLibrary": "{0} تم اضافتها الى مكتبة الوسائط",
diff --git a/Emby.Server.Implementations/Localization/Core/bg-BG.json b/Emby.Server.Implementations/Localization/Core/bg-BG.json
index 46c10d912..9441da591 100644
--- a/Emby.Server.Implementations/Localization/Core/bg-BG.json
+++ b/Emby.Server.Implementations/Localization/Core/bg-BG.json
@@ -16,7 +16,7 @@
     "Folders": "Папки",
     "Genres": "Жанрове",
     "HeaderAlbumArtists": "Изпълнители на албуми",
-    "HeaderCameraUploads": "",
+    "HeaderCameraUploads": "Качени от камера",
     "HeaderContinueWatching": "Продължаване на гледането",
     "HeaderFavoriteAlbums": "Любими албуми",
     "HeaderFavoriteArtists": "Любими изпълнители",
@@ -25,7 +25,7 @@
     "HeaderFavoriteSongs": "Любими песни",
     "HeaderLiveTV": "Телевизия на живо",
     "HeaderNextUp": "Следва",
-    "HeaderRecordingGroups": "",
+    "HeaderRecordingGroups": "Запис групи",
     "HomeVideos": "Домашни клипове",
     "Inherit": "Наследяване",
     "ItemAddedWithName": "{0} е добавено към библиотеката",
@@ -34,7 +34,7 @@
     "LabelRunningTimeValue": "",
     "Latest": "Последни",
     "MessageApplicationUpdated": "Сървърът е обновен",
-    "MessageApplicationUpdatedTo": "",
+    "MessageApplicationUpdatedTo": "Сървърът е обновен до {0}",
     "MessageNamedServerConfigurationUpdatedWithValue": "",
     "MessageServerConfigurationUpdated": "",
     "MixedContent": "Смесено съдържание",
diff --git a/Emby.Server.Implementations/Localization/Core/ca.json b/Emby.Server.Implementations/Localization/Core/ca.json
index 9961b0984..44e7cf0ce 100644
--- a/Emby.Server.Implementations/Localization/Core/ca.json
+++ b/Emby.Server.Implementations/Localization/Core/ca.json
@@ -3,9 +3,9 @@
     "AppDeviceValues": "Aplicació: {0}, Dispositiu: {1}",
     "Application": "Aplicació",
     "Artists": "Artistes",
-    "AuthenticationSucceededWithUserName": "{0} s'ha autenticat correctament",
+    "AuthenticationSucceededWithUserName": "{0} s'ha autentificat correctament",
     "Books": "Llibres",
-    "CameraImageUploadedFrom": "Una nova imatge de càmera ha sigut pujada des de {0}",
+    "CameraImageUploadedFrom": "Una nova imatge de la càmera ha sigut pujada des de {0}",
     "Channels": "Canals",
     "ChapterNameValue": "Episodi {0}",
     "Collections": "Col·leccions",
diff --git a/Emby.Server.Implementations/Localization/Core/fi.json b/Emby.Server.Implementations/Localization/Core/fi.json
index 15aa0a8ee..7d6ca0d79 100644
--- a/Emby.Server.Implementations/Localization/Core/fi.json
+++ b/Emby.Server.Implementations/Localization/Core/fi.json
@@ -1,6 +1,6 @@
 {
-    "HeaderLiveTV": "Netti-TV",
-    "NewVersionIsAvailable": "Uusi versio Jellyfin palvelimesta on ladattavissa",
+    "HeaderLiveTV": "TV-lähetykset",
+    "NewVersionIsAvailable": "Uusi versio Jellyfin palvelimesta on ladattavissa.",
     "NameSeasonUnknown": "Tuntematon Kausi",
     "NameSeasonNumber": "Kausi {0}",
     "NameInstallFailed": "{0} asennus epäonnistui",
@@ -8,9 +8,9 @@
     "Music": "Musiikki",
     "Movies": "Elokuvat",
     "MixedContent": "Sekoitettu sisältö",
-    "MessageServerConfigurationUpdated": "Palvelimen konfiguraatio on päivitetty",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Palvelimen konfiguraatio-osa {0} on päivitetty",
-    "MessageApplicationUpdatedTo": "Jellyfin palvelin on päivitetty {0}",
+    "MessageServerConfigurationUpdated": "Palvelimen asetukset on päivitetty",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Palvelimen asetusryhmä {0} on päivitetty",
+    "MessageApplicationUpdatedTo": "Jellyfin palvelin on päivitetty versioon {0}",
     "MessageApplicationUpdated": "Jellyfin palvelin on päivitetty",
     "Latest": "Viimeisin",
     "LabelRunningTimeValue": "Kesto: {0}",
@@ -24,12 +24,12 @@
     "HeaderFavoriteSongs": "Lempikappaleet",
     "HeaderFavoriteShows": "Lempisarjat",
     "HeaderFavoriteEpisodes": "Lempijaksot",
-    "HeaderCameraUploads": "Kamerasta Ladatut",
+    "HeaderCameraUploads": "Kamerasta lähetetyt",
     "HeaderFavoriteArtists": "Lempiartistit",
     "HeaderFavoriteAlbums": "Lempialbumit",
-    "HeaderContinueWatching": "Jatka Katsomista",
-    "HeaderAlbumArtists": "Albumiartistit",
-    "Genres": "Genret",
+    "HeaderContinueWatching": "Jatka katsomista",
+    "HeaderAlbumArtists": "Albumin artistit",
+    "Genres": "Tyylilaji",
     "Folders": "Kansiot",
     "Favorites": "Suosikit",
     "FailedLoginAttemptWithUserName": "Epäonnistunut kirjautumisyritys kohteesta {0}",
@@ -44,5 +44,53 @@
     "Artists": "Artistit",
     "Application": "Sovellus",
     "AppDeviceValues": "Sovellus: {0}, Laite: {1}",
-    "Albums": "Albumit"
+    "Albums": "Albumit",
+    "User": "Käyttäjä",
+    "System": "Järjestelmä",
+    "ScheduledTaskFailedWithName": "{0} epäonnistui",
+    "PluginUpdatedWithName": "{0} päivitetty",
+    "PluginInstalledWithName": "{0} asennettu",
+    "Photos": "Kuvat",
+    "ScheduledTaskStartedWithName": "{0} aloitettu",
+    "PluginUninstalledWithName": "{0} poistettu",
+    "Playlists": "Soittolistat",
+    "VersionNumber": "Versio {0}",
+    "ValueSpecialEpisodeName": "Erikois - {0}",
+    "ValueHasBeenAddedToLibrary": "{0} lisättiin mediakirjastoon",
+    "UserStoppedPlayingItemWithValues": "{0} toistaminen valmistui {1} laitteella {2}",
+    "UserStartedPlayingItemWithValues": "{0} toistaa {1} laitteella {2}",
+    "UserPolicyUpdatedWithName": "Käyttöoikeudet päivitetty käyttäjälle {0}",
+    "UserPasswordChangedWithName": "Salasana vaihdettu käyttäjälle {0}",
+    "UserOnlineFromDevice": "{0} on paikalla osoitteesta {1}",
+    "UserOfflineFromDevice": "{0} yhteys katkaistu {1}",
+    "UserLockedOutWithName": "Käyttäjä {0} kirjautui ulos",
+    "UserDownloadingItemWithValues": "{0} latautumassa {1}",
+    "UserDeletedWithName": "Poistettiin käyttäjä {0}",
+    "UserCreatedWithName": "Luotiin käyttäjä {0}",
+    "TvShows": "TV-Ohjelmat",
+    "Sync": "Synkronoi",
+    "SubtitlesDownloadedForItem": "Tekstitys ladattu {0}",
+    "SubtitleDownloadFailureFromForItem": "Tekstityksen lataaminen epäonnistui {0} - {1}",
+    "StartupEmbyServerIsLoading": "Jellyfin palvelin latautuu. Kokeile hetken kuluttua uudelleen.",
+    "Songs": "Kappaleet",
+    "Shows": "Ohjelmat",
+    "ServerNameNeedsToBeRestarted": "{0} vaatii uudelleenkäynnistyksen",
+    "ProviderValue": "Palveluntarjoaja: {0}",
+    "Plugin": "Laajennus",
+    "NotificationOptionVideoPlaybackStopped": "Videon toistaminen pysäytetty",
+    "NotificationOptionVideoPlayback": "Videon toistaminen aloitettu",
+    "NotificationOptionUserLockedOut": "Käyttäjä kirjautui ulos",
+    "NotificationOptionTaskFailed": "Ajastetun tehtävän ongelma",
+    "NotificationOptionServerRestartRequired": "Palvelimen uudelleenkäynnistys vaaditaan",
+    "NotificationOptionPluginUpdateInstalled": "Laajennuksen päivitys asennettu",
+    "NotificationOptionPluginUninstalled": "Laajennus poistettu",
+    "NotificationOptionPluginInstalled": "Laajennus asennettu",
+    "NotificationOptionPluginError": "Ongelma laajennuksessa",
+    "NotificationOptionNewLibraryContent": "Uusi sisältö lisätty",
+    "NotificationOptionInstallationFailed": "Asennusvirhe",
+    "NotificationOptionCameraImageUploaded": "Kameran kuva lisätty",
+    "NotificationOptionAudioPlaybackStopped": "Äänen toistaminen pysäytetty",
+    "NotificationOptionAudioPlayback": "Äänen toistaminen aloitettu",
+    "NotificationOptionApplicationUpdateInstalled": "Ohjelmistopäivitys asennettu",
+    "NotificationOptionApplicationUpdateAvailable": "Ohjelmistopäivitys saatavilla"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/fil.json b/Emby.Server.Implementations/Localization/Core/fil.json
new file mode 100644
index 000000000..66db059d9
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/fil.json
@@ -0,0 +1,95 @@
+{
+    "VersionNumber": "Bersyon {0}",
+    "ValueSpecialEpisodeName": "Espesyal - {0}",
+    "ValueHasBeenAddedToLibrary": "Naidagdag na ang {0} sa iyong media library",
+    "UserStoppedPlayingItemWithValues": "Natapos ni {0} ang {1} sa {2}",
+    "UserStartedPlayingItemWithValues": "Si {0} ay nagplaplay ng {1} sa {2}",
+    "UserPolicyUpdatedWithName": "Ang user policy ay naiupdate para kay {0}",
+    "UserPasswordChangedWithName": "Napalitan na ang password ni {0}",
+    "UserOnlineFromDevice": "Si {0} ay nakakonekta galing sa {1}",
+    "UserOfflineFromDevice": "Si {0} ay nadiskonekta galing sa {1}",
+    "UserLockedOutWithName": "Si {0} ay nalock out",
+    "UserDownloadingItemWithValues": "Nagdadownload si {0} ng {1}",
+    "UserDeletedWithName": "Natanggal na is user {0}",
+    "UserCreatedWithName": "Nagawa na si user {0}",
+    "User": "User",
+    "TvShows": "Pelikula",
+    "System": "Sistema",
+    "Sync": "Pag-sync",
+    "SubtitlesDownloadedForItem": "Naidownload na ang subtitles {0}",
+    "SubtitleDownloadFailureFromForItem": "Hindi naidownload ang subtitles {0} para sa {1}",
+    "StartupEmbyServerIsLoading": "Nagloload ang Jellyfin Server. Sandaling maghintay.",
+    "Songs": "Kanta",
+    "Shows": "Pelikula",
+    "ServerNameNeedsToBeRestarted": "Kailangan irestart ang {0}",
+    "ScheduledTaskStartedWithName": "Nagsimula na ang {0}",
+    "ScheduledTaskFailedWithName": "Hindi gumana and {0}",
+    "ProviderValue": "Ang provider ay {0}",
+    "PluginUpdatedWithName": "Naiupdate na ang {0}",
+    "PluginUninstalledWithName": "Naiuninstall na ang {0}",
+    "PluginInstalledWithName": "Nainstall na ang {0}",
+    "Plugin": "Plugin",
+    "Playlists": "Playlists",
+    "Photos": "Larawan",
+    "NotificationOptionVideoPlaybackStopped": "Huminto na ang pelikula",
+    "NotificationOptionVideoPlayback": "Nagsimula na ang pelikula",
+    "NotificationOptionUserLockedOut": "Nakalock out ang user",
+    "NotificationOptionTaskFailed": "Hindi gumana ang scheduled task",
+    "NotificationOptionServerRestartRequired": "Kailangan irestart ang server",
+    "NotificationOptionPluginUpdateInstalled": "Naiupdate na ang plugin",
+    "NotificationOptionPluginUninstalled": "Naiuninstall na ang plugin",
+    "NotificationOptionPluginInstalled": "Nainstall na ang plugin",
+    "NotificationOptionPluginError": "Hindi gumagana ang plugin",
+    "NotificationOptionNewLibraryContent": "May bagong content na naidagdag",
+    "NotificationOptionInstallationFailed": "Hindi nainstall ng mabuti",
+    "NotificationOptionCameraImageUploaded": "Naiupload na ang picture",
+    "NotificationOptionAudioPlaybackStopped": "Huminto na ang patugtog",
+    "NotificationOptionAudioPlayback": "Nagsimula na ang patugtog",
+    "NotificationOptionApplicationUpdateInstalled": "Naiupdate na ang aplikasyon",
+    "NotificationOptionApplicationUpdateAvailable": "May bagong update ang aplikasyon",
+    "NewVersionIsAvailable": "May bagong version ng Jellyfin Server na pwede idownload.",
+    "NameSeasonUnknown": "Hindi alam ang season",
+    "NameSeasonNumber": "Season {0}",
+    "NameInstallFailed": "Hindi nainstall ang {0}",
+    "MusicVideos": "Music video",
+    "Music": "Kanta",
+    "Movies": "Pelikula",
+    "MixedContent": "Halo-halong content",
+    "MessageServerConfigurationUpdated": "Naiupdate na ang server configuration",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Naiupdate na ang server configuration section {0}",
+    "MessageApplicationUpdatedTo": "Ang Jellyfin Server ay naiupdate to {0}",
+    "MessageApplicationUpdated": "Naiupdate na ang Jellyfin Server",
+    "Latest": "Pinakabago",
+    "LabelRunningTimeValue": "Oras: {0}",
+    "LabelIpAddressValue": "Ang IP Address ay {0}",
+    "ItemRemovedWithName": "Naitanggal ang {0} sa library",
+    "ItemAddedWithName": "Naidagdag ang {0} sa library",
+    "Inherit": "Manahin",
+    "HeaderRecordingGroups": "Pagtatalang Grupo",
+    "HeaderNextUp": "Susunod",
+    "HeaderLiveTV": "Live TV",
+    "HeaderFavoriteSongs": "Paboritong Kanta",
+    "HeaderFavoriteShows": "Paboritong Pelikula",
+    "HeaderFavoriteEpisodes": "Paboritong Episodes",
+    "HeaderFavoriteArtists": "Paboritong Artista",
+    "HeaderFavoriteAlbums": "Paboritong Albums",
+    "HeaderContinueWatching": "Ituloy Manood",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderAlbumArtists": "Artista ng Album",
+    "Genres": "Kategorya",
+    "Folders": "Folders",
+    "Favorites": "Paborito",
+    "FailedLoginAttemptWithUserName": "maling login galing {0}",
+    "DeviceOnlineWithName": "nakakonekta si {0}",
+    "DeviceOfflineWithName": "nadiskonekta si {0}",
+    "Collections": "Koleksyon",
+    "ChapterNameValue": "Kabanata {0}",
+    "Channels": "Channel",
+    "CameraImageUploadedFrom": "May bagong larawan na naupload galing {0}",
+    "Books": "Libro",
+    "AuthenticationSucceededWithUserName": "{0} na patunayan",
+    "Artists": "Artista",
+    "Application": "Aplikasyon",
+    "AppDeviceValues": "Aplikasyon: {0}, Aparato: {1}",
+    "Albums": "Albums"
+}
diff --git a/Emby.Server.Implementations/Localization/Core/fr.json b/Emby.Server.Implementations/Localization/Core/fr.json
index 6b25e3df0..90754e415 100644
--- a/Emby.Server.Implementations/Localization/Core/fr.json
+++ b/Emby.Server.Implementations/Localization/Core/fr.json
@@ -11,11 +11,11 @@
     "Collections": "Collections",
     "DeviceOfflineWithName": "{0} s'est déconnecté",
     "DeviceOnlineWithName": "{0} est connecté",
-    "FailedLoginAttemptWithUserName": "Échec d'une tentative de connexion de {0}",
+    "FailedLoginAttemptWithUserName": "Échec de connexion de {0}",
     "Favorites": "Favoris",
     "Folders": "Dossiers",
     "Genres": "Genres",
-    "HeaderAlbumArtists": "Artistes de l'album",
+    "HeaderAlbumArtists": "Artistes d'album",
     "HeaderCameraUploads": "Photos transférées",
     "HeaderContinueWatching": "Continuer à regarder",
     "HeaderFavoriteAlbums": "Albums favoris",
@@ -34,7 +34,7 @@
     "LabelRunningTimeValue": "Durée : {0}",
     "Latest": "Derniers",
     "MessageApplicationUpdated": "Le serveur Jellyfin a été mis à jour",
-    "MessageApplicationUpdatedTo": "Le serveur Jellyfin a été mis à jour vers {0}",
+    "MessageApplicationUpdatedTo": "Le serveur Jellyfin a été mis à jour en version {0}",
     "MessageNamedServerConfigurationUpdatedWithValue": "La configuration de la section {0} du serveur a été mise à jour",
     "MessageServerConfigurationUpdated": "La configuration du serveur a été mise à jour",
     "MixedContent": "Contenu mixte",
diff --git a/Emby.Server.Implementations/Localization/Core/gl.json b/Emby.Server.Implementations/Localization/Core/gl.json
new file mode 100644
index 000000000..94034962d
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/gl.json
@@ -0,0 +1,3 @@
+{
+    "Albums": "Álbumes"
+}
diff --git a/Emby.Server.Implementations/Localization/Core/id.json b/Emby.Server.Implementations/Localization/Core/id.json
index 8d17ad38e..13415eda5 100644
--- a/Emby.Server.Implementations/Localization/Core/id.json
+++ b/Emby.Server.Implementations/Localization/Core/id.json
@@ -6,7 +6,7 @@
     "MessageApplicationUpdatedTo": "Jellyfin Server sudah diperbarui ke {0}",
     "MessageApplicationUpdated": "Jellyfin Server sudah diperbarui",
     "Latest": "Terbaru",
-    "LabelIpAddressValue": "IP address: {0}",
+    "LabelIpAddressValue": "Alamat IP: {0}",
     "ItemRemovedWithName": "{0} sudah dikeluarkan dari perpustakaan",
     "ItemAddedWithName": "{0} sudah dimasukkan ke dalam perpustakaan",
     "Inherit": "Warisan",
@@ -28,5 +28,63 @@
     "Collections": "Koleksi",
     "Books": "Buku",
     "Artists": "Artis",
-    "Application": "Aplikasi"
+    "Application": "Aplikasi",
+    "ChapterNameValue": "Bagian {0}",
+    "Channels": "Saluran",
+    "TvShows": "Seri TV",
+    "SubtitleDownloadFailureFromForItem": "Talop gagal diunduh dari {0} untuk {1}",
+    "StartupEmbyServerIsLoading": "Peladen Jellyfin sedang dimuat. Silakan coba kembali beberapa saat lagi.",
+    "Songs": "Lagu",
+    "Playlists": "Daftar putar",
+    "NotificationOptionPluginUninstalled": "Plugin dilepas",
+    "MusicVideos": "Video musik",
+    "VersionNumber": "Versi {0}",
+    "ValueSpecialEpisodeName": "Spesial - {0}",
+    "ValueHasBeenAddedToLibrary": "{0} telah ditambahkan ke pustaka media Anda",
+    "UserStoppedPlayingItemWithValues": "{0} telah selesai memutar {1} pada {2}",
+    "UserStartedPlayingItemWithValues": "{0} sedang memutar {1} pada {2}",
+    "UserPolicyUpdatedWithName": "Kebijakan pengguna telah diperbarui untuk {0}",
+    "UserPasswordChangedWithName": "Kata sandi telah diubah untuk pengguna {0}",
+    "UserOnlineFromDevice": "{0} sedang daring dari {1}",
+    "UserOfflineFromDevice": "{0} telah terputus dari {1}",
+    "UserLockedOutWithName": "Pengguna {0} telah dikunci",
+    "UserDownloadingItemWithValues": "{0} sedang mengunduh {1}",
+    "UserDeletedWithName": "Pengguna {0} telah dihapus",
+    "UserCreatedWithName": "Pengguna {0} telah dibuat",
+    "User": "Pengguna",
+    "System": "Sistem",
+    "Sync": "Sinkron",
+    "SubtitlesDownloadedForItem": "Talop telah diunduh untuk {0}",
+    "Shows": "Tayangan",
+    "ServerNameNeedsToBeRestarted": "{0} perlu dimuat ulang",
+    "ScheduledTaskStartedWithName": "{0} dimulai",
+    "ScheduledTaskFailedWithName": "{0} gagal",
+    "ProviderValue": "Penyedia: {0}",
+    "PluginUpdatedWithName": "{0} telah diperbarui",
+    "PluginInstalledWithName": "{0} telah dipasang",
+    "Plugin": "Plugin",
+    "Photos": "Foto",
+    "NotificationOptionUserLockedOut": "Pengguna terkunci",
+    "NotificationOptionTaskFailed": "Kegagalan tugas terjadwal",
+    "NotificationOptionServerRestartRequired": "Restart peladen dibutuhkan",
+    "NotificationOptionPluginUpdateInstalled": "Pembaruan plugin terpasang",
+    "NotificationOptionPluginInstalled": "Plugin terpasang",
+    "NotificationOptionPluginError": "Kegagalan plugin",
+    "NotificationOptionNewLibraryContent": "Konten baru ditambahkan",
+    "NotificationOptionInstallationFailed": "Kegagalan pemasangan",
+    "NotificationOptionCameraImageUploaded": "Gambar kamera terunggah",
+    "NotificationOptionApplicationUpdateInstalled": "Pembaruan aplikasi terpasang",
+    "NotificationOptionApplicationUpdateAvailable": "Pembaruan aplikasi tersedia",
+    "NewVersionIsAvailable": "Sebuah versi baru dari Peladen Jellyfin tersedia untuk diunduh.",
+    "NameSeasonUnknown": "Musim tak diketahui",
+    "NameSeasonNumber": "Musim {0}",
+    "NameInstallFailed": "{0} instalasi gagal",
+    "Music": "Musik",
+    "Movies": "Film",
+    "MessageServerConfigurationUpdated": "Konfigurasi peladen telah diperbarui",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Konfigurasi peladen bagian {0} telah diperbarui",
+    "FailedLoginAttemptWithUserName": "Percobaan login gagal dari {0}",
+    "CameraImageUploadedFrom": "Sebuah gambar baru telah diunggah dari {0}",
+    "DeviceOfflineWithName": "{0} telah terputus",
+    "DeviceOnlineWithName": "{0} telah terhubung"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/it.json b/Emby.Server.Implementations/Localization/Core/it.json
index 8f91effb9..c1c40c18e 100644
--- a/Emby.Server.Implementations/Localization/Core/it.json
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -9,7 +9,7 @@
     "Channels": "Canali",
     "ChapterNameValue": "Capitolo {0}",
     "Collections": "Collezioni",
-    "DeviceOfflineWithName": "{0} ha disconnesso",
+    "DeviceOfflineWithName": "{0} si è disconnesso",
     "DeviceOnlineWithName": "{0} è connesso",
     "FailedLoginAttemptWithUserName": "Tentativo di accesso fallito da {0}",
     "Favorites": "Preferiti",
diff --git a/Emby.Server.Implementations/Localization/Core/nb.json b/Emby.Server.Implementations/Localization/Core/nb.json
index 7d4b2bdac..f9fa1b68c 100644
--- a/Emby.Server.Implementations/Localization/Core/nb.json
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -62,7 +62,7 @@
     "NotificationOptionVideoPlayback": "Videoavspilling startet",
     "NotificationOptionVideoPlaybackStopped": "Videoavspilling stoppet",
     "Photos": "Bilder",
-    "Playlists": "Spliielister",
+    "Playlists": "Spillelister",
     "Plugin": "Plugin",
     "PluginInstalledWithName": "{0} ble installert",
     "PluginUninstalledWithName": "{0} ble avinstallert",
diff --git a/Emby.Server.Implementations/Localization/Core/ro.json b/Emby.Server.Implementations/Localization/Core/ro.json
index b871626f0..71bffffc6 100644
--- a/Emby.Server.Implementations/Localization/Core/ro.json
+++ b/Emby.Server.Implementations/Localization/Core/ro.json
@@ -65,8 +65,8 @@
     "LabelIpAddressValue": "Adresa IP: {0}",
     "ItemRemovedWithName": "{0} a fost eliminat din bibliotecă",
     "ItemAddedWithName": "{0} a fost adăugat în bibliotecă",
-    "Inherit": "moștenit",
-    "HomeVideos": "Videoclipuri personale",
+    "Inherit": "Moștenit",
+    "HomeVideos": "Filme personale",
     "HeaderRecordingGroups": "Grupuri de înregistrare",
     "HeaderLiveTV": "TV în Direct",
     "HeaderFavoriteSongs": "Melodii Favorite",
diff --git a/Emby.Server.Implementations/Localization/Core/sk.json b/Emby.Server.Implementations/Localization/Core/sk.json
index 9bac305a2..1988bda52 100644
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -15,7 +15,7 @@
     "Favorites": "Obľúbené",
     "Folders": "Priečinky",
     "Genres": "Žánre",
-    "HeaderAlbumArtists": "Albumy umelcov",
+    "HeaderAlbumArtists": "Umelci albumu",
     "HeaderCameraUploads": "Nahrané fotografie",
     "HeaderContinueWatching": "Pokračovať v pozeraní",
     "HeaderFavoriteAlbums": "Obľúbené albumy",
@@ -45,25 +45,25 @@
     "NameSeasonNumber": "Séria {0}",
     "NameSeasonUnknown": "Neznáma séria",
     "NewVersionIsAvailable": "Nová verzia Jellyfin Serveru je dostupná na stiahnutie.",
-    "NotificationOptionApplicationUpdateAvailable": "Aktualizácia aplikácie je dostupná",
-    "NotificationOptionApplicationUpdateInstalled": "Aktualizácia aplikácie nainštalovaná",
-    "NotificationOptionAudioPlayback": "Prehrávanie audia bolo spustené",
-    "NotificationOptionAudioPlaybackStopped": "Prehrávanie audia bolo zastavené",
+    "NotificationOptionApplicationUpdateAvailable": "Je dostupná aktualizácia aplikácie",
+    "NotificationOptionApplicationUpdateInstalled": "Aktualizácia aplikácie bola nainštalovaná",
+    "NotificationOptionAudioPlayback": "Prehrávanie zvuku bolo spustené",
+    "NotificationOptionAudioPlaybackStopped": "Prehrávanie zvuku bolo zastavené",
     "NotificationOptionCameraImageUploaded": "Obrázok z fotoaparátu bol nahraný",
     "NotificationOptionInstallationFailed": "Chyba inštalácie",
-    "NotificationOptionNewLibraryContent": "Nový obsah bol pridaný",
-    "NotificationOptionPluginError": "Chyba rozšírenia",
-    "NotificationOptionPluginInstalled": "Rozšírenie nainštalované",
-    "NotificationOptionPluginUninstalled": "Rozšírenie odinštalované",
-    "NotificationOptionPluginUpdateInstalled": "Aktualizácia rozšírenia nainštalovaná",
+    "NotificationOptionNewLibraryContent": "Bol pridaný nový obsah",
+    "NotificationOptionPluginError": "Chyba zásuvného modulu",
+    "NotificationOptionPluginInstalled": "Bol nainštalovaný zásuvný modul",
+    "NotificationOptionPluginUninstalled": "Zásuvný modul bol odinštalovaný",
+    "NotificationOptionPluginUpdateInstalled": "Bola nainštalovaná aktualizácia zásuvného modulu",
     "NotificationOptionServerRestartRequired": "Vyžaduje sa reštart servera",
     "NotificationOptionTaskFailed": "Naplánovaná úloha zlyhala",
     "NotificationOptionUserLockedOut": "Používateľ je uzamknutý",
     "NotificationOptionVideoPlayback": "Spustené prehrávanie videa",
     "NotificationOptionVideoPlaybackStopped": "Zastavené prehrávanie videa",
     "Photos": "Fotky",
-    "Playlists": "Zoznamy skladieb",
-    "Plugin": "Rozšírenie",
+    "Playlists": "Playlisty",
+    "Plugin": "Zásuvný modul",
     "PluginInstalledWithName": "{0} bol nainštalovaný",
     "PluginUninstalledWithName": "{0} bol odinštalovaný",
     "PluginUpdatedWithName": "{0} bol aktualizovaný",
@@ -72,8 +72,8 @@
     "ScheduledTaskStartedWithName": "{0} zahájených",
     "ServerNameNeedsToBeRestarted": "{0} vyžaduje reštart",
     "Shows": "Seriály",
-    "Songs": "Skladby",
-    "StartupEmbyServerIsLoading": "Jellyfin Server sa spúšťa. Skúste to prosím o chvíľu znova.",
+    "Songs": "Piesne",
+    "StartupEmbyServerIsLoading": "Jellyfin Server sa spúšťa. Prosím, skúste to o chvíľu znova.",
     "SubtitleDownloadFailureForItem": "Sťahovanie titulkov pre {0} zlyhalo",
     "SubtitleDownloadFailureFromForItem": "Sťahovanie titulkov z {0} pre {1} zlyhalo",
     "SubtitlesDownloadedForItem": "Titulky pre {0} stiahnuté",
@@ -87,11 +87,11 @@
     "UserLockedOutWithName": "Používateľ {0} bol vymknutý",
     "UserOfflineFromDevice": "{0} sa odpojil od {1}",
     "UserOnlineFromDevice": "{0} je online z {1}",
-    "UserPasswordChangedWithName": "Heslo používateľa {0} zmenené",
+    "UserPasswordChangedWithName": "Heslo používateľa {0} bolo zmenené",
     "UserPolicyUpdatedWithName": "Používateľské zásady pre {0} boli aktualizované",
-    "UserStartedPlayingItemWithValues": "{0} spustil prehrávanie {1}",
-    "UserStoppedPlayingItemWithValues": "{0} zastavil prehrávanie {1}",
-    "ValueHasBeenAddedToLibrary": "{0} bolo pridané do vašej knižnice médií",
+    "UserStartedPlayingItemWithValues": "{0} spustil prehrávanie {1} na {2}",
+    "UserStoppedPlayingItemWithValues": "{0} ukončil prehrávanie {1} na {2}",
+    "ValueHasBeenAddedToLibrary": "{0} bol pridané do vašej knižnice médií",
     "ValueSpecialEpisodeName": "Špeciál - {0}",
     "VersionNumber": "Verzia {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/sl-SI.json b/Emby.Server.Implementations/Localization/Core/sl-SI.json
index c141a40f6..b43cfbb74 100644
--- a/Emby.Server.Implementations/Localization/Core/sl-SI.json
+++ b/Emby.Server.Implementations/Localization/Core/sl-SI.json
@@ -12,7 +12,7 @@
     "DeviceOfflineWithName": "{0} je prekinil povezavo",
     "DeviceOnlineWithName": "{0} je povezan",
     "FailedLoginAttemptWithUserName": "Neuspešen poskus prijave z {0}",
-    "Favorites": "Priljubljeni",
+    "Favorites": "Priljubljeno",
     "Folders": "Mape",
     "Genres": "Zvrsti",
     "HeaderAlbumArtists": "Izvajalci albuma",
diff --git a/Emby.Server.Implementations/Localization/Core/sr.json b/Emby.Server.Implementations/Localization/Core/sr.json
index 0967ef424..da0088991 100644
--- a/Emby.Server.Implementations/Localization/Core/sr.json
+++ b/Emby.Server.Implementations/Localization/Core/sr.json
@@ -1 +1,96 @@
-{}
+{
+    "UserPolicyUpdatedWithName": "Корисничке смернице ажуриране за {0}",
+    "NotificationOptionUserLockedOut": "Корисник закључан",
+    "VersionNumber": "Верзија {0}",
+    "ValueSpecialEpisodeName": "Специјал - {0}",
+    "ValueHasBeenAddedToLibrary": "{0} је додато у вашу медијску библиотеку",
+    "UserStoppedPlayingItemWithValues": "{0} заврши пуштање {1} на {2}",
+    "UserStartedPlayingItemWithValues": "{0} пушта {1} на {2}",
+    "UserPasswordChangedWithName": "Лозинка је промењена за корисника {0}",
+    "UserOnlineFromDevice": "{0} је на вези од {1}",
+    "UserOfflineFromDevice": "{0} се одвезао са {1}",
+    "UserLockedOutWithName": "Корисник {0} је закључан",
+    "UserDownloadingItemWithValues": "{0} преузима {1}",
+    "UserDeletedWithName": "Корисник {0} је обрисан",
+    "UserCreatedWithName": "Корисник {0} је направљен",
+    "User": "Корисник",
+    "TvShows": "ТВ серије",
+    "System": "Систем",
+    "Sync": "Усклади",
+    "SubtitlesDownloadedForItem": "Титлови преузети за {0}",
+    "SubtitleDownloadFailureFromForItem": "Неуспело преузимање титлова за {1} са {0}",
+    "StartupEmbyServerIsLoading": "Џелифин сервер се подиже. Покушајте поново убрзо.",
+    "Songs": "Песме",
+    "Shows": "Серије",
+    "ServerNameNeedsToBeRestarted": "{0} треба поново покренути",
+    "ScheduledTaskStartedWithName": "{0} покренуто",
+    "ScheduledTaskFailedWithName": "{0} неуспело",
+    "ProviderValue": "Пружалац: {0}",
+    "PluginUpdatedWithName": "{0} ажуриран",
+    "PluginUninstalledWithName": "{0} деинсталиран",
+    "PluginInstalledWithName": "{0} инсталиран",
+    "Plugin": "Прикључак",
+    "Playlists": "Листе",
+    "Photos": "Фотографије",
+    "NotificationOptionVideoPlaybackStopped": "Заустављено пуштање видеа",
+    "NotificationOptionVideoPlayback": "Покренуто пуштање видеа",
+    "NotificationOptionTaskFailed": "Неуспешан заказани посао",
+    "NotificationOptionServerRestartRequired": "Потребан је рестарт сервера",
+    "NotificationOptionPluginUpdateInstalled": "Ажурирање прикључка инсталирано",
+    "NotificationOptionPluginUninstalled": "Прикључак уклоњен",
+    "NotificationOptionPluginInstalled": "Прикључак инсталиран",
+    "NotificationOptionPluginError": "Грешка прикључка",
+    "NotificationOptionNewLibraryContent": "Додат нови садржај",
+    "NotificationOptionInstallationFailed": "Неуспела инсталација",
+    "NotificationOptionCameraImageUploaded": "Слика са камере послата",
+    "NotificationOptionAudioPlaybackStopped": "Заустављено пуштање звука",
+    "NotificationOptionAudioPlayback": "Покренуто пуштање звука",
+    "NotificationOptionApplicationUpdateInstalled": "Ажурирање инсталирано",
+    "NotificationOptionApplicationUpdateAvailable": "Доступно је ажурирање за апликацију",
+    "NewVersionIsAvailable": "Нова верзија Џелифин сервера је доступна за преузимање.",
+    "NameSeasonUnknown": "Непозната сезона",
+    "NameSeasonNumber": "Сезона {0}",
+    "NameInstallFailed": "Инсталација {0} није успела",
+    "MusicVideos": "Музички спотови",
+    "Music": "Музика",
+    "Movies": "Филмови",
+    "MixedContent": "Мешовит садржај",
+    "MessageServerConfigurationUpdated": "Серверска поставка је ажурирана",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Одељак серверске поставке {0} је ажуриран",
+    "MessageApplicationUpdatedTo": "Џелифин сервер је ажуриран на {0}",
+    "MessageApplicationUpdated": "Џелифин сервер је ажуриран",
+    "Latest": "Последње",
+    "LabelRunningTimeValue": "Време рада: {0}",
+    "LabelIpAddressValue": "ИП адреса: {0}",
+    "ItemRemovedWithName": "{0} уклоњено из библиотеке",
+    "ItemAddedWithName": "{0} додато у библиотеку",
+    "Inherit": "Наследи",
+    "HomeVideos": "Кућни видео",
+    "HeaderRecordingGroups": "Групе снимања",
+    "HeaderNextUp": "Следеће горе",
+    "HeaderLiveTV": "ТВ уживо",
+    "HeaderFavoriteSongs": "Омиљене песме",
+    "HeaderFavoriteShows": "Омиљене серије",
+    "HeaderFavoriteEpisodes": "Омиљене епизоде",
+    "HeaderFavoriteArtists": "Омиљени извођачи",
+    "HeaderFavoriteAlbums": "Омиљени албуми",
+    "HeaderContinueWatching": "Настави гледање",
+    "HeaderCameraUploads": "Слања са камере",
+    "HeaderAlbumArtists": "Извођачи албума",
+    "Genres": "Жанрови",
+    "Folders": "Фасцикле",
+    "Favorites": "Омиљено",
+    "FailedLoginAttemptWithUserName": "Неуспела пријава са {0}",
+    "DeviceOnlineWithName": "{0} се повезао",
+    "DeviceOfflineWithName": "{0} се одвезао",
+    "Collections": "Колекције",
+    "ChapterNameValue": "Поглавље {0}",
+    "Channels": "Канали",
+    "CameraImageUploadedFrom": "Нова фотографија је послата са {0}",
+    "Books": "Књиге",
+    "AuthenticationSucceededWithUserName": "{0} успешно проверено",
+    "Artists": "Извођач",
+    "Application": "Апликација",
+    "AppDeviceValues": "Апл: {0}, уређај: {1}",
+    "Albums": "Албуми"
+}
diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
index a4d53c57e..e0daac8a5 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-CN.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -3,9 +3,9 @@
     "AppDeviceValues": "应用: {0}, 设备: {1}",
     "Application": "应用程序",
     "Artists": "艺术家",
-    "AuthenticationSucceededWithUserName": "{0} 认证成功",
+    "AuthenticationSucceededWithUserName": "{0} 验证成功",
     "Books": "书籍",
-    "CameraImageUploadedFrom": "已从 {0} 上传了一张新的相片",
+    "CameraImageUploadedFrom": "新的相机图像已从 {0} 上传",
     "Channels": "频道",
     "ChapterNameValue": "章节 {0}",
     "Collections": "合集",
@@ -18,7 +18,7 @@
     "HeaderAlbumArtists": "专辑作家",
     "HeaderCameraUploads": "相机上传",
     "HeaderContinueWatching": "继续观看",
-    "HeaderFavoriteAlbums": "最爱的专辑",
+    "HeaderFavoriteAlbums": "收藏的专辑",
     "HeaderFavoriteArtists": "最爱的艺术家",
     "HeaderFavoriteEpisodes": "最爱的剧集",
     "HeaderFavoriteShows": "最爱的节目",
@@ -79,7 +79,7 @@
     "SubtitlesDownloadedForItem": "已为 {0} 下载了字幕",
     "Sync": "同步",
     "System": "系统",
-    "TvShows": "电视节目",
+    "TvShows": "电视剧",
     "User": "用户",
     "UserCreatedWithName": "用户 {0} 已创建",
     "UserDeletedWithName": "用户 {0} 已删除",
diff --git a/Emby.Server.Implementations/Localization/Core/zh-TW.json b/Emby.Server.Implementations/Localization/Core/zh-TW.json
index 33bdbfb98..3b0dc4ab2 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-TW.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-TW.json
@@ -50,10 +50,10 @@
     "NotificationOptionCameraImageUploaded": "相機相片已上傳",
     "NotificationOptionInstallationFailed": "安裝失敗",
     "NotificationOptionNewLibraryContent": "已新增新內容",
-    "NotificationOptionPluginError": "外掛失敗",
-    "NotificationOptionPluginInstalled": "外掛已安裝",
-    "NotificationOptionPluginUninstalled": "外掛已移除",
-    "NotificationOptionPluginUpdateInstalled": "已更新外掛",
+    "NotificationOptionPluginError": "擴充元件安裝失敗",
+    "NotificationOptionPluginInstalled": "擴充元件已安裝",
+    "NotificationOptionPluginUninstalled": "擴充元件已移除",
+    "NotificationOptionPluginUpdateInstalled": "已更新擴充元件",
     "NotificationOptionServerRestartRequired": "伺服器需要重新啟動",
     "NotificationOptionTaskFailed": "排程任務失敗",
     "NotificationOptionUserLockedOut": "使用者已鎖定",
diff --git a/Emby.Server.Implementations/Net/SocketFactory.cs b/Emby.Server.Implementations/Net/SocketFactory.cs
index 0870db003..e42ff8496 100644
--- a/Emby.Server.Implementations/Net/SocketFactory.cs
+++ b/Emby.Server.Implementations/Net/SocketFactory.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using MediaBrowser.Model.Net;
@@ -8,32 +7,6 @@ namespace Emby.Server.Implementations.Net
 {
     public class SocketFactory : ISocketFactory
     {
-        /// <summary>
-        /// Creates a new UDP acceptSocket and binds it to the specified local port.
-        /// </summary>
-        /// <param name="localPort">An integer specifying the local port to bind the acceptSocket to.</param>
-        public ISocket CreateUdpSocket(int localPort)
-        {
-            if (localPort < 0)
-            {
-                throw new ArgumentException("localPort cannot be less than zero.", nameof(localPort));
-            }
-
-            var retVal = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-
-            try
-            {
-                retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-                return new UdpSocket(retVal, localPort, IPAddress.Any);
-            }
-            catch
-            {
-                retVal?.Dispose();
-
-                throw;
-            }
-        }
-
         public ISocket CreateUdpBroadcastSocket(int localPort)
         {
             if (localPort < 0)
@@ -156,8 +129,5 @@ namespace Emby.Server.Implementations.Net
                 throw;
             }
         }
-
-        public Stream CreateNetworkStream(ISocket socket, bool ownsSocket)
-            => new NetworkStream(((UdpSocket)socket).Socket, ownsSocket);
     }
 }
diff --git a/Emby.Server.Implementations/Net/UdpSocket.cs b/Emby.Server.Implementations/Net/UdpSocket.cs
index dde4a2a34..211ca6784 100644
--- a/Emby.Server.Implementations/Net/UdpSocket.cs
+++ b/Emby.Server.Implementations/Net/UdpSocket.cs
@@ -181,15 +181,6 @@ namespace Emby.Server.Implementations.Net
             return taskCompletion.Task;
         }
 
-        public Task<SocketReceiveResult> ReceiveAsync(CancellationToken cancellationToken)
-        {
-            ThrowIfDisposed();
-
-            var buffer = new byte[8192];
-
-            return ReceiveAsync(buffer, 0, buffer.Length, cancellationToken);
-        }
-
         public Task SendToAsync(byte[] buffer, int offset, int size, IPEndPoint endPoint, CancellationToken cancellationToken)
         {
             ThrowIfDisposed();
diff --git a/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs b/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs
index e3047d392..6880766f9 100644
--- a/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs
+++ b/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Net.WebSockets;
-using MediaBrowser.Model.Services;
 using Microsoft.AspNetCore.Http;
 
 namespace Emby.Server.Implementations.Net
diff --git a/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs b/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs
index 2dfe59088..bb56d9771 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Emby.Server.Implementations.Images;
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
index ecd526251..5822c467b 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
@@ -70,7 +70,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         }
 
         /// <summary>
-        /// Returns the task to be executed
+        /// Returns the task to be executed.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <param name="progress">The progress.</param>
@@ -89,7 +89,6 @@ namespace Emby.Server.Implementations.ScheduledTasks
                 SourceTypes = new SourceType[] { SourceType.Library },
                 HasChapterImages = false,
                 IsVirtualItem = false
-
             })
                 .OfType<Video>()
                 .ToList();
@@ -160,7 +159,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             }
         }
 
-        public string Name => "Chapter image extraction";
+        public string Name => "Extract Chapter Images";
 
         public string Description => "Creates thumbnails for videos that have chapters.";
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index 6ec83b5c0..b55a59f05 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -158,9 +158,9 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             }
         }
 
-        public string Name => "Cache file cleanup";
+        public string Name => "Clean Cache Directory";
 
-        public string Description => "Deletes cache files no longer needed by the system";
+        public string Description => "Deletes cache files no longer needed by the system.";
 
         public string Category => "Maintenance";
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
index e468c301a..9f9c6353a 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
@@ -10,7 +10,7 @@ using MediaBrowser.Model.Tasks;
 namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 {
     /// <summary>
-    /// Deletes old log files
+    /// Deletes old log files.
     /// </summary>
     public class DeleteLogFileTask : IScheduledTask, IConfigurableScheduledTask
     {
@@ -33,20 +33,18 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         }
 
         /// <summary>
-        /// Creates the triggers that define when the task will run
+        /// Creates the triggers that define when the task will run.
         /// </summary>
         /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
         public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
         {
             return new[] {
-
-                // Every so often
                 new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks}
             };
         }
 
         /// <summary>
-        /// Returns the task to be executed
+        /// Returns the task to be executed.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <param name="progress">The progress.</param>
@@ -81,7 +79,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             return Task.CompletedTask;
         }
 
-        public string Name => "Log file cleanup";
+        public string Name => "Clean Log Directory";
 
         public string Description => string.Format("Deletes log files that are more than {0} days old.", ConfigurationManager.CommonConfiguration.LogFileRetentionDays);
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
index f197734d4..9ff490f18 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
@@ -125,9 +125,9 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             }
         }
 
-        public string Name => "Transcode file cleanup";
+        public string Name => "Clean Transcode Directory";
 
-        public string Description => "Deletes transcode files more than 24 hours old.";
+        public string Description => "Deletes transcode files more than one day old.";
 
         public string Category => "Maintenance";
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
index d70799c47..eaf17aace 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
@@ -9,12 +9,12 @@ using MediaBrowser.Model.Tasks;
 namespace Emby.Server.Implementations.ScheduledTasks
 {
     /// <summary>
-    /// Class PeopleValidationTask
+    /// Class PeopleValidationTask.
     /// </summary>
     public class PeopleValidationTask : IScheduledTask
     {
         /// <summary>
-        /// The _library manager
+        /// The library manager.
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
@@ -32,13 +32,12 @@ namespace Emby.Server.Implementations.ScheduledTasks
         }
 
         /// <summary>
-        /// Creates the triggers that define when the task will run
+        /// Creates the triggers that define when the task will run.
         /// </summary>
         public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
         {
             return new[]
             {
-                // Every so often
                 new TaskTriggerInfo
                 {
                     Type = TaskTriggerInfo.TriggerInterval,
@@ -48,7 +47,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         }
 
         /// <summary>
-        /// Returns the task to be executed
+        /// Returns the task to be executed.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <param name="progress">The progress.</param>
@@ -58,7 +57,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             return _libraryManager.ValidatePeople(cancellationToken, progress);
         }
 
-        public string Name => "Refresh people";
+        public string Name => "Refresh People";
 
         public string Description => "Updates metadata for actors and directors in your media library.";
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
index 909fffb1f..992b77c25 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
@@ -96,7 +96,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         }
 
         /// <inheritdoc />
-        public string Name => "Check for plugin updates";
+        public string Name => "Update Plugins";
 
         /// <inheritdoc />
         public string Description => "Downloads and installs updates for plugins that are configured to update automatically.";
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
index 3e6d251c9..073678019 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
@@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             return ((LibraryManager)_libraryManager).ValidateMediaLibraryInternal(progress, cancellationToken);
         }
 
-        public string Name => "Scan media library";
+        public string Name => "Scan Media Library";
 
         public string Description => "Scans your media library for new files and refreshes metadata.";
 
diff --git a/Emby.Server.Implementations/Serialization/JsonSerializer.cs b/Emby.Server.Implementations/Serialization/JsonSerializer.cs
index 36196ee36..bcc814daf 100644
--- a/Emby.Server.Implementations/Serialization/JsonSerializer.cs
+++ b/Emby.Server.Implementations/Serialization/JsonSerializer.cs
@@ -2,7 +2,6 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
 
 namespace Emby.Server.Implementations.Serialization
@@ -12,13 +11,15 @@ namespace Emby.Server.Implementations.Serialization
     /// </summary>
     public class JsonSerializer : IJsonSerializer
     {
-        private readonly IFileSystem _fileSystem;
-
-        public JsonSerializer(
-            IFileSystem fileSystem)
+        public JsonSerializer()
         {
-            _fileSystem = fileSystem;
-            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;
+
+            ServiceStack.Text.JsConfig<Guid>.SerializeFn = SerializeGuid;
         }
 
         /// <summary>
@@ -81,7 +82,7 @@ namespace Emby.Server.Implementations.Serialization
                 throw new ArgumentNullException(nameof(file));
             }
 
-            using (var stream = _fileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+            using (var stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
                 SerializeToStream(obj, stream);
             }
@@ -162,7 +163,6 @@ namespace Emby.Server.Implementations.Serialization
                 throw new ArgumentNullException(nameof(stream));
             }
 
-
             return ServiceStack.Text.JsonSerializer.DeserializeFromStreamAsync<T>(stream);
         }
 
@@ -225,20 +225,6 @@ namespace Emby.Server.Implementations.Serialization
             }
         }
 
-        /// <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;
-
-            ServiceStack.Text.JsConfig<Guid>.SerializeFn = SerializeGuid;
-        }
-
         private static string SerializeGuid(Guid guid)
         {
             if (guid.Equals(Guid.Empty))
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index b1d513dd4..e2cee5b03 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -30,17 +30,17 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.Session
 {
     /// <summary>
-    /// Class SessionManager
+    /// Class SessionManager.
     /// </summary>
     public class SessionManager : ISessionManager, IDisposable
     {
         /// <summary>
-        /// The _user data repository
+        /// The user data repository.
         /// </summary>
         private readonly IUserDataManager _userDataManager;
 
         /// <summary>
-        /// The _logger
+        /// The logger.
         /// </summary>
         private readonly ILogger _logger;
 
@@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.Session
         private readonly IDeviceManager _deviceManager;
 
         /// <summary>
-        /// The _active connections
+        /// The active connections.
         /// </summary>
         private readonly ConcurrentDictionary<string, SessionInfo> _activeConnections =
             new ConcurrentDictionary<string, SessionInfo>(StringComparer.OrdinalIgnoreCase);
@@ -67,21 +67,26 @@ namespace Emby.Server.Implementations.Session
         public event EventHandler<GenericEventArgs<AuthenticationResult>> AuthenticationSucceeded;
 
         /// <summary>
-        /// Occurs when [playback start].
+        /// Occurs when playback has started.
         /// </summary>
         public event EventHandler<PlaybackProgressEventArgs> PlaybackStart;
+
         /// <summary>
-        /// Occurs when [playback progress].
+        /// Occurs when playback has progressed.
         /// </summary>
         public event EventHandler<PlaybackProgressEventArgs> PlaybackProgress;
+
         /// <summary>
-        /// Occurs when [playback stopped].
+        /// Occurs when playback has stopped.
         /// </summary>
         public event EventHandler<PlaybackStopEventArgs> PlaybackStopped;
 
         public event EventHandler<SessionEventArgs> SessionStarted;
+
         public event EventHandler<SessionEventArgs> CapabilitiesChanged;
+
         public event EventHandler<SessionEventArgs> SessionEnded;
+
         public event EventHandler<SessionEventArgs> SessionActivity;
 
         public SessionManager(
@@ -685,7 +690,7 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <summary>
-        /// Used to report playback progress for an item
+        /// Used to report playback progress for an item.
         /// </summary>
         /// <returns>Task.</returns>
         public async Task OnPlaybackProgress(PlaybackProgressInfo info, bool isAutomated)
@@ -924,7 +929,6 @@ namespace Emby.Server.Implementations.Session
                     ClientName = session.Client,
                     DeviceId = session.DeviceId,
                     Session = session
-
                 },
                 _logger);
         }
@@ -1379,20 +1383,16 @@ namespace Emby.Server.Implementations.Session
                 user = _userManager.GetUserByName(request.Username);
             }
 
-            if (user != null)
+            if (user == null)
             {
-                // TODO: Move this to userManager?
-                if (!string.IsNullOrEmpty(request.DeviceId)
-                    && !_deviceManager.CanAccessDevice(user, request.DeviceId))
-                {
-                    throw new SecurityException("User is not allowed access from this device.");
-                }
+                AuthenticationFailed?.Invoke(this, new GenericEventArgs<AuthenticationRequest>(request));
+                throw new SecurityException("Invalid username or password entered.");
             }
 
-            if (user == null)
+            if (!string.IsNullOrEmpty(request.DeviceId)
+                && !_deviceManager.CanAccessDevice(user, request.DeviceId))
             {
-                AuthenticationFailed?.Invoke(this, new GenericEventArgs<AuthenticationRequest>(request));
-                throw new SecurityException("Invalid user or password entered.");
+                throw new SecurityException("User is not allowed access from this device.");
             }
 
             if (enforcePassword)
@@ -1435,14 +1435,13 @@ namespace Emby.Server.Implementations.Session
                 DeviceId = deviceId,
                 UserId = user.Id,
                 Limit = 1
-
             }).Items.FirstOrDefault();
 
-            var allExistingForDevice = _authRepo.Get(new AuthenticationInfoQuery
-            {
-                DeviceId = deviceId
-
-            }).Items;
+            var allExistingForDevice = _authRepo.Get(
+                new AuthenticationInfoQuery
+                {
+                    DeviceId = deviceId
+                }).Items;
 
             foreach (var auth in allExistingForDevice)
             {
@@ -1499,7 +1498,6 @@ namespace Emby.Server.Implementations.Session
             {
                 Limit = 1,
                 AccessToken = accessToken
-
             }).Items.FirstOrDefault();
 
             if (existing != null)
@@ -1610,7 +1608,7 @@ namespace Emby.Server.Implementations.Session
         private DtoOptions _itemInfoDtoOptions;
 
         /// <summary>
-        /// Converts a BaseItem to a BaseItemInfo
+        /// Converts a BaseItem to a BaseItemInfo.
         /// </summary>
         private BaseItemDto GetItemInfo(BaseItem item, MediaSourceInfo mediaSource)
         {
@@ -1680,7 +1678,7 @@ namespace Emby.Server.Implementations.Session
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting {0} image info", ex, type);
+                _logger.LogError(ex, "Error getting image information for {Type}", type);
                 return null;
             }
         }
@@ -1692,23 +1690,24 @@ namespace Emby.Server.Implementations.Session
                 throw new ArgumentNullException(nameof(itemId));
             }
 
-            //var item = _libraryManager.GetItemById(new Guid(itemId));
+            var item = _libraryManager.GetItemById(new Guid(itemId));
 
-            //var info = GetItemInfo(item, null, null);
+            var info = GetItemInfo(item, null);
 
-            //ReportNowViewingItem(sessionId, info);
+            ReportNowViewingItem(sessionId, info);
         }
 
         public void ReportNowViewingItem(string sessionId, BaseItemDto item)
         {
-            //var session = GetSession(sessionId);
+            var session = GetSession(sessionId);
 
-            //session.NowViewingItem = item;
+            session.NowViewingItem = item;
         }
 
         public void ReportTranscodingInfo(string deviceId, TranscodingInfo info)
         {
-            var session = Sessions.FirstOrDefault(i => string.Equals(i.DeviceId, deviceId));
+            var session = Sessions.FirstOrDefault(i =>
+                string.Equals(i.DeviceId, deviceId, StringComparison.OrdinalIgnoreCase));
 
             if (session != null)
             {
@@ -1723,8 +1722,9 @@ namespace Emby.Server.Implementations.Session
 
         public SessionInfo GetSession(string deviceId, string client, string version)
         {
-            return Sessions.FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) &&
-                string.Equals(i.Client, client));
+            return Sessions.FirstOrDefault(i =>
+                string.Equals(i.DeviceId, deviceId, StringComparison.OrdinalIgnoreCase)
+                    && string.Equals(i.Client, client, StringComparison.OrdinalIgnoreCase));
         }
 
         public SessionInfo GetSessionByAuthenticationToken(AuthenticationInfo info, string deviceId, string remoteEndpoint, string appVersion)
diff --git a/Emby.Server.Implementations/SocketSharp/HttpPostedFile.cs b/Emby.Server.Implementations/SocketSharp/HttpPostedFile.cs
index 95b7912fb..7479d8104 100644
--- a/Emby.Server.Implementations/SocketSharp/HttpPostedFile.cs
+++ b/Emby.Server.Implementations/SocketSharp/HttpPostedFile.cs
@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
 
 public sealed class HttpPostedFile : IDisposable
 {
diff --git a/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
index ba5ba1904..2e12a19fd 100644
--- a/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
+++ b/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.HttpServer;
 using Emby.Server.Implementations.Net;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
diff --git a/Emby.Server.Implementations/Udp/UdpServer.cs b/Emby.Server.Implementations/Udp/UdpServer.cs
index 185a282ac..c91d137a7 100644
--- a/Emby.Server.Implementations/Udp/UdpServer.cs
+++ b/Emby.Server.Implementations/Udp/UdpServer.cs
@@ -1,112 +1,44 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
+using System.Net.Sockets;
 using System.Text;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller;
 using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Udp
 {
     /// <summary>
-    /// Provides a Udp Server
+    /// Provides a Udp Server.
     /// </summary>
-    public class UdpServer : IDisposable
+    public sealed class UdpServer : IDisposable
     {
         /// <summary>
         /// The _logger
         /// </summary>
         private readonly ILogger _logger;
+        private readonly IServerApplicationHost _appHost;
 
-        private bool _isDisposed;
-
-        private readonly List<Tuple<string, bool, Func<string, IPEndPoint, Encoding, CancellationToken, Task>>> _responders = new List<Tuple<string, bool, Func<string, IPEndPoint, Encoding, CancellationToken, Task>>>();
+        private Socket _udpSocket;
+        private IPEndPoint _endpoint;
+        private readonly byte[] _receiveBuffer = new byte[8192];
 
-        private readonly IServerApplicationHost _appHost;
-        private readonly IJsonSerializer _json;
+        private bool _disposed = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UdpServer" /> class.
         /// </summary>
-        public UdpServer(ILogger logger, IServerApplicationHost appHost, IJsonSerializer json, ISocketFactory socketFactory)
+        public UdpServer(ILogger logger, IServerApplicationHost appHost)
         {
             _logger = logger;
             _appHost = appHost;
-            _json = json;
-            _socketFactory = socketFactory;
-
-            AddMessageResponder("who is JellyfinServer?", true, RespondToV2Message);
-        }
-
-        private void AddMessageResponder(string message, bool isSubstring, Func<string, IPEndPoint, Encoding, CancellationToken, Task> responder)
-        {
-            _responders.Add(new Tuple<string, bool, Func<string, IPEndPoint, Encoding, CancellationToken, Task>>(message, isSubstring, responder));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="E:MessageReceived" /> event.
-        /// </summary>
-        private async void OnMessageReceived(GenericEventArgs<SocketReceiveResult> e)
-        {
-            var message = e.Argument;
-
-            var encoding = Encoding.UTF8;
-            var responder = GetResponder(message.Buffer, message.ReceivedBytes, encoding);
-
-            if (responder == null)
-            {
-                encoding = Encoding.Unicode;
-                responder = GetResponder(message.Buffer, message.ReceivedBytes, encoding);
-            }
-
-            if (responder != null)
-            {
-                var cancellationToken = CancellationToken.None;
-
-                try
-                {
-                    await responder.Item2.Item3(responder.Item1, message.RemoteEndPoint, encoding, cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error in OnMessageReceived");
-                }
-            }
         }
 
-        private Tuple<string, Tuple<string, bool, Func<string, IPEndPoint, Encoding, CancellationToken, Task>>> GetResponder(byte[] buffer, int bytesReceived, Encoding encoding)
+        private async Task RespondToV2Message(string messageText, EndPoint endpoint, CancellationToken cancellationToken)
         {
-            var text = encoding.GetString(buffer, 0, bytesReceived);
-            var responder = _responders.FirstOrDefault(i =>
-            {
-                if (i.Item2)
-                {
-                    return text.IndexOf(i.Item1, StringComparison.OrdinalIgnoreCase) != -1;
-                }
-                return string.Equals(i.Item1, text, StringComparison.OrdinalIgnoreCase);
-            });
-
-            if (responder == null)
-            {
-                return null;
-            }
-            return new Tuple<string, Tuple<string, bool, Func<string, IPEndPoint, Encoding, CancellationToken, Task>>>(text, responder);
-        }
-
-        private async Task RespondToV2Message(string messageText, IPEndPoint endpoint, Encoding encoding, CancellationToken cancellationToken)
-        {
-            var parts = messageText.Split('|');
-
             var localUrl = await _appHost.GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
 
             if (!string.IsNullOrEmpty(localUrl))
@@ -118,8 +50,16 @@ namespace Emby.Server.Implementations.Udp
                     Name = _appHost.FriendlyName
                 };
 
-                await SendAsync(encoding.GetBytes(_json.SerializeToString(response)), endpoint, cancellationToken).ConfigureAwait(false);
+                try
+                {
+                    await _udpSocket.SendToAsync(JsonSerializer.SerializeToUtf8Bytes(response), SocketFlags.None, endpoint).ConfigureAwait(false);
+                }
+                catch (SocketException ex)
+                {
+                    _logger.LogError(ex, "Error sending response message");
+                }
 
+                var parts = messageText.Split('|');
                 if (parts.Length > 1)
                 {
                     _appHost.EnableLoopback(parts[1]);
@@ -132,161 +72,59 @@ namespace Emby.Server.Implementations.Udp
         }
 
         /// <summary>
-        /// The _udp client
-        /// </summary>
-        private ISocket _udpClient;
-        private readonly ISocketFactory _socketFactory;
-
-        /// <summary>
         /// Starts the specified port.
         /// </summary>
         /// <param name="port">The port.</param>
-        public void Start(int port)
+        /// <param name="cancellationToken"></param>
+        public void Start(int port, CancellationToken cancellationToken)
         {
-            _udpClient = _socketFactory.CreateUdpSocket(port);
+            _endpoint = new IPEndPoint(IPAddress.Any, port);
 
-            Task.Run(() => BeginReceive());
-        }
-
-        private readonly byte[] _receiveBuffer = new byte[8192];
-
-        private void BeginReceive()
-        {
-            if (_isDisposed)
-            {
-                return;
-            }
+            _udpSocket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            _udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+            _udpSocket.Bind(_endpoint);
 
-            try
-            {
-                var result = _udpClient.BeginReceive(_receiveBuffer, 0, _receiveBuffer.Length, OnReceiveResult);
-
-                if (result.CompletedSynchronously)
-                {
-                    OnReceiveResult(result);
-                }
-            }
-            catch (ObjectDisposedException)
-            {
-                //TODO Investigate and properly fix.
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error receiving udp message");
-            }
+            _ = Task.Run(async () => await BeginReceiveAsync(cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
         }
 
-        private void OnReceiveResult(IAsyncResult result)
+        private async Task BeginReceiveAsync(CancellationToken cancellationToken)
         {
-            if (_isDisposed)
-            {
-                return;
-            }
-
-            try
-            {
-                var socketResult = _udpClient.EndReceive(result);
-
-                OnMessageReceived(socketResult);
-            }
-            catch (ObjectDisposedException)
-            {
-                //TODO Investigate and properly fix.
-            }
-            catch (Exception ex)
+            while (!cancellationToken.IsCancellationRequested)
             {
-                _logger.LogError(ex, "Error receiving udp message");
-            }
-
-            BeginReceive();
-        }
-
-        /// <summary>
-        /// Called when [message received].
-        /// </summary>
-        /// <param name="message">The message.</param>
-        private void OnMessageReceived(SocketReceiveResult message)
-        {
-            if (_isDisposed)
-            {
-                return;
-            }
-
-            if (message.RemoteEndPoint.Port == 0)
-            {
-                return;
-            }
-
-            try
-            {
-                OnMessageReceived(new GenericEventArgs<SocketReceiveResult>
+                try
                 {
-                    Argument = message
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error handling UDP message");
-            }
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
+                    var result = await _udpSocket.ReceiveFromAsync(_receiveBuffer, SocketFlags.None, _endpoint).ConfigureAwait(false);
 
-        /// <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)
-            {
-                _isDisposed = true;
+                    cancellationToken.ThrowIfCancellationRequested();
 
-                if (_udpClient != null)
+                    var text = Encoding.UTF8.GetString(_receiveBuffer, 0, result.ReceivedBytes);
+                    if (text.Contains("who is JellyfinServer?", StringComparison.OrdinalIgnoreCase))
+                    {
+                        await RespondToV2Message(text, result.RemoteEndPoint, cancellationToken).ConfigureAwait(false);
+                    }
+                }
+                catch (SocketException ex)
                 {
-                    _udpClient.Dispose();
+                    _logger.LogError(ex, "Failed to receive data drom socket");
+                }
+                catch (OperationCanceledException)
+                {
+                    // Don't throw
                 }
             }
         }
 
-        public async Task SendAsync(byte[] bytes, IPEndPoint remoteEndPoint, CancellationToken cancellationToken)
+        /// <inheritdoc />
+        public void Dispose()
         {
-            if (_isDisposed)
+            if (_disposed)
             {
-                throw new ObjectDisposedException(GetType().Name);
-            }
-
-            if (bytes == null)
-            {
-                throw new ArgumentNullException(nameof(bytes));
-            }
-
-            if (remoteEndPoint == null)
-            {
-                throw new ArgumentNullException(nameof(remoteEndPoint));
+                return;
             }
 
-            try
-            {
-                await _udpClient.SendToAsync(bytes, 0, bytes.Length, remoteEndPoint, cancellationToken).ConfigureAwait(false);
+            _udpSocket?.Dispose();
 
-                _logger.LogInformation("Udp message sent to {remoteEndPoint}", remoteEndPoint);
-            }
-            catch (OperationCanceledException)
-            {
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error sending message to {remoteEndPoint}", remoteEndPoint);
-            }
+            GC.SuppressFinalize(this);
         }
     }
-
 }
diff --git a/Emby.Server.Implementations/WebSockets/WebSocketManager.cs b/Emby.Server.Implementations/WebSockets/WebSocketManager.cs
index efd97e4ff..31a7468fb 100644
--- a/Emby.Server.Implementations/WebSockets/WebSocketManager.cs
+++ b/Emby.Server.Implementations/WebSockets/WebSocketManager.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;